walkero
/
tbftss
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Removed directionalAudio member from App - wrong variable being used in sound.c for position.

This commit is contained in:
Steve 2017-05-18 18:15:27 +01:00
parent 34d021fa43
commit 7d32dcea80
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/structs.h
View File

@ -493,7 +493,6 @@ typedef struct {
int musicVolume; int musicVolume;
int soundVolume; int soundVolume;
int vSync; int vSync;
int directionalAudio;
int doTrophyAlerts; int doTrophyAlerts;
int hideMouse; int hideMouse;
Gameplay gameplay; Gameplay gameplay;

2
src/system/init.c
View File

@ -242,7 +242,6 @@ static void loadConfigFile(char *filename)
app.musicVolume = cJSON_GetObjectItem(root, "musicVolume")->valueint; app.musicVolume = cJSON_GetObjectItem(root, "musicVolume")->valueint;
app.soundVolume = cJSON_GetObjectItem(root, "soundVolume")->valueint; app.soundVolume = cJSON_GetObjectItem(root, "soundVolume")->valueint;
app.vSync = getJSONValue(root, "vSync", 1); app.vSync = getJSONValue(root, "vSync", 1);
app.directionalAudio = getJSONValue(root, "directionalAudio", 0);
controlsJSON = cJSON_GetObjectItem(root, "controls"); controlsJSON = cJSON_GetObjectItem(root, "controls");
if (controlsJSON) if (controlsJSON)
@ -298,7 +297,6 @@ void saveConfig(void)
cJSON_AddNumberToObject(root, "musicVolume", app.musicVolume); cJSON_AddNumberToObject(root, "musicVolume", app.musicVolume);
cJSON_AddNumberToObject(root, "soundVolume", app.soundVolume); cJSON_AddNumberToObject(root, "soundVolume", app.soundVolume);
cJSON_AddNumberToObject(root, "vSync", app.vSync); cJSON_AddNumberToObject(root, "vSync", app.vSync);
cJSON_AddNumberToObject(root, "directionalAudio", app.directionalAudio);
keysJSON = cJSON_CreateObject(); keysJSON = cJSON_CreateObject();
for (i = 0 ; i < CONTROL_MAX ; i++) for (i = 0 ; i < CONTROL_MAX ; i++)

4
src/system/sound.c
View File

@ -98,10 +98,10 @@ void playBattleSound(int id, int x, int y)
vol /= MAX_BATTLE_SOUND_DISTANCE; vol /= MAX_BATTLE_SOUND_DISTANCE;
vol *= distance; vol *= distance;
if (app.directionalAudio && distance >= MIN_BATTLE_SOUND_DISTANCE) if (distance >= MIN_BATTLE_SOUND_DISTANCE)
{ {
bearing = 360 - getAngle(x, y, lastPlayerX, lastPlayerY); bearing = 360 - getAngle(x, y, lastPlayerX, lastPlayerY);
Mix_SetPosition(channel, (Sint16)bearing, (Uint8)distance); Mix_SetPosition(channel, (Sint16)bearing, (Uint8)vol);
} }
else else
{ {