summaryrefslogtreecommitdiffstats
path: root/src/core/main.cpp
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-03-22 15:23:40 +0100
committerNikolay Korolev <nickvnuk@gmail.com>2020-03-22 15:23:40 +0100
commit34b18815286938176b0462ba5a97ea03195409fb (patch)
tree62e01aacd06b12acb897dc48b45ca800ed77d44d /src/core/main.cpp
parentbullet traces fixes (diff)
downloadre3-34b18815286938176b0462ba5a97ea03195409fb.tar
re3-34b18815286938176b0462ba5a97ea03195409fb.tar.gz
re3-34b18815286938176b0462ba5a97ea03195409fb.tar.bz2
re3-34b18815286938176b0462ba5a97ea03195409fb.tar.lz
re3-34b18815286938176b0462ba5a97ea03195409fb.tar.xz
re3-34b18815286938176b0462ba5a97ea03195409fb.tar.zst
re3-34b18815286938176b0462ba5a97ea03195409fb.zip
Diffstat (limited to 'src/core/main.cpp')
-rw-r--r--src/core/main.cpp18
1 files changed, 10 insertions, 8 deletions
diff --git a/src/core/main.cpp b/src/core/main.cpp
index 90afff72..95ea345a 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -49,6 +49,8 @@
#include "Frontend.h"
#include "AnimViewer.h"
#include "Script.h"
+#include "Debug.h"
+#include "Console.h"
#define DEFAULT_VIEWWINDOW (Tan(DEGTORAD(CDraw::GetFOV() * 0.5f)))
@@ -323,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);
@@ -429,7 +431,7 @@ Render2dStuff(void)
}
MusicManager.DisplayRadioStationName();
-// TheConsole.Display();
+ TheConsole.Display();
/*
if(CSceneEdit::m_bEditOn)
CSceneEdit::Draw();
@@ -724,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)
@@ -792,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;