summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreray orçunus <erayorcunus@gmail.com>2020-07-09 20:48:43 +0200
committereray orçunus <erayorcunus@gmail.com>2020-07-09 20:48:43 +0200
commitaabf0f4c2c5b7b4b5dd528653b7fd6c755ecbfbe (patch)
treedf94bdfe0958e462fb0101f67d7875bcf69601d7
parentDisable loading screen (diff)
downloadre3-aabf0f4c2c5b7b4b5dd528653b7fd6c755ecbfbe.tar
re3-aabf0f4c2c5b7b4b5dd528653b7fd6c755ecbfbe.tar.gz
re3-aabf0f4c2c5b7b4b5dd528653b7fd6c755ecbfbe.tar.bz2
re3-aabf0f4c2c5b7b4b5dd528653b7fd6c755ecbfbe.tar.lz
re3-aabf0f4c2c5b7b4b5dd528653b7fd6c755ecbfbe.tar.xz
re3-aabf0f4c2c5b7b4b5dd528653b7fd6c755ecbfbe.tar.zst
re3-aabf0f4c2c5b7b4b5dd528653b7fd6c755ecbfbe.zip
-rw-r--r--src/core/main.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/core/main.cpp b/src/core/main.cpp
index 2608612a..f8a3bd0d 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -467,13 +467,16 @@ ResetLoadingScreenBar()
NumberOfChunksLoaded = 0.0f;
}
-// TODO: compare with PS2
void
LoadingScreen(const char *str1, const char *str2, const char *splashscreen)
{
-#ifndef DISABLE_LOADING_SCREEN
CSprite2d *splash;
+#ifdef DISABLE_LOADING_SCREEN
+ if (str1 && str2)
+ return;
+#endif
+
#ifndef RANDOMSPLASH
if(CGame::frenchGame || CGame::germanGame || !CGame::nastyGame)
splashscreen = "mainsc2";
@@ -535,7 +538,6 @@ LoadingScreen(const char *str1, const char *str2, const char *splashscreen)
CFont::DrawFonts();
DoRWStuffEndOfFrame();
}
-#endif
}
void