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

Added vsync and directionalAudio settings to app. Default to on and off, respectively.

This commit is contained in:
Steve 2017-05-16 19:08:42 +01:00
parent 7c6a881dff
commit 34d021fa43
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/structs.h
View File

@ -492,6 +492,8 @@ typedef struct {
int fullscreen; int fullscreen;
int musicVolume; int musicVolume;
int soundVolume; int soundVolume;
int vSync;
int directionalAudio;
int doTrophyAlerts; int doTrophyAlerts;
int hideMouse; int hideMouse;
Gameplay gameplay; Gameplay gameplay;

17
src/system/init.c
View File

@ -61,12 +61,17 @@ void initSDL(void)
/* done in src/plat/ */ /* done in src/plat/ */
createSaveFolder(); createSaveFolder();
rendererFlags = SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC;
windowFlags = 0;
loadConfig(); loadConfig();
rendererFlags = SDL_RENDERER_ACCELERATED;
if (app.vSync)
{
rendererFlags |= SDL_RENDERER_PRESENTVSYNC;
}
windowFlags = 0;
if (app.fullscreen) if (app.fullscreen)
{ {
windowFlags |= SDL_WINDOW_FULLSCREEN; windowFlags |= SDL_WINDOW_FULLSCREEN;
@ -236,6 +241,8 @@ static void loadConfigFile(char *filename)
app.fullscreen = cJSON_GetObjectItem(root, "fullscreen")->valueint; app.fullscreen = cJSON_GetObjectItem(root, "fullscreen")->valueint;
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.directionalAudio = getJSONValue(root, "directionalAudio", 0);
controlsJSON = cJSON_GetObjectItem(root, "controls"); controlsJSON = cJSON_GetObjectItem(root, "controls");
if (controlsJSON) if (controlsJSON)
@ -290,6 +297,8 @@ void saveConfig(void)
cJSON_AddNumberToObject(root, "fullscreen", app.fullscreen); cJSON_AddNumberToObject(root, "fullscreen", app.fullscreen);
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, "directionalAudio", app.directionalAudio);
keysJSON = cJSON_CreateObject(); keysJSON = cJSON_CreateObject();
for (i = 0 ; i < CONTROL_MAX ; i++) for (i = 0 ; i < CONTROL_MAX ; i++)

1
src/system/init.h
View File

@ -72,6 +72,7 @@ extern long lookup(char *name);
extern void initStars(void); extern void initStars(void);
extern void initTrophies(void); extern void initTrophies(void);
extern void destroyCredits(void); extern void destroyCredits(void);
extern int getJSONValue(cJSON *node, char *name, int defValue);
extern App app; extern App app;
extern Colors colors; extern Colors colors;