From 8a4fa58cd42b7cca4a86fe2d9913b839b554bf10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?eray=20or=C3=A7unus?= Date: Mon, 11 May 2020 05:55:57 +0300 Subject: Linux build support --- src/core/main.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/core/main.cpp') diff --git a/src/core/main.cpp b/src/core/main.cpp index 37a5673f..d6af0b2a 100644 --- a/src/core/main.cpp +++ b/src/core/main.cpp @@ -1773,6 +1773,8 @@ void GameInit() } } +// Not used anyway. PS2 main() port +#ifdef _WIN32 int main(int argc, char *argv[]) { @@ -1844,3 +1846,4 @@ main(int argc, char *argv[]) return 0; } +#endif -- cgit v1.2.3 From 98a233da43acfa1bd1144d5b0236783beef30785 Mon Sep 17 00:00:00 2001 From: aap Date: Tue, 12 May 2020 16:27:12 +0200 Subject: little fixes to CClouds; disabled object clipping for SA cam --- src/core/main.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/core/main.cpp') diff --git a/src/core/main.cpp b/src/core/main.cpp index d6af0b2a..bcd6202e 100644 --- a/src/core/main.cpp +++ b/src/core/main.cpp @@ -263,6 +263,9 @@ DoFade(void) void DoRWStuffEndOfFrame(void) { +char buf[100]; +sprintf(buf, "timestep: %f %f", CTimer::GetTimeStep(), CTimer::GetTimeStepInMilliseconds()); +CDebug::PrintAt(buf, 10, 10); CDebug::DisplayScreenStrings(); // custom CDebug::DebugDisplayTextBuffer(); FlushObrsPrintfs(); -- cgit v1.2.3 From bcd2f8c64cd85ad08076c4312a74f393242586fc Mon Sep 17 00:00:00 2001 From: aap Date: Tue, 12 May 2020 20:44:37 +0200 Subject: remove debug shit --- src/core/main.cpp | 3 --- 1 file changed, 3 deletions(-) (limited to 'src/core/main.cpp') diff --git a/src/core/main.cpp b/src/core/main.cpp index bcd6202e..d6af0b2a 100644 --- a/src/core/main.cpp +++ b/src/core/main.cpp @@ -263,9 +263,6 @@ DoFade(void) void DoRWStuffEndOfFrame(void) { -char buf[100]; -sprintf(buf, "timestep: %f %f", CTimer::GetTimeStep(), CTimer::GetTimeStepInMilliseconds()); -CDebug::PrintAt(buf, 10, 10); CDebug::DisplayScreenStrings(); // custom CDebug::DebugDisplayTextBuffer(); FlushObrsPrintfs(); -- cgit v1.2.3 From c2ac6b3759901ecede7b22c1e9ab9f5a04ddd527 Mon Sep 17 00:00:00 2001 From: Filip Gawin Date: Tue, 12 May 2020 01:24:57 +0200 Subject: Fix linux warnings --- src/core/main.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/core/main.cpp') diff --git a/src/core/main.cpp b/src/core/main.cpp index d6af0b2a..1ea8dc7f 100644 --- a/src/core/main.cpp +++ b/src/core/main.cpp @@ -401,7 +401,7 @@ DestroySplashScreen(void) splashTxdId = -1; } -char* +Const char* GetRandomSplashScreen(void) { int index; @@ -424,10 +424,10 @@ GetRandomSplashScreen(void) return splashName; } -char* +Const char* GetLevelSplashScreen(int level) { - static char *splashScreens[4] = { + static Const char *splashScreens[4] = { nil, "splash1", "splash2", @@ -1278,7 +1278,7 @@ void TheGame(void) CGame::Initialise("DATA\\GTA3.DAT"); #endif - char *splash = GetRandomSplashScreen(); // inlined here + Const char *splash = GetRandomSplashScreen(); // inlined here LoadingScreen("Starting Game", NULL, splash); @@ -1312,7 +1312,7 @@ void TheGame(void) if (FrontEndMenuManager.m_bWantToLoad) #endif { - char *splash1 = GetLevelSplashScreen(CGame::currLevel); + Const char *splash1 = GetLevelSplashScreen(CGame::currLevel); LoadSplash(splash1); } -- cgit v1.2.3