summaryrefslogtreecommitdiffstats
path: root/src/core/main.cpp
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-04-15 22:36:21 +0200
committeraap <aap@papnet.eu>2020-04-15 22:36:21 +0200
commitafce2e1bb3212a01efe0205313cf5d632eee8a20 (patch)
treee9602e11ba49ad3cd35c0af4355eec330d73aa8b /src/core/main.cpp
parentimplemented most of librw wrapper (diff)
parentMerge pull request #440 from Fire-Head/master (diff)
downloadre3-afce2e1bb3212a01efe0205313cf5d632eee8a20.tar
re3-afce2e1bb3212a01efe0205313cf5d632eee8a20.tar.gz
re3-afce2e1bb3212a01efe0205313cf5d632eee8a20.tar.bz2
re3-afce2e1bb3212a01efe0205313cf5d632eee8a20.tar.lz
re3-afce2e1bb3212a01efe0205313cf5d632eee8a20.tar.xz
re3-afce2e1bb3212a01efe0205313cf5d632eee8a20.tar.zst
re3-afce2e1bb3212a01efe0205313cf5d632eee8a20.zip
Diffstat (limited to 'src/core/main.cpp')
-rw-r--r--src/core/main.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/core/main.cpp b/src/core/main.cpp
index f09c2e0a..b028b5fb 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -58,6 +58,7 @@
#include "Console.h"
#include "timebars.h"
#include "GenericGameStorage.h"
+#include "SceneEdit.h"
GlobalScene &Scene = *(GlobalScene*)0x726768;
@@ -690,14 +691,14 @@ DisplayGameDebugText()
CFont::SetPropOn();
CFont::SetBackgroundOff();
CFont::SetFontStyle(FONT_BANK);
- CFont::SetScale(SCREEN_STRETCH_X(0.5f), SCREEN_STRETCH_Y(0.5f));
+ CFont::SetScale(SCREEN_SCALE_X(0.5f), SCREEN_SCALE_Y(0.5f));
CFont::SetCentreOff();
CFont::SetRightJustifyOff();
CFont::SetWrapx(SCREEN_WIDTH);
CFont::SetJustifyOff();
CFont::SetBackGroundOnlyTextOff();
CFont::SetColor(CRGBA(255, 108, 0, 255));
- CFont::PrintString(10.0f, 10.0f, ver);
+ CFont::PrintString(SCREEN_SCALE_X(10.0f), SCREEN_SCALE_Y(10.0f), ver);
FrameSamples++;
FramesPerSecondCounter += 1000.0f / (CTimer::GetTimeStepNonClippedInSeconds() * 1000.0f);
@@ -748,6 +749,7 @@ DisplayGameDebugText()
AsciiToUnicode(str, ustr);
+ // Let's not scale those numbers, they look better that way :eyes:
CFont::SetPropOff();
CFont::SetBackgroundOff();
CFont::SetScale(0.7f, 1.5f);
@@ -863,11 +865,9 @@ Render2dStuff(void)
MusicManager.DisplayRadioStationName();
TheConsole.Display();
-/*
if(CSceneEdit::m_bEditOn)
CSceneEdit::Draw();
else
-*/
CHud::Draw();
CUserDisplay::OnscnTimer.ProcessForDisplay();
CMessages::Display();
@@ -1560,8 +1560,9 @@ void SystemInit()
//
#endif
-
+#ifdef GTA_PS2_STUFF
CPad::Initialise();
+#endif
CPad::GetPad(0)->Mode = 0;
CGame::frenchGame = false;