diff --git a/apple/OSX/settings.m b/apple/OSX/settings.m index 84437c272c..4f7d49f936 100644 --- a/apple/OSX/settings.m +++ b/apple/OSX/settings.m @@ -142,9 +142,6 @@ NSWindowDelegate> NSMutableArray* thisGroup = nil; NSMutableArray* thisSubGroup = nil; self.settings = [NSMutableArray array]; - - setting_data_load_current(); - setting_data = (const rarch_setting_t *)setting_data_get_list(); for (i = 0; setting_data[i].type; i ++) diff --git a/settings_data.c b/settings_data.c index 7d996512b1..a478d92fb3 100644 --- a/settings_data.c +++ b/settings_data.c @@ -29,16 +29,6 @@ } \ } -// HACK -struct settings fake_settings; -struct global fake_extern; - -void setting_data_load_current(void) -{ - memcpy(&fake_settings, &g_settings, sizeof(struct settings)); - memcpy(&fake_extern, &g_extern, sizeof(struct global)); -} - // Input static const char* get_input_config_prefix(const rarch_setting_t* setting) { @@ -140,8 +130,6 @@ void setting_data_reset_setting(const rarch_setting_t* setting) void setting_data_reset(const rarch_setting_t* settings) { const rarch_setting_t *setting; - memset(&fake_settings, 0, sizeof(fake_settings)); - memset(&fake_extern, 0, sizeof(fake_extern)); for (setting = settings; setting->type != ST_NONE; setting++) setting_data_reset_setting(setting); @@ -752,10 +740,6 @@ static void general_change_handler(const void *data) g_settings.libretro_log_level = *setting->value.unsigned_integer; } - -#define g_settings fake_settings -#define g_extern fake_extern - #define NEXT (list[index++]) #define START_GROUP(NAME) { const char *GROUP_NAME = NAME; NEXT = setting_data_group_setting (ST_GROUP, NAME); #define END_GROUP() NEXT = setting_data_group_setting (ST_END_GROUP, 0); } diff --git a/settings_data.h b/settings_data.h index 6ef623078e..e963e72cff 100644 --- a/settings_data.h +++ b/settings_data.h @@ -118,7 +118,6 @@ rarch_setting_t setting_data_bind_setting(const char* name, const char* descript const struct retro_keybind* default_value, const char *group, const char *subgroup); // These functions operate only on RetroArch's main settings list -void setting_data_load_current(void); rarch_setting_t* setting_data_get_list(void); #ifdef APPLE