a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-07-01 05:03:47 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #792 from withmorten/master

Browse source 
fix FINAL build, add DEBUGMENU and other simple qol defines to FINAL ...
# Conflicts:
#	src/core/Frontend.cpp
This commit is contained in:
aap 2020-10-31 17:06:25 +01:00 committed by Sergeanur
parent 7d64698322
commit 3665a82418
3 changed files with 27 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/core/config.h
View file

@ -167,6 +167,22 @@ enum Config {
// any debug stuff that is only left in mobile, is not in MASTER // any debug stuff that is only left in mobile, is not in MASTER
//#define 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 #if defined GTA_PS2
# define GTA_PS2_STUFF # define GTA_PS2_STUFF
# define RANDOMSPLASH # define RANDOMSPLASH
@ -188,9 +204,13 @@ enum Config {
#ifdef MASTER #ifdef MASTER
// only in master builds // only in master builds
#undef DRAW_GAME_VERSION_TEXT
#else #else
// not in master builds // not in master builds
#define VALIDATE_SAVE_SIZE #define VALIDATE_SAVE_SIZE
#define NO_MOVIES // disable intro videos
#define DEBUGMENU
#endif #endif
#ifdef FINAL #ifdef FINAL
@ -198,11 +218,7 @@ enum Config {
# define USE_MY_DOCUMENTS // use my documents directory for user files # define USE_MY_DOCUMENTS // use my documents directory for user files
#else #else
// not in any game // 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 CHATTYSPLASH // print what the game is loading
# define DEBUGMENU
# define TIMEBARS // print debug timers # define TIMEBARS // print debug timers
#endif #endif

3
src/core/main.cpp
View file

@ -757,6 +757,8 @@ DisplayGameDebugText()
char str[200]; char str[200];
wchar ustr[200]; wchar ustr[200];
#ifdef DRAW_GAME_VERSION_TEXT
wchar ver[200]; wchar ver[200];
AsciiToUnicode(version_name, ver); AsciiToUnicode(version_name, ver);
@ -772,6 +774,7 @@ DisplayGameDebugText()
CFont::SetBackGroundOnlyTextOff(); CFont::SetBackGroundOnlyTextOff();
CFont::SetColor(CRGBA(255, 108, 0, 255)); CFont::SetColor(CRGBA(255, 108, 0, 255));
CFont::PrintString(SCREEN_SCALE_X(10.0f), SCREEN_SCALE_Y(10.0f), ver); CFont::PrintString(SCREEN_SCALE_X(10.0f), SCREEN_SCALE_Y(10.0f), ver);
#endif
FrameSamples++; FrameSamples++;
FramesPerSecondCounter += 1000.0f / (CTimer::GetTimeStepNonClippedInSeconds() * 1000.0f); FramesPerSecondCounter += 1000.0f / (CTimer::GetTimeStepNonClippedInSeconds() * 1000.0f);

6
src/rw/RwHelper.cpp
View file

@ -6,8 +6,10 @@
#include "Timecycle.h" #include "Timecycle.h"
#include "skeleton.h" #include "skeleton.h"
#include "Debug.h" #include "Debug.h"
#ifndef FINAL #if !defined(FINAL) || defined(DEBUGMENU)
#include "rtcharse.h" #include "rtcharse.h"
#endif
#ifndef FINAL
RtCharset *debugCharset; RtCharset *debugCharset;
#endif #endif
@ -18,7 +20,7 @@ bool gPS2alphaTest = false;
#endif #endif
bool gBackfaceCulling; bool gBackfaceCulling;
#ifndef FINAL #if !defined(FINAL) || defined(DEBUGMENU)
static bool charsetOpen; static bool charsetOpen;
void OpenCharsetSafe() void OpenCharsetSafe()
{ {