diff --git a/Source/Glide64/Combine.cpp b/Source/Glide64/Combine.cpp index 5e2e2b8cd..b3ca4b031 100644 --- a/Source/Glide64/Combine.cpp +++ b/Source/Glide64/Combine.cpp @@ -15602,12 +15602,9 @@ void Combine() if (actual_combine != current_combine) { rdp.uncombined |= 1; - if (g_settings->log_unk) - { - WriteTrace(TraceUnknown, TraceDebug, "COLOR combine not found: %08x, #1: (%s-%s)*%s+%s, #2: (%s-%s)*%s+%s", actual_combine, - Mode0[rdp.cycle1 & 0xF], Mode1[(rdp.cycle1 >> 4) & 0xF], Mode2[(rdp.cycle1 >> 8) & 0x1F], Mode3[(rdp.cycle1 >> 13) & 7], - Mode0[rdp.cycle2 & 0xF], Mode1[(rdp.cycle2 >> 4) & 0xF], Mode2[(rdp.cycle2 >> 8) & 0x1F], Mode3[(rdp.cycle2 >> 13) & 7]); - } + WriteTrace(TraceUnknown, TraceDebug, "COLOR combine not found: %08x, #1: (%s-%s)*%s+%s, #2: (%s-%s)*%s+%s", actual_combine, + Mode0[rdp.cycle1 & 0xF], Mode1[(rdp.cycle1 >> 4) & 0xF], Mode2[(rdp.cycle1 >> 8) & 0x1F], Mode3[(rdp.cycle1 >> 13) & 7], + Mode0[rdp.cycle2 & 0xF], Mode1[(rdp.cycle2 >> 4) & 0xF], Mode2[(rdp.cycle2 >> 8) & 0x1F], Mode3[(rdp.cycle2 >> 13) & 7]); found = FALSE; //tex |= 3; @@ -15653,12 +15650,9 @@ void Combine() if (actual_combine != current_combine) { rdp.uncombined |= 2; - if (g_settings->log_unk) - { - WriteTrace(TraceUnknown, TraceDebug, "ALPHA combine not found: %08x, #1: (%s-%s)*%s+%s, #2: (%s-%s)*%s+%s", actual_combine, - Alpha0[(rdp.cycle1 >> 16) & 7], Alpha1[(rdp.cycle1 >> 19) & 7], Alpha2[(rdp.cycle1 >> 22) & 7], Alpha3[(rdp.cycle1 >> 25) & 7], - Alpha0[(rdp.cycle2 >> 16) & 7], Alpha1[(rdp.cycle2 >> 19) & 7], Alpha2[(rdp.cycle2 >> 22) & 7], Alpha3[(rdp.cycle2 >> 25) & 7]); - } + WriteTrace(TraceUnknown, TraceDebug, "ALPHA combine not found: %08x, #1: (%s-%s)*%s+%s, #2: (%s-%s)*%s+%s", actual_combine, + Alpha0[(rdp.cycle1 >> 16) & 7], Alpha1[(rdp.cycle1 >> 19) & 7], Alpha2[(rdp.cycle1 >> 22) & 7], Alpha3[(rdp.cycle1 >> 25) & 7], + Alpha0[(rdp.cycle2 >> 16) & 7], Alpha1[(rdp.cycle2 >> 19) & 7], Alpha2[(rdp.cycle2 >> 22) & 7], Alpha3[(rdp.cycle2 >> 25) & 7]); } if (g_settings->unk_as_red) { diff --git a/Source/Glide64/Settings.cpp b/Source/Glide64/Settings.cpp index 2613ab59b..9e5a6a869 100644 --- a/Source/Glide64/Settings.cpp +++ b/Source/Glide64/Settings.cpp @@ -53,7 +53,6 @@ ghq_hirs_dump(0), autodetect_ucode(0), ucode(0), unk_as_red(0), -log_unk(0), unk_clear(0), wireframe(0), wfmode(0), @@ -128,7 +127,6 @@ void CSettings::RegisterSettings(void) general_setting(Set_wireframe, "wireframe", 0); general_setting(Set_wfmode, "wfmode", 1); general_setting(Set_unk_as_red, "unk_as_red", 0); - general_setting(Set_log_unk, "log_unk", 0); general_setting(Set_unk_clear, "unk_clear", 0); general_setting(Set_ghq_fltr, "ghq_fltr", 0); general_setting(Set_ghq_cmpr, "ghq_cmpr", 0); @@ -276,7 +274,6 @@ void CSettings::ReadSettings() this->wireframe = GetSetting(Set_wireframe); this->wfmode = GetSetting(Set_wfmode); this->unk_as_red = GetSetting(Set_unk_as_red); - this->log_unk = GetSetting(Set_log_unk); this->unk_clear = GetSetting(Set_unk_clear); #else this->autodetect_ucode = TRUE; @@ -284,7 +281,6 @@ void CSettings::ReadSettings() this->wireframe = FALSE; this->wfmode = 0; this->unk_as_red = FALSE; - this->log_unk = FALSE; this->unk_clear = FALSE; #endif @@ -499,7 +495,6 @@ void CSettings::WriteSettings(void) SetSetting(Set_wireframe, g_settings->wireframe); SetSetting(Set_wfmode, g_settings->wfmode); SetSetting(Set_unk_as_red,g_settings->unk_as_red); - SetSetting(Set_log_unk,g_settings->log_unk); SetSetting(Set_unk_clear, g_settings->unk_clear); #endif //_ENDUSER_RELEASE_ diff --git a/Source/Glide64/Settings.h b/Source/Glide64/Settings.h index 77479233d..4a8163af1 100644 --- a/Source/Glide64/Settings.h +++ b/Source/Glide64/Settings.h @@ -97,7 +97,6 @@ public: int autodetect_ucode; int ucode; int unk_as_red; - int log_unk; int unk_clear; int wireframe; int wfmode; diff --git a/Source/Glide64/SettingsID.h b/Source/Glide64/SettingsID.h index 3792e6036..3c0bbf970 100644 --- a/Source/Glide64/SettingsID.h +++ b/Source/Glide64/SettingsID.h @@ -15,7 +15,7 @@ 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_unk_as_red, Set_log_unk, Set_unk_clear, Set_ghq_fltr, + Set_wfmode, Set_unk_as_red, 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,