this fixes my pal problems. i dont know what problems adelikat is having

This commit is contained in:
zeromus 2008-07-10 15:50:44 +00:00
parent 0a63a42df2
commit 3ada6d3015
4 changed files with 40 additions and 29 deletions

View File

@ -520,7 +520,11 @@ static void BlitScreenWindow(unsigned char *XBuf)
ddrval=IDirectDrawSurface7_Blt(lpDDSPrimary, &drect,lpDDSBack,&srect,DDBLT_WAIT,0); ddrval=IDirectDrawSurface7_Blt(lpDDSPrimary, &drect,lpDDSBack,&srect,DDBLT_WAIT,0);
if(ddrval!=DD_OK) if(ddrval!=DD_OK)
{ {
if(ddrval==DDERR_SURFACELOST) {RestoreDD(1);RestoreDD(0);} if(ddrval==DDERR_SURFACELOST)
{
RestoreDD(1);
RestoreDD(0);
}
return; return;
} }
} }
@ -1113,12 +1117,8 @@ void DoVideoConfigFix(void)
UpdateRendBounds(); UpdateRendBounds();
} }
//Shows the Video configuration dialog. void PushCurrentVideoSettings()
void ConfigVideo(void)
{ {
DialogBox(fceu_hInstance, "VIDEOCONFIG", hAppWnd, VideoConCallB);
DoVideoConfigFix();
if(fullscreen) if(fullscreen)
{ {
SetFSVideoMode(); SetFSVideoMode();
@ -1129,6 +1129,17 @@ void ConfigVideo(void)
SetVideoMode(0); SetVideoMode(0);
changerecursive = 0; changerecursive = 0;
} }
SetMainWindowStuff(); SetMainWindowStuff();
} }
//Shows the Video configuration dialog.
void ConfigVideo(void)
{
DialogBox(fceu_hInstance, "VIDEOCONFIG", hAppWnd, VideoConCallB);
DoVideoConfigFix();
PushCurrentVideoSettings();
}

View File

@ -53,5 +53,6 @@ void DoVideoConfigFix();
void FCEUD_BlitScreen(uint8 *XBuf); void FCEUD_BlitScreen(uint8 *XBuf);
void ResetVideo(); void ResetVideo();
void SetFSVideoMode(); void SetFSVideoMode();
void PushCurrentVideoSettings();
#endif #endif

View File

@ -566,7 +566,7 @@ void ALoad(char *nameo, char* innerFilename)
UpdateCheckedMenuItems(); UpdateCheckedMenuItems();
SetMainWindowStuff(); PushCurrentVideoSettings();
std::string recentFileName = nameo; std::string recentFileName = nameo;
if(GameInfo->archiveFilename && GameInfo->archiveCount>1) if(GameInfo->archiveFilename && GameInfo->archiveCount>1)
@ -987,8 +987,7 @@ LRESULT FAR PASCAL AppWndProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lParam)
FCEUI_SetVidSystem(pal_emulation); FCEUI_SetVidSystem(pal_emulation);
RefreshThrottleFPS(); RefreshThrottleFPS();
UpdateCheckedMenuItems(); UpdateCheckedMenuItems();
// DoVideoConfigFix(); PushCurrentVideoSettings();
SetMainWindowStuff();
break; break;
case MENU_DISPLAY_BG: case MENU_DISPLAY_BG: