diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-13 16:55:12 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-13 16:55:12 +0200 |
| commit | d4265884966496f3e1ab64cb61097555e43a549c (patch) | |
| tree | 960d3b27ea4f34958599bfc26fe3dc07e34f03ba /src/core/main.cpp | |
| parent | ped attractor: start (diff) | |
| parent | Merge branch 'master' into miami (diff) | |
| download | re3-d4265884966496f3e1ab64cb61097555e43a549c.tar re3-d4265884966496f3e1ab64cb61097555e43a549c.tar.gz re3-d4265884966496f3e1ab64cb61097555e43a549c.tar.bz2 re3-d4265884966496f3e1ab64cb61097555e43a549c.tar.lz re3-d4265884966496f3e1ab64cb61097555e43a549c.tar.xz re3-d4265884966496f3e1ab64cb61097555e43a549c.tar.zst re3-d4265884966496f3e1ab64cb61097555e43a549c.zip | |
Diffstat (limited to 'src/core/main.cpp')
| -rw-r--r-- | src/core/main.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/core/main.cpp b/src/core/main.cpp index 00ae3774..dc61f03f 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", @@ -1281,7 +1281,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); @@ -1315,7 +1315,7 @@ void TheGame(void) if (FrontEndMenuManager.m_bWantToLoad) #endif { - char *splash1 = GetLevelSplashScreen(CGame::currLevel); + Const char *splash1 = GetLevelSplashScreen(CGame::currLevel); LoadSplash(splash1); } @@ -1776,6 +1776,8 @@ void GameInit() } } +// Not used anyway. PS2 main() port +#ifdef _WIN32 int main(int argc, char *argv[]) { @@ -1847,3 +1849,4 @@ main(int argc, char *argv[]) return 0; } +#endif |