8 files changed, 64 insertions, 54 deletions

diff --git a/src/skel/glfw/glfw.cpp b/src/skel/glfw/glfw.cpp
index c60c5cd9..407418c7 100644
--- a/src/skel/glfw/glfw.cpp
+++ b/src/skel/glfw/glfw.cpp
@@ -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);
@@ -274,7 +274,7 @@ psNativeTextureSupport(void)
  *****************************************************************************
  */
 RwBool
-psInitialise(void)
+psInitialize(void)
 {
 	PsGlobal.lastMousePos.x = PsGlobal.lastMousePos.y = 0.0f;
 
@@ -789,7 +789,7 @@ RwBool _psSetVideoMode(RwInt32 subSystem, RwInt32 videoMode)
 	
 	useDefault = TRUE;
 	
-	if ( RsEventHandler(rsRWINITIALISE, &openParams) == rsEVENTERROR )
+	if ( RsEventHandler(rsRWINITIALIZE, &openParams) == rsEVENTERROR )
 		return FALSE;
 
 	RwInitialised = TRUE;
@@ -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;
 		}
 	}
@@ -1312,7 +1312,7 @@ main(int argc, char *argv[])
 	 * Initialize the platform independent data.
 	 * This will in turn initialize the platform specific data...
 	 */
-	if( RsEventHandler(rsINITIALISE, nil) == rsEVENTERROR )
+	if( RsEventHandler(rsINITIALIZE, nil) == rsEVENTERROR )
 	{
 		return FALSE;
 	}
@@ -1355,7 +1355,7 @@ main(int argc, char *argv[])
 	/* 
 	 * Initialize the 3D (RenderWare) components of the app...
 	 */
-	if( rsEVENTERROR == RsEventHandler(rsRWINITIALISE, &openParams) )
+	if( rsEVENTERROR == RsEventHandler(rsRWINITIALIZE, &openParams) )
 	{
 		RsEventHandler(rsTERMINATE, nil);
 
@@ -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;
diff --git a/src/skel/platform.h b/src/skel/platform.h
index 65e20673..cbb1be28 100644
--- a/src/skel/platform.h
+++ b/src/skel/platform.h
@@ -15,7 +15,7 @@ extern RwUInt32 psTimer(void);
 extern double psTimer(void);
 #endif
 
-extern RwBool psInitialise(void);
+extern RwBool psInitialize(void);
 extern void   psTerminate(void);
 
 extern void psCameraShowRaster(RwCamera *camera);
diff --git a/src/skel/skeleton.cpp b/src/skel/skeleton.cpp
index 5191eda7..073155d6 100644
--- a/src/skel/skeleton.cpp
+++ b/src/skel/skeleton.cpp
@@ -246,8 +246,8 @@ RsEventHandler(RsEvent event, void *param)
 				result = (rsEVENTPROCESSED);
 				break;
 
-			case rsRWINITIALISE:
-				result = (RsRwInitialise(param) ?
+			case rsRWINITIALIZE:
+				result = (RsRwInitialize(param) ?
 						  rsEVENTPROCESSED : rsEVENTERROR);
 				break;
 
@@ -256,9 +256,9 @@ RsEventHandler(RsEvent event, void *param)
 				result = (rsEVENTPROCESSED);
 				break;
 
-			case rsINITIALISE:
+			case rsINITIALIZE:
 				result =
-					(RsInitialise()? rsEVENTPROCESSED : rsEVENTERROR);
+					(RsInitialize()? rsEVENTPROCESSED : rsEVENTERROR);
 				break;
 
 			default:
@@ -294,7 +294,7 @@ RsRwTerminate(void)
  *****************************************************************************
  */
 RwBool
-RsRwInitialise(void *displayID)
+RsRwInitialize(void *displayID)
 {
 	RwEngineOpenParams  openParams;
 
@@ -383,14 +383,14 @@ RsTerminate(void)
  *****************************************************************************
  */
 RwBool
-RsInitialise(void)
+RsInitialize(void)
 {
 	/*
 	 * Initialize Platform independent data...
 	 */
 	RwBool              result;
 
-	RsGlobal.appName = RWSTRING("GTA3");
+	RsGlobal.appName = RWSTRING("GTA: Vice City");
 	RsGlobal.maximumWidth = DEFAULT_SCREEN_WIDTH;
 	RsGlobal.maximumHeight = DEFAULT_SCREEN_HEIGHT;
 	RsGlobal.width = DEFAULT_SCREEN_WIDTH;
@@ -415,7 +415,7 @@ RsInitialise(void)
 	RsGlobal.pad.inputEventHandler = nil;
 	RsGlobal.pad.used = FALSE;
 
-	result = psInitialise();
+	result = psInitialize();
 
 	return result;
 }
diff --git a/src/skel/skeleton.h b/src/skel/skeleton.h
index 8303bd9a..b5ea5abf 100644
--- a/src/skel/skeleton.h
+++ b/src/skel/skeleton.h
@@ -61,10 +61,10 @@ enum RsEvent
 	_rs_18,
 	_rs_19,
 	_rs_20,
-	rsRWINITIALISE,
+	rsRWINITIALIZE,
 	rsRWTERMINATE,
 	rsSELECTDEVICE,
-	rsINITIALISE,
+	rsINITIALIZE,
 	rsTERMINATE,
 	rsIDLE,
 	rsFRONTENDIDLE,
@@ -241,19 +241,19 @@ extern RsEventStatus RsEventHandler(RsEvent event, void *param);
 extern RsEventStatus RsKeyboardEventHandler(RsEvent event, void *param);
 extern RsEventStatus RsPadEventHandler(RsEvent event, void *param);
 
-extern RwBool                   
-RsInitialise(void);
+extern RwBool
+RsInitialize(void);
 
-extern RwBool                   
+extern RwBool
 RsRegisterImageLoader(void);
 
-extern RwBool                   
-RsRwInitialise(void *param);
+extern RwBool
+RsRwInitialize(void *param);
 
-extern RwBool                   
+extern RwBool
 RsSelectDevice(void);
 
-extern RwBool                   
+extern RwBool
 RsInputDeviceAttach(RsInputDeviceType inputDevice,
 					RsInputEventHandler inputEventHandler);
 
diff --git a/src/skel/win/gta3.ico b/src/skel/win/gta3.ico
deleted file mode 100644
index 2017c811..00000000
--- a/src/skel/win/gta3.ico
+++ /dev/null
diff --git a/src/skel/win/gtavc.ico b/src/skel/win/gtavc.ico
new file mode 100644
index 00000000..d253ff2c
--- /dev/null
+++ b/src/skel/win/gtavc.ico
diff --git a/src/skel/win/win.cpp b/src/skel/win/win.cpp
index f41b9ef8..7de58d87 100644
--- a/src/skel/win/win.cpp
+++ b/src/skel/win/win.cpp
@@ -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);
@@ -584,7 +584,7 @@ void _psPrintCpuInfo()
  *****************************************************************************
  */
 RwBool
-psInitialise(void)
+psInitialize(void)
 {
 	PsGlobal.lastMousePos.x = PsGlobal.lastMousePos.y = 0.0f;
 
@@ -1222,6 +1222,16 @@ MainWndProc(HWND window, UINT message, WPARAM wParam, LPARAM lParam)
 			break;
 		}
 
+#ifdef FIX_BUGS // game turns on menu when focus is re-gained rather than lost
+		case WM_KILLFOCUS:
+#else
+		case WM_SETFOCUS:
+#endif
+		{
+			CGame::InitAfterFocusLoss();
+			break;
+		}
+
 	}
 
 	/*
@@ -1525,7 +1535,7 @@ RwBool _psSetVideoMode(RwInt32 subSystem, RwInt32 videoMode)
 	
 	useDefault = TRUE;
 	
-	if ( RsEventHandler(rsRWINITIALISE, PSGLOBAL(window)) == rsEVENTERROR )
+	if ( RsEventHandler(rsRWINITIALIZE, PSGLOBAL(window)) == rsEVENTERROR )
 		return FALSE;
 	
 	RwInitialised = TRUE;
@@ -1654,7 +1664,7 @@ void InitialiseLanguage()
 		|| primLayout	  == LANG_GERMAN )
 	{
 		CGame::nastyGame = false;
-		CMenuManager::m_PrefsAllowNastyGame = false;
+		FrontEndMenuManager.m_PrefsAllowNastyGame = false;
 		CGame::germanGame = true;
 	}
 	
@@ -1663,7 +1673,7 @@ void InitialiseLanguage()
 		|| primLayout	  == LANG_FRENCH )
 	{
 		CGame::nastyGame = false;
-		CMenuManager::m_PrefsAllowNastyGame = false;
+		FrontEndMenuManager.m_PrefsAllowNastyGame = false;
 		CGame::frenchGame = true;
 	}
 	
@@ -1674,7 +1684,7 @@ void InitialiseLanguage()
 
 #ifdef NASTY_GAME
 	CGame::nastyGame = true;
-	CMenuManager::m_PrefsAllowNastyGame = true;
+	FrontEndMenuManager.m_PrefsAllowNastyGame = true;
 	CGame::noProstitutes = false;
 #endif
 	
@@ -1709,33 +1719,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;
 		}
 	}
@@ -1894,7 +1904,7 @@ WinMain(HINSTANCE instance,
 	 * Initialize the platform independent data.
 	 * This will in turn initialize the platform specific data...
 	 */
-	if( RsEventHandler(rsINITIALISE, nil) == rsEVENTERROR )
+	if( RsEventHandler(rsINITIALIZE, nil) == rsEVENTERROR )
 	{
 		return FALSE;
 	}
@@ -1960,7 +1970,7 @@ WinMain(HINSTANCE instance,
 	/* 
 	 * Initialize the 3D (RenderWare) components of the app...
 	 */
-	if( rsEVENTERROR == RsEventHandler(rsRWINITIALISE, PSGLOBAL(window)) )
+	if( rsEVENTERROR == RsEventHandler(rsRWINITIALIZE, PSGLOBAL(window)) )
 	{
 		DestroyWindow(PSGLOBAL(window));
 
@@ -2128,7 +2138,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 +2189,7 @@ WinMain(HINSTANCE instance,
 						
 						FrontEndMenuManager.m_bGameNotLoaded = true;
 						
-						CMenuManager::m_bStartUpFrontEndRequested = true;
+						FrontEndMenuManager.m_bStartUpFrontEndRequested = true;
 						
 						if ( defaultFullscreenRes )
 						{
@@ -2230,7 +2240,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 +2251,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;
diff --git a/src/skel/win/win.rc b/src/skel/win/win.rc
index 379c473d..9b5aa305 100644
--- a/src/skel/win/win.rc
+++ b/src/skel/win/win.rc
@@ -42,6 +42,6 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDI_MAIN_ICON           ICON    DISCARDABLE     "gta3.ico"
+IDI_MAIN_ICON           ICON    DISCARDABLE     "gtavc.ico"
 
 /////////////////////////////////////////////////////////////////////////////
\ No newline at end of file