diff --git a/Source/Glide64/Settings.cpp b/Source/Glide64/Settings.cpp index 17422200b..c4f276bb7 100644 --- a/Source/Glide64/Settings.cpp +++ b/Source/Glide64/Settings.cpp @@ -52,7 +52,6 @@ ghq_hirs_let_texartists_fly(0), ghq_hirs_dump(0), autodetect_ucode(0), ucode(0), -logging(0), elogging(0), log_clear(0), filter_cache(0), @@ -131,7 +130,6 @@ void CSettings::RegisterSettings(void) general_setting(Set_ucode, "ucode", 2); general_setting(Set_wireframe, "wireframe", 0); general_setting(Set_wfmode, "wfmode", 1); - general_setting(Set_logging, "logging", 0); general_setting(Set_log_clear, "log_clear", 0); general_setting(Set_elogging, "elogging", 0); general_setting(Set_filter_cache, "filter_cache", 0); @@ -283,7 +281,6 @@ void CSettings::ReadSettings() this->ucode = GetSetting(Set_ucode); this->wireframe = GetSetting(Set_wireframe); this->wfmode = GetSetting(Set_wfmode); - this->logging = GetSetting(Set_logging); this->log_clear = GetSetting(Set_log_clear); this->elogging = GetSetting(Set_elogging); this->filter_cache = GetSetting(Set_filter_cache); @@ -295,7 +292,6 @@ void CSettings::ReadSettings() this->ucode = 2; this->wireframe = FALSE; this->wfmode = 0; - this->logging = FALSE; this->log_clear = FALSE; this->elogging = FALSE; this->filter_cache = FALSE; @@ -514,7 +510,6 @@ void CSettings::WriteSettings(void) SetSetting(Set_ucode, (int)g_settings->ucode); SetSetting(Set_wireframe, g_settings->wireframe); SetSetting(Set_wfmode, g_settings->wfmode); - SetSetting(Set_logging, g_settings->logging); SetSetting(Set_log_clear, g_settings->log_clear); SetSetting(Set_elogging,g_settings->elogging); SetSetting(Set_filter_cache,g_settings->filter_cache); diff --git a/Source/Glide64/Settings.h b/Source/Glide64/Settings.h index a1b8314d4..12acbaeba 100644 --- a/Source/Glide64/Settings.h +++ b/Source/Glide64/Settings.h @@ -96,7 +96,6 @@ public: //Debug int autodetect_ucode; int ucode; - int logging; int elogging; int log_clear; int filter_cache; diff --git a/Source/Glide64/SettingsID.h b/Source/Glide64/SettingsID.h index a611c9961..45c6a2522 100644 --- a/Source/Glide64/SettingsID.h +++ b/Source/Glide64/SettingsID.h @@ -15,17 +15,13 @@ enum // General Settings Set_vsync, Set_Rotate, Set_texenh_options, Set_wrpVRAM, Set_wrpFBO, Set_wrpAnisotropic, Set_autodetect_ucode, Set_ucode, Set_wireframe, - Set_wfmode, Set_logging, Set_log_clear, Set_elogging, - Set_filter_cache, Set_unk_as_red, Set_log_unk, Set_unk_clear, Set_ghq_fltr, + Set_log_clear, Set_elogging, + Set_wfmode, Set_filter_cache, Set_unk_as_red, Set_log_unk, Set_unk_clear, Set_ghq_fltr, Set_ghq_cmpr, Set_ghq_enht, Set_ghq_hirs, Set_ghq_enht_cmpr, Set_ghq_enht_tile, Set_ghq_enht_f16bpp, Set_ghq_enht_gz, Set_ghq_enht_nobg, Set_ghq_hirs_cmpr, Set_ghq_hirs_tile, Set_ghq_hirs_f16bpp, Set_ghq_hirs_gz, Set_ghq_hirs_altcrc, Set_ghq_cache_save, Set_ghq_cache_size, Set_ghq_hirs_let_texartists_fly, - Set_ghq_hirs_dump, - -#ifndef ANDROID - Set_Resolution, Set_wrpResolution, -#endif + Set_ghq_hirs_dump, Set_Resolution, // Default Game Settings Set_optimize_texrect_default, Set_filtering_default, Set_lodmode_default, @@ -47,4 +43,8 @@ enum //RDB Setting Set_ucodeLookup, + +#ifdef _WIN32 + Set_wrpResolution, +#endif };