diff --git a/Source/Glide64/Settings.cpp b/Source/Glide64/Settings.cpp index c4ccceee1..0bca1df31 100644 --- a/Source/Glide64/Settings.cpp +++ b/Source/Glide64/Settings.cpp @@ -62,7 +62,7 @@ CSettings::CSettings() : // Special fixes m_fast_crc(false), m_alt_tex_size(false), -use_sts1_only(0), + m_use_sts1_only(false), flame_corona(0), //hack for zeldas flame's corona increase_texrect_edge(0), // add 1 to lower right corner coordinates of texrect decrease_fillrect_edge(0), // sub 1 from lower right corner coordinates of fillrect @@ -160,7 +160,7 @@ void CSettings::RegisterSettings(void) general_setting(Set_fb_render_default, "fb_render", false); game_setting(Set_alt_tex_size, "alt_tex_size", false); - game_setting(Set_use_sts1_only, "use_sts1_only", 0); + game_setting(Set_use_sts1_only, "use_sts1_only", false); game_setting(Set_force_calc_sphere, "force_calc_sphere", 0); game_setting(Set_correct_viewport, "correct_viewport", 0); game_setting(Set_increase_texrect_edge, "increase_texrect_edge", 0); @@ -713,7 +713,7 @@ void CSettings::ReadGameSettings(const char * name) } m_alt_tex_size = GetSetting(Set_alt_tex_size) != 0; - g_settings->use_sts1_only = GetSetting(Set_use_sts1_only); + m_use_sts1_only = GetSetting(Set_use_sts1_only) != 0; g_settings->force_calc_sphere = GetSetting(Set_force_calc_sphere); g_settings->correct_viewport = GetSetting(Set_correct_viewport); g_settings->increase_texrect_edge = GetSetting(Set_increase_texrect_edge); diff --git a/Source/Glide64/Settings.h b/Source/Glide64/Settings.h index d529fc6b9..6ffb7f382 100644 --- a/Source/Glide64/Settings.h +++ b/Source/Glide64/Settings.h @@ -236,7 +236,7 @@ public: // Special fixes inline bool fast_crc(void) const { return m_fast_crc; } inline bool alt_tex_size(void) const { return m_alt_tex_size; } - int use_sts1_only; + inline bool use_sts1_only(void) const { return m_use_sts1_only; } int flame_corona; //hack for zeldas flame's corona int increase_texrect_edge; // add 1 to lower right corner coordinates of texrect int decrease_fillrect_edge; // sub 1 from lower right corner coordinates of fillrect @@ -355,6 +355,7 @@ private: ucode_t m_ucode; bool m_fast_crc; bool m_alt_tex_size; + bool m_use_sts1_only; StippleMode_t m_stipple_mode; hacks_t m_hacks; }; diff --git a/Source/Glide64/rdp.cpp b/Source/Glide64/rdp.cpp index 708ed1649..8cf698da5 100644 --- a/Source/Glide64/rdp.cpp +++ b/Source/Glide64/rdp.cpp @@ -1643,7 +1643,7 @@ static void rdp_settilesize() else if (wrong_tile == (int)tile) wrong_tile = -1; - if (g_settings->use_sts1_only) + if (g_settings->use_sts1_only()) { // ** USE FIRST SETTILESIZE ONLY ** // This option helps certain textures while using the 'Alternate texture size method',