From e95516032f4e44ea35b7358f60c464c0faa1df91 Mon Sep 17 00:00:00 2001
From: withmorten <morten.with@gmail.com>
Date: Thu, 29 Oct 2020 19:01:09 +0100
Subject: fix FINAL build, add DEBUGMENU and other simple qol defines to FINAL,
 add extra defines for menu and game version text

---
 src/core/config.h | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

(limited to 'src/core/config.h')

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
 
-- 
cgit v1.2.3


From 57b01ac4769b0ac83150f2284f5bad87f2f166a3 Mon Sep 17 00:00:00 2001
From: withmorten <morten.with@gmail.com>
Date: Thu, 29 Oct 2020 19:23:59 +0100
Subject: NO_MOVIES and DEBUGMENU not for MASTER

---
 src/core/config.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/core/config.h')

diff --git a/src/core/config.h b/src/core/config.h
index 92c0511f..019ff659 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -167,9 +167,7 @@ enum Config {
 
 // 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
@@ -200,6 +198,9 @@ enum Config {
 #else
 	// not in master builds
 	#define VALIDATE_SAVE_SIZE
+
+	#define NO_MOVIES	// disable intro videos
+	#define DEBUGMENU
 #endif
 
 #ifdef FINAL
-- 
cgit v1.2.3