libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-12-01 12:11:03 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Themaister/SSNES

Browse Source
This commit is contained in:
TwinAphex51224 2012-01-12 23:46:10 +01:00
commit 057785539b
3 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
general.h
View File

@ -166,6 +166,14 @@ struct settings
bool savestate_auto_index;
};
// Settings and/or global state that is specific to a console-style implementation.
#if defined(__CELLOS_LV2__) || defined(_XBOX) || defined(XENON) || defined(GEKKO)
struct console_settings
{
bool block_config_read;
};
#endif
enum ssnes_game_type
{
SSNES_CART_NORMAL = 0,
@ -348,9 +356,13 @@ struct global
};
void parse_config(void);
void config_set_defaults(void);
extern struct settings g_settings;
extern struct global g_extern;
#if defined(__CELLOS_LV2__) || defined(_XBOX) || defined(XENON) || defined(GEKKO)
extern struct console_settings g_console;
#endif
#define SSNES_LOG(...) do { \
if (g_extern.verbose) \

14
settings.c
View File

@ -31,12 +31,15 @@
struct settings g_settings;
struct global g_extern;
#if defined(__CELLOS_LV2__) || defined(_XBOX) || defined(XENON) || defined(GEKKO)
struct console_settings g_console;
#endif
#ifdef HAVE_CONFIGFILE
static void read_keybinds(config_file_t *conf);
#endif
static void set_defaults(void)
void config_set_defaults(void)
{
const char *def_video = NULL;
const char *def_audio = NULL;
@ -224,11 +227,16 @@ static void parse_config_file(void);
void parse_config(void)
{
set_defaults();
#if defined(__CELLOS_LV2__) || defined(_XBOX) || defined(XENON) || defined(GEKKO)
if (!g_console.block_config_read)
#endif
{
config_set_defaults();
#ifdef HAVE_CONFIGFILE
parse_config_file();
parse_config_file();
#endif
}
}
#ifdef HAVE_CONFIGFILE

1
ssnes.c
View File

@ -2210,4 +2210,3 @@ error:
return 1;
}