summaryrefslogtreecommitdiffstats
path: root/src/core/main.cpp
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-03-23 00:34:41 +0100
committerGitHub <noreply@github.com>2020-03-23 00:34:41 +0100
commit4070cad4a746728f0282862aa0a0063c15bbc86e (patch)
treefd780f1f980c6d2036f8b57c32f75e203c7b39a8 /src/core/main.cpp
parentFix order of math operations on integers (fires) (diff)
parentmerge with upstream (diff)
downloadre3-4070cad4a746728f0282862aa0a0063c15bbc86e.tar
re3-4070cad4a746728f0282862aa0a0063c15bbc86e.tar.gz
re3-4070cad4a746728f0282862aa0a0063c15bbc86e.tar.bz2
re3-4070cad4a746728f0282862aa0a0063c15bbc86e.tar.lz
re3-4070cad4a746728f0282862aa0a0063c15bbc86e.tar.xz
re3-4070cad4a746728f0282862aa0a0063c15bbc86e.tar.zst
re3-4070cad4a746728f0282862aa0a0063c15bbc86e.zip
Diffstat (limited to 'src/core/main.cpp')
-rw-r--r--src/core/main.cpp15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/core/main.cpp b/src/core/main.cpp
index 6043074f..2a15e20e 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -49,6 +49,7 @@
#include "Frontend.h"
#include "AnimViewer.h"
#include "Script.h"
+#include "Debug.h"
#include "Console.h"
#define DEFAULT_VIEWWINDOW (Tan(DEGTORAD(CDraw::GetFOV() * 0.5f)))
@@ -324,7 +325,7 @@ DoRWStuffStartOfFrame_Horizon(int16 TopRed, int16 TopGreen, int16 TopBlue, int16
void
DoRWStuffEndOfFrame(void)
{
- // CDebug::DebugDisplayTextBuffer();
+ CDebug::DebugDisplayTextBuffer();
// FlushObrsPrintfs();
RwCameraEndUpdate(Scene.camera);
RsCameraShowRaster(Scene.camera);
@@ -725,6 +726,12 @@ DestroySplashScreen(void)
float NumberOfChunksLoaded;
#define TOTALNUMCHUNKS 73.0f
+void
+ResetLoadingScreenBar()
+{
+ NumberOfChunksLoaded = 0.0f;
+}
+
// TODO: compare with PS2
void
LoadingScreen(const char *str1, const char *str2, const char *splashscreen)
@@ -793,12 +800,6 @@ LoadingScreen(const char *str1, const char *str2, const char *splashscreen)
}
void
-ResetLoadingScreenBar(void)
-{
- NumberOfChunksLoaded = 0.0f;
-}
-
-void
LoadingIslandScreen(const char *levelName)
{
CSprite2d *splash;