diff --git a/Source/Glide64/Config.cpp b/Source/Glide64/Config.cpp index 04f62b666..1665e00ad 100644 --- a/Source/Glide64/Config.cpp +++ b/Source/Glide64/Config.cpp @@ -125,7 +125,7 @@ wxNotebook(parent, id, pos, size, 0) if (g_settings->advanced_options) { EmuSettingsPanel = new wxPanel(this, wxID_ANY); - if (romopen) + if (g_romopen) EmuSettingsBoxSizer_staticbox = new wxStaticBox(EmuSettingsPanel, -1, "Current game emulation g_settings-> Change with care!"); else EmuSettingsBoxSizer_staticbox = new wxStaticBox(EmuSettingsPanel, -1, "Default emulation g_settings-> Not recommended to change!"); @@ -918,7 +918,7 @@ void ConfigNotebook::SaveSettings() if (memcmp(&oldsettings, g_settings, sizeof(CSettings))) //check that settings were changed { - if (romopen) + if (g_romopen) { if (is_advanced_changed) { @@ -1079,7 +1079,7 @@ void CALL DllConfig(HWND hParent) CGuard guard(*g_ProcessDListCS); ReadSettings(); - if (romopen) + if (g_romopen) { // ReadSpecialSettings ((char*)rdp.RomName.c_str()); if (evoodoo)// && fullscreen && !ev_fullscreen) @@ -1119,7 +1119,7 @@ void CALL DllConfig(HWND hParent) void CloseConfig() { - if (romopen) + if (g_romopen) { if (fb_depth_render_enabled) ZLUT_init(); diff --git a/Source/Glide64/Gfx_1.3.h b/Source/Glide64/Gfx_1.3.h index 98f641509..18e3d7235 100644 --- a/Source/Glide64/Gfx_1.3.h +++ b/Source/Glide64/Gfx_1.3.h @@ -174,7 +174,7 @@ extern "C" { #endif extern int GfxInitDone; - extern int romopen; + extern bool g_romopen; extern int to_fullscreen; extern int debugging; diff --git a/Source/Glide64/Main.cpp b/Source/Glide64/Main.cpp index 1af44b8e3..3ae5f4bb1 100644 --- a/Source/Glide64/Main.cpp +++ b/Source/Glide64/Main.cpp @@ -66,7 +66,7 @@ GFX_INFO gfx; int to_fullscreen = FALSE; int GfxInitDone = FALSE; -int romopen = FALSE; +bool g_romopen = false; GrContext_t gfx_context = 0; int debugging = FALSE; int exception = FALSE; @@ -1628,7 +1628,7 @@ void CALL RomClosed(void) WriteTrace(TraceGlide64, TraceDebug, "-"); rdp.window_changed = TRUE; - romopen = FALSE; + g_romopen = FALSE; if (evoodoo) { ReleaseGfx(); @@ -1667,7 +1667,7 @@ void CALL RomOpen(void) { WriteTrace(TraceGlide64, TraceDebug, "-"); no_dlist = true; - romopen = TRUE; + g_romopen = TRUE; ucode_error_report = TRUE; // allowed to report ucode errors rdp_reset();