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

fixed Video_SaveState & Video_LoadState in OGL/DX that made dolphin unable to load the plugins 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@352 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
daco65 2008-08-27 11:45:51 +00:00
parent 6c5f0fc0f3
commit 794f656188
2 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Plugins/Plugin_VideoDX9/Src/main.cpp
View File

@ -166,12 +166,12 @@ void Video_Initialize(SVideoInitialize* _pVideoInitialize)
} }
void Video_SaveState() { void Video_SaveState(void) {
VideoCommon_SaveState(); VideoCommon_SaveState();
//PanicAlert("Saving state from DirectX9"); //PanicAlert("Saving state from DirectX9");
} }
void Video_LoadState() { void Video_LoadState(void) {
VideoCommon_LoadState(); VideoCommon_LoadState();
//PanicAlert("Loading state from DirectX9"); //PanicAlert("Loading state from DirectX9");
} }

46
Source/Plugins/Plugin_VideoOGL/Src/main.cpp
View File

@ -83,27 +83,27 @@ void DllConfig(HWND _hParent)
while(EnumDisplaySettings(NULL, iModeNum++, &dmi) != 0) while(EnumDisplaySettings(NULL, iModeNum++, &dmi) != 0)
{ {
char szBuffer[100]; char szBuffer[100];
sprintf(szBuffer,"%dx%d", dmi.dmPelsWidth, dmi.dmPelsHeight); sprintf(szBuffer,"%dx%d", dmi.dmPelsWidth, dmi.dmPelsHeight);
//making a string cause char*[] to char was a baaad idea //making a string cause char*[] to char was a baaad idea
std::string strBuffer(szBuffer); std::string strBuffer(szBuffer);
//create a check loop to check every pointer of resos to see if the res is added or not //create a check loop to check every pointer of resos to see if the res is added or not
int b = 0; int b = 0;
bool resFound = false; bool resFound = false;
while(b < i && !resFound) while(b < i && !resFound)
{ {
//is the res already added? //is the res already added?
resFound = (resos[b] == strBuffer); resFound = (resos[b] == strBuffer);
b++; b++;
} }
if(!resFound) if(!resFound)
//and add the res //and add the res
{ {
resos[i] = strBuffer; resos[i] = strBuffer;
i++; i++;
frame.AddFSReso(szBuffer); frame.AddFSReso(szBuffer);
frame.AddWindowReso(szBuffer); frame.AddWindowReso(szBuffer);
} }
ZeroMemory(&dmi, sizeof(dmi)); ZeroMemory(&dmi, sizeof(dmi));
} }
frame.ShowModal(); frame.ShowModal();
@ -179,12 +179,12 @@ void Video_Initialize(SVideoInitialize* _pVideoInitialize)
} }
void Video_SaveState() { void Video_SaveState(void) {
VideoCommon_SaveState(); VideoCommon_SaveState();
//PanicAlert("Saving state from OpenGL"); //PanicAlert("Saving state from OpenGL");
} }
void Video_LoadState() { void Video_LoadState(void) {
VideoCommon_LoadState(); VideoCommon_LoadState();
//PanicAlert("Loading state from OpenGL"); //PanicAlert("Loading state from OpenGL");
} }