mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2024-11-14 21:37:52 -07:00
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:
parent
6c5f0fc0f3
commit
794f656188
@ -166,12 +166,12 @@ void Video_Initialize(SVideoInitialize* _pVideoInitialize)
|
||||
|
||||
}
|
||||
|
||||
void Video_SaveState() {
|
||||
void Video_SaveState(void) {
|
||||
VideoCommon_SaveState();
|
||||
//PanicAlert("Saving state from DirectX9");
|
||||
}
|
||||
|
||||
void Video_LoadState() {
|
||||
void Video_LoadState(void) {
|
||||
VideoCommon_LoadState();
|
||||
//PanicAlert("Loading state from DirectX9");
|
||||
}
|
||||
|
@ -83,27 +83,27 @@ void DllConfig(HWND _hParent)
|
||||
|
||||
while(EnumDisplaySettings(NULL, iModeNum++, &dmi) != 0)
|
||||
{
|
||||
char szBuffer[100];
|
||||
sprintf(szBuffer,"%dx%d", dmi.dmPelsWidth, dmi.dmPelsHeight);
|
||||
//making a string cause char*[] to char was a baaad idea
|
||||
std::string strBuffer(szBuffer);
|
||||
//create a check loop to check every pointer of resos to see if the res is added or not
|
||||
int b = 0;
|
||||
bool resFound = false;
|
||||
while(b < i && !resFound)
|
||||
{
|
||||
//is the res already added?
|
||||
resFound = (resos[b] == strBuffer);
|
||||
b++;
|
||||
}
|
||||
if(!resFound)
|
||||
//and add the res
|
||||
{
|
||||
resos[i] = strBuffer;
|
||||
i++;
|
||||
frame.AddFSReso(szBuffer);
|
||||
frame.AddWindowReso(szBuffer);
|
||||
}
|
||||
char szBuffer[100];
|
||||
sprintf(szBuffer,"%dx%d", dmi.dmPelsWidth, dmi.dmPelsHeight);
|
||||
//making a string cause char*[] to char was a baaad idea
|
||||
std::string strBuffer(szBuffer);
|
||||
//create a check loop to check every pointer of resos to see if the res is added or not
|
||||
int b = 0;
|
||||
bool resFound = false;
|
||||
while(b < i && !resFound)
|
||||
{
|
||||
//is the res already added?
|
||||
resFound = (resos[b] == strBuffer);
|
||||
b++;
|
||||
}
|
||||
if(!resFound)
|
||||
//and add the res
|
||||
{
|
||||
resos[i] = strBuffer;
|
||||
i++;
|
||||
frame.AddFSReso(szBuffer);
|
||||
frame.AddWindowReso(szBuffer);
|
||||
}
|
||||
ZeroMemory(&dmi, sizeof(dmi));
|
||||
}
|
||||
frame.ShowModal();
|
||||
@ -179,12 +179,12 @@ void Video_Initialize(SVideoInitialize* _pVideoInitialize)
|
||||
|
||||
}
|
||||
|
||||
void Video_SaveState() {
|
||||
void Video_SaveState(void) {
|
||||
VideoCommon_SaveState();
|
||||
//PanicAlert("Saving state from OpenGL");
|
||||
}
|
||||
|
||||
void Video_LoadState() {
|
||||
void Video_LoadState(void) {
|
||||
VideoCommon_LoadState();
|
||||
//PanicAlert("Loading state from OpenGL");
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user