diff --git a/plugins/zzogl-pg/opengl/Win32/Conf.cpp b/plugins/zzogl-pg/opengl/Win32/Conf.cpp index da70525eb6..9bd22d7c31 100644 --- a/plugins/zzogl-pg/opengl/Win32/Conf.cpp +++ b/plugins/zzogl-pg/opengl/Win32/Conf.cpp @@ -17,8 +17,8 @@ void SaveConfig() WritePrivateProfileString("Settings", "Antialiasing", szValue, iniFile.c_str()); sprintf(szValue, "%u", conf.bilinear); WritePrivateProfileString("Settings", "Bilinear", szValue, iniFile.c_str()); - //sprintf(szValue, "%u", conf.zz_options); - //WritePrivateProfileString("Settings", "Options", szValue, iniFile.c_str()); + sprintf(szValue, "%u", conf.zz_options); + WritePrivateProfileString("Settings", "ZZOptions", szValue, iniFile.c_str()); sprintf(szValue, "%u", conf.hacks); WritePrivateProfileString("Settings", "AdvancedOptions", szValue, iniFile.c_str()); sprintf(szValue, "%u", conf.width); @@ -35,8 +35,8 @@ void LoadConfig() memset(&conf, 0, sizeof(conf)); conf.interlace = 0; // on, mode 1 conf.mrtdepth = 1; - conf.hacks = 0; - conf.def_hacks = 0; + conf.zz_options._u32 = 0; + conf.hacks._u32 = 0; conf.bilinear = 1; conf.width = 640; conf.height = 480; @@ -56,10 +56,10 @@ void LoadConfig() conf.interlace = (u8)strtoul(szValue, NULL, 10); GetPrivateProfileString("Settings", "Antialiasing", NULL, szValue, 20, iniFile.c_str()); conf.aa = (u8)strtoul(szValue, NULL, 10); - GetPrivateProfileString("Settings", "Options", NULL, szValue, 20, iniFile.c_str()); - conf.hacks = strtoul(szValue, NULL, 10); + GetPrivateProfileString("Settings", "ZZOptions", NULL, szValue, 20, iniFile.c_str()); + conf.zz_options._u32 = strtoul(szValue, NULL, 10); GetPrivateProfileString("Settings", "AdvancedOptions", NULL, szValue, 20, iniFile.c_str()); - conf.gamesettings = strtoul(szValue, NULL, 10); + conf.hacks._u32 = strtoul(szValue, NULL, 10); GetPrivateProfileString("Settings", "Bilinear", NULL, szValue, 20, iniFile.c_str()); conf.bilinear = strtoul(szValue, NULL, 10); GetPrivateProfileString("Settings", "Width", NULL, szValue, 20, iniFile.c_str()); diff --git a/plugins/zzogl-pg/opengl/Win32/Win32.cpp b/plugins/zzogl-pg/opengl/Win32/Win32.cpp index d28a74707d..4e2c002526 100644 --- a/plugins/zzogl-pg/opengl/Win32/Win32.cpp +++ b/plugins/zzogl-pg/opengl/Win32/Win32.cpp @@ -125,7 +125,7 @@ void OnInitDialog(HWND hW) for (map::iterator it = mapConfOpts.begin(); it != mapConfOpts.end(); ++it) { - CheckDlgButton(hW, it->first, (conf.def_hacks&it->second) ? 1 : 0); + CheckDlgButton(hW, it->first, (conf.def_hacks._u32&it->second) ? 1 : 0); } } @@ -170,7 +170,7 @@ void OnOK(HWND hW) } conf.negaa = 0; - conf.zz_options = 0; + conf.zz_options._u32 = 0; conf.zz_options.capture_avi = IsDlgButtonChecked(hW, IDC_CONFIG_CAPTUREAVI) ? 1 : 0; conf.zz_options.wireframe = IsDlgButtonChecked(hW, IDC_CONFIG_WIREFRAME) ? 1 : 0; @@ -178,14 +178,14 @@ void OnOK(HWND hW) conf.zz_options.widescreen = IsDlgButtonChecked(hW, IDC_CONFIG_WIDESCREEN) ? 1 : 0; conf.zz_options.tga_snap = IsDlgButtonChecked(hW, IDC_CONFIG_BMPSS) ? 1 : 0; - conf.hacks = 0; + conf.hacks._u32 = 0; for (map::iterator it = mapConfOpts.begin(); it != mapConfOpts.end(); ++it) { - if (IsDlgButtonChecked(hW, it->first)) conf.hacks |= it->second; + if (IsDlgButtonChecked(hW, it->first)) conf.hacks._u32 |= it->second; } - GSsetGameCRC(g_LastCRC, conf.hacks); + GSsetGameCRC(g_LastCRC, conf.hacks._u32); if (SendDlgItemMessage(hW, IDC_CONF_WIN640, BM_GETCHECK, 0, 0)) conf.zz_options.dimensions = GSDim_640; diff --git a/plugins/zzogl-pg/opengl/ZZoglFlush.cpp b/plugins/zzogl-pg/opengl/ZZoglFlush.cpp index 95450bd049..3f9d45a2af 100644 --- a/plugins/zzogl-pg/opengl/ZZoglFlush.cpp +++ b/plugins/zzogl-pg/opengl/ZZoglFlush.cpp @@ -1603,7 +1603,7 @@ void ZeroGS::Flush(int context) GL_REPORT_ERRORD(); } -__forceinline void ZeroGS::FlushBoth() +void ZeroGS::FlushBoth() { Flush(0); Flush(1);