summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorwithmorten <morten.with@gmail.com>2020-10-29 19:01:09 +0100
committerwithmorten <morten.with@gmail.com>2020-10-29 19:18:46 +0100
commite95516032f4e44ea35b7358f60c464c0faa1df91 (patch)
treec5f78e8154050434524296da0cc9150d146e0cc8 /src
parentNew GXT lines (diff)
downloadre3-e95516032f4e44ea35b7358f60c464c0faa1df91.tar
re3-e95516032f4e44ea35b7358f60c464c0faa1df91.tar.gz
re3-e95516032f4e44ea35b7358f60c464c0faa1df91.tar.bz2
re3-e95516032f4e44ea35b7358f60c464c0faa1df91.tar.lz
re3-e95516032f4e44ea35b7358f60c464c0faa1df91.tar.xz
re3-e95516032f4e44ea35b7358f60c464c0faa1df91.tar.zst
re3-e95516032f4e44ea35b7358f60c464c0faa1df91.zip
Diffstat (limited to 'src')
-rw-r--r--src/core/Frontend.cpp2
-rw-r--r--src/core/config.h24
-rw-r--r--src/core/main.cpp3
-rw-r--r--src/rw/RwHelper.cpp6
4 files changed, 29 insertions, 6 deletions
diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp
index 89b5ba3d..5c65aed5 100644
--- a/src/core/Frontend.cpp
+++ b/src/core/Frontend.cpp
@@ -789,10 +789,12 @@ CMenuManager::Draw()
CFont::SetScale(MENU_X(0.7f), MENU_Y(0.5f));
CFont::SetWrapx(SCREEN_SCALE_X(DEFAULT_SCREEN_WIDTH));
CFont::SetRightJustifyWrap(0.0f);
+#ifdef DRAW_MENU_VERSION_TEXT
strcpy(gString, "V1.1");
AsciiToUnicode(gString, gUString);
CFont::PrintString(SCREEN_WIDTH / 10, SCREEN_HEIGHT / 45, gUString);
#endif
+#endif
CFont::SetWrapx(MENU_X_RIGHT_ALIGNED(MENU_X_MARGIN));
CFont::SetRightJustifyWrap(SCREEN_SCALE_X(MENUACTION_WIDTH));
diff --git a/src/core/config.h b/src/core/config.h
index 171c6be9..92c0511f 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -156,6 +156,25 @@ enum Config {
// any debug stuff that is only left in mobile, is not in MASTER
//#define MASTER
+// once and for all:
+// pc: FINAL & MASTER
+// mobile: FINAL
+
+// MASTER builds must be FINAL
+#ifdef MASTER
+#define FINAL
+#endif
+
+// quality of life fixes that should also be in FINAL
+#define NASTY_GAME // nasty game for all languages
+#define NO_MOVIES // disable intro videos
+#define NO_CDCHECK
+#define DEBUGMENU
+
+// those infamous texts
+#define DRAW_GAME_VERSION_TEXT
+#define DRAW_MENU_VERSION_TEXT
+
#if defined GTA_PS2
# define GTA_PS2_STUFF
# define RANDOMSPLASH
@@ -177,6 +196,7 @@ enum Config {
#ifdef MASTER
// only in master builds
+ #undef DRAW_GAME_VERSION_TEXT
#else
// not in master builds
#define VALIDATE_SAVE_SIZE
@@ -187,11 +207,7 @@ enum Config {
# define USE_MY_DOCUMENTS // use my documents directory for user files
#else
// not in any game
-# define NASTY_GAME // nasty game for all languages
-# define NO_MOVIES // disable intro videos
-# define NO_CDCHECK
# define CHATTYSPLASH // print what the game is loading
-# define DEBUGMENU
# define TIMEBARS // print debug timers
#endif
diff --git a/src/core/main.cpp b/src/core/main.cpp
index 18ee2dc5..1aa0a953 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -768,6 +768,8 @@ DisplayGameDebugText()
char str[200];
wchar ustr[200];
+
+#ifdef DRAW_GAME_VERSION_TEXT
wchar ver[200];
AsciiToUnicode(version_name, ver);
@@ -783,6 +785,7 @@ DisplayGameDebugText()
CFont::SetBackGroundOnlyTextOff();
CFont::SetColor(CRGBA(255, 108, 0, 255));
CFont::PrintString(SCREEN_SCALE_X(10.0f), SCREEN_SCALE_Y(10.0f), ver);
+#endif
FrameSamples++;
FramesPerSecondCounter += 1000.0f / (CTimer::GetTimeStepNonClippedInSeconds() * 1000.0f);
diff --git a/src/rw/RwHelper.cpp b/src/rw/RwHelper.cpp
index 4b598e9b..dbadae6a 100644
--- a/src/rw/RwHelper.cpp
+++ b/src/rw/RwHelper.cpp
@@ -6,8 +6,10 @@
#include "Timecycle.h"
#include "skeleton.h"
#include "Debug.h"
-#ifndef FINAL
+#if !defined(FINAL) || defined(DEBUGMENU)
#include "rtcharse.h"
+#endif
+#ifndef FINAL
RtCharset *debugCharset;
#endif
@@ -17,7 +19,7 @@ bool gPS2alphaTest = true;
bool gPS2alphaTest = false;
#endif
-#ifndef FINAL
+#if !defined(FINAL) || defined(DEBUGMENU)
static bool charsetOpen;
void OpenCharsetSafe()
{