claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Moved the OpenGL 3.3 renderer and Discord integration out of the Dev branch.

Browse Source
This commit is contained in:
OBattler
2021-11-29 15:42:50 +01:00
parent c6c2988b64
commit 295f750884
23 changed files with 68 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/config.c
View File

@@ -579,15 +579,11 @@ load_general(void)
else
strcpy(icon_set, "");
#if USE_DISCORD
enable_discord = !!config_get_int(cat, "enable_discord", 0);
#endif
#if defined(DEV_BRANCH) && defined(USE_OPENGL)
video_framerate = config_get_int(cat, "video_gl_framerate", -1);
video_vsync = config_get_int(cat, "video_gl_vsync", 0);
strcpy_s(video_shader, sizeof(video_shader), config_get_string(cat, "video_gl_shader", ""));
#endif
}
@@ -2243,14 +2239,11 @@ save_general(void)
else
config_set_string(cat, "iconset", icon_set);
#if USE_DISCORD
if (enable_discord)
config_set_int(cat, "enable_discord", enable_discord);
else
config_delete_var(cat, "enable_discord");
#endif
#if defined(DEV_BRANCH) && defined(USE_OPENGL)
if (video_framerate != -1)
config_set_int(cat, "video_gl_framerate", video_framerate);
else
@@ -2263,7 +2256,6 @@ save_general(void)
config_set_string(cat, "video_gl_shader", video_shader);
else
config_delete_var(cat, "video_gl_shader");
#endif
delete_section_if_empty(cat);
}