summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-10-31 17:06:25 +0100
committerGitHub <noreply@github.com>2020-10-31 17:06:25 +0100
commit6eef54e3fc2f6232608aa88818bcc5dabc4ece8e (patch)
tree94ac01b566addc9a616916ed34422ff2bd0aab1c /src
parentUpdate librw (diff)
parentfix draw menu version text ifdef location (diff)
downloadre3-6eef54e3fc2f6232608aa88818bcc5dabc4ece8e.tar
re3-6eef54e3fc2f6232608aa88818bcc5dabc4ece8e.tar.gz
re3-6eef54e3fc2f6232608aa88818bcc5dabc4ece8e.tar.bz2
re3-6eef54e3fc2f6232608aa88818bcc5dabc4ece8e.tar.lz
re3-6eef54e3fc2f6232608aa88818bcc5dabc4ece8e.tar.xz
re3-6eef54e3fc2f6232608aa88818bcc5dabc4ece8e.tar.zst
re3-6eef54e3fc2f6232608aa88818bcc5dabc4ece8e.zip
Diffstat (limited to 'src')
-rw-r--r--src/core/Frontend.cpp2
-rw-r--r--src/core/config.h25
-rw-r--r--src/core/main.cpp3
-rw-r--r--src/rw/RwHelper.cpp6
4 files changed, 30 insertions, 6 deletions
diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp
index 89b5ba3d..dca9685e 100644
--- a/src/core/Frontend.cpp
+++ b/src/core/Frontend.cpp
@@ -783,6 +783,7 @@ CMenuManager::Draw()
CFont::SetJustifyOn();
CFont::SetBackGroundOnlyTextOn();
#ifdef GTA3_1_1_PATCH
+#ifdef DRAW_MENU_VERSION_TEXT
CFont::SetColor(CRGBA(235, 170, 50, FadeIn(255)));
CFont::SetRightJustifyOn();
CFont::SetFontStyle(FONT_HEADING);
@@ -793,6 +794,7 @@ CMenuManager::Draw()
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 a7de3a8a..ea4330a4 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -156,6 +156,23 @@ 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_CDCHECK
+
+// those infamous texts
+#define DRAW_GAME_VERSION_TEXT
+#define DRAW_MENU_VERSION_TEXT
+
#if defined GTA_PS2
# define GTA_PS2_STUFF
# define RANDOMSPLASH
@@ -177,9 +194,13 @@ enum Config {
#ifdef MASTER
// only in master builds
+ #undef DRAW_GAME_VERSION_TEXT
#else
// not in master builds
#define VALIDATE_SAVE_SIZE
+
+ #define NO_MOVIES // disable intro videos
+ #define DEBUGMENU
#endif
#ifdef FINAL
@@ -187,11 +208,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 6a7010e2..35af1ebd 100644
--- a/src/rw/RwHelper.cpp
+++ b/src/rw/RwHelper.cpp
@@ -7,8 +7,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
@@ -19,7 +21,7 @@ bool gPS2alphaTest = false;
#endif
bool gBackfaceCulling = true;
-#ifndef FINAL
+#if !defined(FINAL) || defined(DEBUGMENU)
static bool charsetOpen;
void OpenCharsetSafe()
{