From e1044a79478a3e25bfc44e699eb1f419275e9a0f Mon Sep 17 00:00:00 2001
From: erorcun <erorcunerorcun@hotmail.com.tr>
Date: Wed, 9 Dec 2020 04:57:45 +0300
Subject: AnimViewer fixes, commentary from miami

---
 src/core/main.cpp | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

(limited to 'src/core/main.cpp')

diff --git a/src/core/main.cpp b/src/core/main.cpp
index 54821979..cc20047f 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -616,8 +616,10 @@ LoadingScreen(const char *str1, const char *str2, const char *splashscreen)
 			AsciiToUnicode(str1, tmpstr);
 			CFont::PrintString(hpos, vpos, tmpstr);
 			vpos += 22*yscale;
-			AsciiToUnicode(str2, tmpstr);
-			CFont::PrintString(hpos, vpos, tmpstr);
+			if (str2) {
+				AsciiToUnicode(str2, tmpstr);
+				CFont::PrintString(hpos, vpos, tmpstr);
+			}
 #endif
 		}
 
@@ -1513,15 +1515,6 @@ AppEventHandler(RsEvent event, void *param)
 			return rsEVENTPROCESSED;
 		}
 
-#ifndef MASTER
-		case rsANIMVIEWER:
-		{
-			TheModelViewer();
-
-			return rsEVENTPROCESSED;
-		}
-#endif
-
 		default:
 		{
 			return rsEVENTNOTPROCESSED;
@@ -1536,8 +1529,11 @@ TheModelViewer(void)
 #if (defined(GTA_PS2) || defined(GTA_XBOX))
 	//TODO
 #else
+	// This is III Mobile code. III Xbox code run it like main function, which is impossible to implement on PC's state machine implementation.
+	// Also we want 2D things initialized in here to print animation ids etc., our additions for that marked with X
+
 #ifdef ASPECT_RATIO_SCALE
-	CDraw::SetAspectRatio(CDraw::FindAspectRatio());
+	CDraw::SetAspectRatio(CDraw::FindAspectRatio()); // X
 #endif
 	CAnimViewer::Update();
 	CTimer::Update();
@@ -1547,12 +1543,12 @@ TheModelViewer(void)
 		CTimeCycle::GetSkyBottomRed(), CTimeCycle::GetSkyBottomGreen(), CTimeCycle::GetSkyBottomBlue(),
 		255);
 
-	CSprite2d::InitPerFrame();
-	CFont::InitPerFrame();
+	CSprite2d::InitPerFrame(); // X
+	CFont::InitPerFrame(); // X
 	DefinedState();
 	CVisibilityPlugins::InitAlphaEntityList();
 	CAnimViewer::Render();
-	Render2dStuff();
+	Render2dStuff(); // X
 	DoRWStuffEndOfFrame();
 #endif
 }
-- 
cgit v1.2.3