mirror of
https://github.com/halpz/re3.git
synced 2025-06-30 09:16:22 +00:00
VC CMenuManager struct, ctor etc.
This commit is contained in:
@ -176,7 +176,7 @@ psCameraBeginUpdate(RwCamera *camera)
|
||||
void
|
||||
psCameraShowRaster(RwCamera *camera)
|
||||
{
|
||||
if (CMenuManager::m_PrefsVsync)
|
||||
if (FrontEndMenuManager.m_PrefsVsync)
|
||||
RwCameraShowRaster(camera, PSGLOBAL(window), rwRASTERFLIPWAITVSYNC);
|
||||
else
|
||||
RwCameraShowRaster(camera, PSGLOBAL(window), rwRASTERFLIPDONTWAIT);
|
||||
@ -944,7 +944,7 @@ void InitialiseLanguage()
|
||||
|| primLayout == LANG_GERMAN )
|
||||
{
|
||||
CGame::nastyGame = false;
|
||||
CMenuManager::m_PrefsAllowNastyGame = false;
|
||||
FrontEndMenuManager.m_PrefsAllowNastyGame = false;
|
||||
CGame::germanGame = true;
|
||||
}
|
||||
|
||||
@ -953,7 +953,7 @@ void InitialiseLanguage()
|
||||
|| primLayout == LANG_FRENCH )
|
||||
{
|
||||
CGame::nastyGame = false;
|
||||
CMenuManager::m_PrefsAllowNastyGame = false;
|
||||
FrontEndMenuManager.m_PrefsAllowNastyGame = false;
|
||||
CGame::frenchGame = true;
|
||||
}
|
||||
|
||||
@ -964,7 +964,7 @@ void InitialiseLanguage()
|
||||
|
||||
#ifdef NASTY_GAME
|
||||
CGame::nastyGame = true;
|
||||
CMenuManager::m_PrefsAllowNastyGame = true;
|
||||
FrontEndMenuManager.m_PrefsAllowNastyGame = true;
|
||||
CGame::noProstitutes = false;
|
||||
#endif
|
||||
|
||||
@ -999,33 +999,33 @@ void InitialiseLanguage()
|
||||
}
|
||||
}
|
||||
|
||||
CMenuManager::OS_Language = primUserLCID;
|
||||
FrontEndMenuManager.OS_Language = primUserLCID;
|
||||
|
||||
switch ( lang )
|
||||
{
|
||||
case LANG_GERMAN:
|
||||
{
|
||||
CMenuManager::m_PrefsLanguage = LANGUAGE_GERMAN;
|
||||
FrontEndMenuManager.m_PrefsLanguage = LANGUAGE_GERMAN;
|
||||
break;
|
||||
}
|
||||
case LANG_SPANISH:
|
||||
{
|
||||
CMenuManager::m_PrefsLanguage = LANGUAGE_SPANISH;
|
||||
FrontEndMenuManager.m_PrefsLanguage = LANGUAGE_SPANISH;
|
||||
break;
|
||||
}
|
||||
case LANG_FRENCH:
|
||||
{
|
||||
CMenuManager::m_PrefsLanguage = LANGUAGE_FRENCH;
|
||||
FrontEndMenuManager.m_PrefsLanguage = LANGUAGE_FRENCH;
|
||||
break;
|
||||
}
|
||||
case LANG_ITALIAN:
|
||||
{
|
||||
CMenuManager::m_PrefsLanguage = LANGUAGE_ITALIAN;
|
||||
FrontEndMenuManager.m_PrefsLanguage = LANGUAGE_ITALIAN;
|
||||
break;
|
||||
}
|
||||
default:
|
||||
{
|
||||
CMenuManager::m_PrefsLanguage = LANGUAGE_AMERICAN;
|
||||
FrontEndMenuManager.m_PrefsLanguage = LANGUAGE_AMERICAN;
|
||||
break;
|
||||
}
|
||||
}
|
||||
@ -1486,7 +1486,7 @@ main(int argc, char *argv[])
|
||||
|
||||
FrontEndMenuManager.m_bGameNotLoaded = true;
|
||||
|
||||
CMenuManager::m_bStartUpFrontEndRequested = true;
|
||||
FrontEndMenuManager.m_bStartUpFrontEndRequested = true;
|
||||
|
||||
if ( defaultFullscreenRes )
|
||||
{
|
||||
@ -1535,7 +1535,7 @@ main(int argc, char *argv[])
|
||||
float ms = (float)CTimer::GetCurrentTimeInCycles() / (float)CTimer::GetCyclesPerMillisecond();
|
||||
if ( RwInitialised )
|
||||
{
|
||||
if (!CMenuManager::m_PrefsFrameLimiter || (1000.0f / (float)RsGlobal.maxFPS) < ms)
|
||||
if (!FrontEndMenuManager.m_PrefsFrameLimiter || (1000.0f / (float)RsGlobal.maxFPS) < ms)
|
||||
RsEventHandler(rsIDLE, (void *)TRUE);
|
||||
}
|
||||
break;
|
||||
@ -1546,7 +1546,7 @@ main(int argc, char *argv[])
|
||||
float ms = (float)CTimer::GetCurrentTimeInCycles() / (float)CTimer::GetCyclesPerMillisecond();
|
||||
if (RwInitialised)
|
||||
{
|
||||
if (!CMenuManager::m_PrefsFrameLimiter || (1000.0f / (float)RsGlobal.maxFPS) < ms)
|
||||
if (!FrontEndMenuManager.m_PrefsFrameLimiter || (1000.0f / (float)RsGlobal.maxFPS) < ms)
|
||||
RsEventHandler(rsANIMVIEWER, (void*)TRUE);
|
||||
}
|
||||
break;
|
||||
|
@ -221,7 +221,7 @@ psCameraBeginUpdate(RwCamera *camera)
|
||||
void
|
||||
psCameraShowRaster(RwCamera *camera)
|
||||
{
|
||||
if (CMenuManager::m_PrefsVsync)
|
||||
if (FrontEndMenuManager.m_PrefsVsync)
|
||||
RwCameraShowRaster(camera, PSGLOBAL(window), rwRASTERFLIPWAITVSYNC);
|
||||
else
|
||||
RwCameraShowRaster(camera, PSGLOBAL(window), rwRASTERFLIPDONTWAIT);
|
||||
@ -1654,7 +1654,7 @@ void InitialiseLanguage()
|
||||
|| primLayout == LANG_GERMAN )
|
||||
{
|
||||
CGame::nastyGame = false;
|
||||
CMenuManager::m_PrefsAllowNastyGame = false;
|
||||
FrontEndMenuManager.m_PrefsAllowNastyGame = false;
|
||||
CGame::germanGame = true;
|
||||
}
|
||||
|
||||
@ -1663,7 +1663,7 @@ void InitialiseLanguage()
|
||||
|| primLayout == LANG_FRENCH )
|
||||
{
|
||||
CGame::nastyGame = false;
|
||||
CMenuManager::m_PrefsAllowNastyGame = false;
|
||||
FrontEndMenuManager.m_PrefsAllowNastyGame = false;
|
||||
CGame::frenchGame = true;
|
||||
}
|
||||
|
||||
@ -1674,7 +1674,7 @@ void InitialiseLanguage()
|
||||
|
||||
#ifdef NASTY_GAME
|
||||
CGame::nastyGame = true;
|
||||
CMenuManager::m_PrefsAllowNastyGame = true;
|
||||
FrontEndMenuManager.m_PrefsAllowNastyGame = true;
|
||||
CGame::noProstitutes = false;
|
||||
#endif
|
||||
|
||||
@ -1709,33 +1709,33 @@ void InitialiseLanguage()
|
||||
}
|
||||
}
|
||||
|
||||
CMenuManager::OS_Language = primUserLCID;
|
||||
FrontEndMenuManager.OS_Language = primUserLCID;
|
||||
|
||||
switch ( lang )
|
||||
{
|
||||
case LANG_GERMAN:
|
||||
{
|
||||
CMenuManager::m_PrefsLanguage = LANGUAGE_GERMAN;
|
||||
FrontEndMenuManager.m_PrefsLanguage = LANGUAGE_GERMAN;
|
||||
break;
|
||||
}
|
||||
case LANG_SPANISH:
|
||||
{
|
||||
CMenuManager::m_PrefsLanguage = LANGUAGE_SPANISH;
|
||||
FrontEndMenuManager.m_PrefsLanguage = LANGUAGE_SPANISH;
|
||||
break;
|
||||
}
|
||||
case LANG_FRENCH:
|
||||
{
|
||||
CMenuManager::m_PrefsLanguage = LANGUAGE_FRENCH;
|
||||
FrontEndMenuManager.m_PrefsLanguage = LANGUAGE_FRENCH;
|
||||
break;
|
||||
}
|
||||
case LANG_ITALIAN:
|
||||
{
|
||||
CMenuManager::m_PrefsLanguage = LANGUAGE_ITALIAN;
|
||||
FrontEndMenuManager.m_PrefsLanguage = LANGUAGE_ITALIAN;
|
||||
break;
|
||||
}
|
||||
default:
|
||||
{
|
||||
CMenuManager::m_PrefsLanguage = LANGUAGE_AMERICAN;
|
||||
FrontEndMenuManager.m_PrefsLanguage = LANGUAGE_AMERICAN;
|
||||
break;
|
||||
}
|
||||
}
|
||||
@ -2128,7 +2128,7 @@ WinMain(HINSTANCE instance,
|
||||
|
||||
CoUninitialize();
|
||||
|
||||
if ( CMenuManager::OS_Language == LANG_FRENCH || CMenuManager::OS_Language == LANG_GERMAN )
|
||||
if ( FrontEndMenuManager.OS_Language == LANG_FRENCH || FrontEndMenuManager.OS_Language == LANG_GERMAN )
|
||||
PlayMovieInWindow(cmdShow, "movies\\GTAtitlesGER.mpg");
|
||||
else
|
||||
PlayMovieInWindow(cmdShow, "movies\\GTAtitles.mpg");
|
||||
@ -2179,7 +2179,7 @@ WinMain(HINSTANCE instance,
|
||||
|
||||
FrontEndMenuManager.m_bGameNotLoaded = true;
|
||||
|
||||
CMenuManager::m_bStartUpFrontEndRequested = true;
|
||||
FrontEndMenuManager.m_bStartUpFrontEndRequested = true;
|
||||
|
||||
if ( defaultFullscreenRes )
|
||||
{
|
||||
@ -2230,7 +2230,7 @@ WinMain(HINSTANCE instance,
|
||||
float ms = (float)CTimer::GetCurrentTimeInCycles() / (float)CTimer::GetCyclesPerMillisecond();
|
||||
if ( RwInitialised )
|
||||
{
|
||||
if (!CMenuManager::m_PrefsFrameLimiter || (1000.0f / (float)RsGlobal.maxFPS) < ms)
|
||||
if (!FrontEndMenuManager.m_PrefsFrameLimiter || (1000.0f / (float)RsGlobal.maxFPS) < ms)
|
||||
RsEventHandler(rsIDLE, (void *)TRUE);
|
||||
}
|
||||
break;
|
||||
@ -2241,7 +2241,7 @@ WinMain(HINSTANCE instance,
|
||||
float ms = (float)CTimer::GetCurrentTimeInCycles() / (float)CTimer::GetCyclesPerMillisecond();
|
||||
if (RwInitialised)
|
||||
{
|
||||
if (!CMenuManager::m_PrefsFrameLimiter || (1000.0f / (float)RsGlobal.maxFPS) < ms)
|
||||
if (!FrontEndMenuManager.m_PrefsFrameLimiter || (1000.0f / (float)RsGlobal.maxFPS) < ms)
|
||||
RsEventHandler(rsANIMVIEWER, (void*)TRUE);
|
||||
}
|
||||
break;
|
||||
|
Reference in New Issue
Block a user