ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

zzogl-pg: Fix the Windows port back up. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3233 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2010-06-19 09:07:21 +00:00
parent 328d046d6c
commit 1681fa0b76
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/zzogl-pg/opengl/Win32/Conf.cpp
View File

@ -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());

10
plugins/zzogl-pg/opengl/Win32/Win32.cpp
View File

@ -125,7 +125,7 @@ void OnInitDialog(HWND hW)
for (map<int, int>::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<int, int>::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;

2
plugins/zzogl-pg/opengl/ZZoglFlush.cpp
View File

@ -1603,7 +1603,7 @@ void ZeroGS::Flush(int context)
GL_REPORT_ERRORD();
}
__forceinline void ZeroGS::FlushBoth()
void ZeroGS::FlushBoth()
{
Flush(0);
Flush(1);