diff options
| author | aap <aap@papnet.eu> | 2020-10-31 17:06:25 +0100 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2020-10-31 18:21:10 +0100 |
| commit | 3665a82418b5e807b94d3ebc0494345dd33ded64 (patch) | |
| tree | 5190ef4d51735e5908dc68ce7735011890c07f12 /src | |
| parent | foobar! (diff) | |
| download | re3-3665a82418b5e807b94d3ebc0494345dd33ded64.tar re3-3665a82418b5e807b94d3ebc0494345dd33ded64.tar.gz re3-3665a82418b5e807b94d3ebc0494345dd33ded64.tar.bz2 re3-3665a82418b5e807b94d3ebc0494345dd33ded64.tar.lz re3-3665a82418b5e807b94d3ebc0494345dd33ded64.tar.xz re3-3665a82418b5e807b94d3ebc0494345dd33ded64.tar.zst re3-3665a82418b5e807b94d3ebc0494345dd33ded64.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/core/config.h | 24 | ||||
| -rw-r--r-- | src/core/main.cpp | 3 | ||||
| -rw-r--r-- | src/rw/RwHelper.cpp | 6 |
3 files changed, 27 insertions, 6 deletions
diff --git a/src/core/config.h b/src/core/config.h index 4ea7f60f..ce77391c 100644 --- a/src/core/config.h +++ b/src/core/config.h @@ -167,6 +167,22 @@ 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 + #if defined GTA_PS2 # define GTA_PS2_STUFF # define RANDOMSPLASH @@ -188,9 +204,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 @@ -198,11 +218,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 b1f1ea50..64b3a63f 100644 --- a/src/core/main.cpp +++ b/src/core/main.cpp @@ -757,6 +757,8 @@ DisplayGameDebugText() char str[200]; wchar ustr[200]; + +#ifdef DRAW_GAME_VERSION_TEXT wchar ver[200]; AsciiToUnicode(version_name, ver); @@ -772,6 +774,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 503027af..4c4fc434 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 @@ -18,7 +20,7 @@ bool gPS2alphaTest = false; #endif bool gBackfaceCulling; -#ifndef FINAL +#if !defined(FINAL) || defined(DEBUGMENU) static bool charsetOpen; void OpenCharsetSafe() { |