Merge kbm-ig into kbm

Minecraft.Client/Common/UI/UIScene.cpp

@@ -130,15 +130,18 @@ F64 UIScene::getSafeZoneHalfHeight()
 	float safeHeight = 0.0f;
 
 #ifndef __PSVITA__
-	if( !RenderManager.IsHiDef() && RenderManager.IsWidescreen() )
+	if (!(height >= 544.0f && height < 720.0f))
 	{
-		// 90% safezone
-		safeHeight = height * (0.15f / 2);
-	}
-	else
-	{
-		// 90% safezone
-		safeHeight = height * (0.1f / 2);
+		if( !RenderManager.IsHiDef() && RenderManager.IsWidescreen() )
+		{
+			// 90% safezone
+			safeHeight = height * (0.15f / 2);
+		}
+		else
+		{
+			// 90% safezone
+			safeHeight = height * (0.1f / 2);
+		}
 	}
 #endif
 	return safeHeight;
@@ -150,15 +153,18 @@ F64 UIScene::getSafeZoneHalfWidth()
 
 	float safeWidth = 0.0f;
 #ifndef __PSVITA__
-	if( !RenderManager.IsHiDef() && RenderManager.IsWidescreen() )
+	if (!(width >= 960.0f && width < 1280.0f))
 	{
-		// 85% safezone
-		safeWidth = width * (0.15f / 2);
-	}
-	else
-	{
-		// 90% safezone
-		safeWidth = width * (0.1f / 2);
+		if( !RenderManager.IsHiDef() && RenderManager.IsWidescreen() )
+		{
+			// 85% safezone
+			safeWidth = width * (0.15f / 2);
+		}
+		else
+		{
+			// 90% safezone
+			safeWidth = width * (0.1f / 2);
+		}
 	}
 #endif
 	return safeWidth;
@@ -283,7 +289,7 @@ bool UIScene::mapElementsAndNames()
 extern CRITICAL_SECTION s_loadSkinCS;
 void UIScene::loadMovie()
 {
-	EnterCriticalSection(&UIController::ms_reloadSkinCS);		// MGH - added to prevent crash loading Iggy movies while the skins were being reloaded
+	EnterCriticalSection(&UIController::ms_reloadSkinsCS);		// MGH - added to prevent crash loading Iggy movies while the skins were being reloaded
 	wstring moviePath = getMoviePath();
 
 #ifdef __PS3__
@@ -314,7 +320,7 @@ void UIScene::loadMovie()
 	else if(ui.getScreenWidth() >= 960)
 	{
 		moviePath.append(L"Vita.swf");
-		m_loadedResolution = eSceneResolution_Vita;
+		m_loadedResolution = eSceneResolution_544;
 	}
 	else
 	{
@@ -345,11 +351,36 @@ void UIScene::loadMovie()
 
 		if(!app.hasArchiveFile(moviePath))
 		{
+		//str1k3r - if were on Windows64 we have more fallbacks dont just report a FatalLoadError, try those other swfs before reporting a FatalLoadError
+#ifndef _WINDOWS64
 			app.DebugPrintf("ERROR: Could not find any iggy movie for %ls!\n", moviePath.c_str());
+			
 #ifndef _CONTENT_PACKAGE
 			__debugbreak();
 #endif
 			app.FatalLoadError();
+#else
+			app.DebugPrintf("WARNING: Could not find iggy movie %ls, falling back on Vita\n", moviePath.c_str());
+
+			moviePath = getMoviePath();
+			moviePath.append(L"Vita.swf");
+			m_loadedResolution = eSceneResolution_544;
+
+			//str1k3r - while 480 & Vita share basically all the same skins its just a extra fallback :D
+			if(!app.hasArchiveFile(moviePath))
+			{
+				app.DebugPrintf("WARNING: Could not find iggy movie %ls, falling back on 480\n", moviePath.c_str());
+
+				moviePath = getMoviePath();
+				moviePath.append(L"480.swf");
+				m_loadedResolution = eSceneResolution_480;
+
+				if(!app.hasArchiveFile(moviePath))
+				{
+					app.FatalLoadError();
+				}
+			}
+#endif
 		}
 	}
 
@@ -408,7 +439,7 @@ void UIScene::loadMovie()
 	app.DebugPrintf(app.USER_SR, "%ls - Total: %d, Expected: %d, Diff: %d\n", moviePath.c_str(), totalStatic + totalDynamic, afterTick - beforeLoad, (afterTick - beforeLoad) - (totalStatic + totalDynamic));
 
 #endif
-	LeaveCriticalSection(&UIController::ms_reloadSkinCS);
+	LeaveCriticalSection(&UIController::ms_reloadSkinsCS);
 
 }
 
@@ -928,7 +959,7 @@ void UIScene::handleGainFocus(bool navBack)
 
 void UIScene::updateTooltips()
 {
-	if(!ui.IsReloadingSkin())
+	if(!ui.IsReloadingSkins())
 		ui.SetTooltips(m_iPad, -1);
 }