moved the call to preInitialize to a central location

git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@142 a31d4220-a93d-0410-bf67-fe4944624d44
This commit is contained in:
spacy51 2007-12-02 01:52:09 +00:00
parent e2f3e132cc
commit 2bb5210603
4 changed files with 24 additions and 28 deletions

View File

@ -192,8 +192,6 @@ bool Direct3DDisplay::initialize()
TRACE( _T("Initializing Direct3D renderer {\n") );
#endif
if( !theApp.preInitialize() ) return false;
initializing = true;
// load Direct3D v9

View File

@ -180,8 +180,6 @@ void DirectDrawDisplay::cleanup()
bool DirectDrawDisplay::initialize()
{
if( !theApp.preInitialize() ) return false;
GUID *guid = NULL;
if(theApp.ddrawEmulationOnly)
guid = (GUID *)DDCREATE_EMULATIONONLY;

View File

@ -199,8 +199,6 @@ void OpenGLDisplay::cleanup()
bool OpenGLDisplay::initialize()
{
if( !theApp.preInitialize() ) return false;
theApp.mode320Available = FALSE;
theApp.mode640Available = FALSE;
theApp.mode800Available = FALSE;

View File

@ -2112,30 +2112,32 @@ bool VBA::updateRenderMethod0(bool force)
#endif
}
if(display->initialize()) {
winUpdateSkin();
if(initInput) {
if(!this->initInput()) {
changingVideoSize = false;
AfxPostQuitMessage(0);
return false;
}
input->checkKeys();
updateMenuBar();
changingVideoSize = false;
updateWindowSize(videoOption);
if( preInitialize() ) {
if( display->initialize() ) {
winUpdateSkin();
if( initInput ) {
if( !this->initInput() ) {
changingVideoSize = false;
AfxPostQuitMessage(0);
return false;
}
input->checkKeys();
updateMenuBar();
changingVideoSize = false;
updateWindowSize(videoOption);
m_pMainWnd->ShowWindow(SW_SHOW);
m_pMainWnd->UpdateWindow();
m_pMainWnd->SetFocus();
m_pMainWnd->ShowWindow(SW_SHOW);
m_pMainWnd->UpdateWindow();
m_pMainWnd->SetFocus();
return true;
} else {
changingVideoSize = false;
return true;
}
}
changingVideoSize = false;
return true;
} else {
changingVideoSize = false;
return true;
}
}
}
changingVideoSize = false;
}
return true;
}