diff options
| author | Fire-Head <Fire-Head@users.noreply.github.com> | 2021-01-08 21:55:13 +0100 |
|---|---|---|
| committer | Fire-Head <Fire-Head@users.noreply.github.com> | 2021-01-08 21:55:13 +0100 |
| commit | 02f6ed7da39c06ba7c219e976150999f18a1461e (patch) | |
| tree | 6b641bbf8a624973c081e3a5a6c6ebfc70bbaa37 | |
| parent | Merge branch 'master' of https://github.com/GTAmodding/re3 (diff) | |
| download | re3-02f6ed7da39c06ba7c219e976150999f18a1461e.tar re3-02f6ed7da39c06ba7c219e976150999f18a1461e.tar.gz re3-02f6ed7da39c06ba7c219e976150999f18a1461e.tar.bz2 re3-02f6ed7da39c06ba7c219e976150999f18a1461e.tar.lz re3-02f6ed7da39c06ba7c219e976150999f18a1461e.tar.xz re3-02f6ed7da39c06ba7c219e976150999f18a1461e.tar.zst re3-02f6ed7da39c06ba7c219e976150999f18a1461e.zip | |
| -rw-r--r-- | src/core/re3.cpp | 20 | ||||
| -rw-r--r-- | src/render/Draw.cpp | 10 | ||||
| -rw-r--r-- | src/render/Draw.h | 10 |
3 files changed, 26 insertions, 14 deletions
diff --git a/src/core/re3.cpp b/src/core/re3.cpp index 3cfc0ec0..6117462a 100644 --- a/src/core/re3.cpp +++ b/src/core/re3.cpp @@ -218,10 +218,10 @@ void LoadINISettings() #ifdef PROPER_SCALING CDraw::ms_bProperScaling = CheckAndReadIniInt("Draw", "ProperScaling", CDraw::ms_bProperScaling); #endif -#ifdef FIX_SPRITES +#ifdef FIX_RADAR CDraw::ms_bFixRadar = CheckAndReadIniInt("Draw", "FixRadar", CDraw::ms_bFixRadar); #endif -#ifdef FIX_RADAR +#ifdef FIX_SPRITES CDraw::ms_bFixSprites = CheckAndReadIniInt("Draw", "FixSprites", CDraw::ms_bFixSprites); #endif } @@ -265,10 +265,10 @@ void SaveINISettings() #ifdef PROPER_SCALING CheckAndSaveIniInt("Draw", "ProperScaling", CDraw::ms_bProperScaling, changed); #endif -#ifdef FIX_SPRITES +#ifdef FIX_RADAR CheckAndSaveIniInt("Draw", "FixRadar", CDraw::ms_bFixRadar, changed); #endif -#ifdef FIX_RADAR +#ifdef FIX_SPRITES CheckAndSaveIniInt("Draw", "FixSprites", CDraw::ms_bFixSprites, changed); #endif @@ -636,6 +636,18 @@ extern bool gbRenderWorld2; DebugMenuAddVarBool8("Render", "Don't render Vehicles", &gbDontRenderVehicles, nil); DebugMenuAddVarBool8("Render", "Don't render Objects", &gbDontRenderObjects, nil); DebugMenuAddVarBool8("Render", "Don't Render Water", &gbDontRenderWater, nil); + +#ifdef PROPER_SCALING + DebugMenuAddVarBool8("Draw", "Proper Scaling", &CDraw::ms_bProperScaling, nil); +#endif +#ifdef FIX_RADAR + DebugMenuAddVarBool8("Draw", "Fix Radar", &CDraw::ms_bFixRadar, nil); +#endif +#ifdef FIX_SPRITES + DebugMenuAddVarBool8("Draw", "Fix Sprites", &CDraw::ms_bFixSprites, nil); +#endif + + #ifndef FINAL DebugMenuAddVarBool8("Debug", "Print Memory Usage", &gbPrintMemoryUsage, nil); diff --git a/src/render/Draw.cpp b/src/render/Draw.cpp index f2fdad27..f702f188 100644 --- a/src/render/Draw.cpp +++ b/src/render/Draw.cpp @@ -21,13 +21,13 @@ uint8 CDraw::FadeGreen; uint8 CDraw::FadeBlue; #ifdef PROPER_SCALING -int32 CDraw::ms_bProperScaling = true; +bool CDraw::ms_bProperScaling = true; #endif -#ifdef FIX_SPRITES -int32 CDraw::ms_bFixRadar = true; +#ifdef FIX_RADAR +bool CDraw::ms_bFixRadar = true; #endif -#ifdef FIX_RADAR -int32 CDraw::ms_bFixSprites = true; +#ifdef FIX_SPRITES +bool CDraw::ms_bFixSprites = true; #endif float diff --git a/src/render/Draw.h b/src/render/Draw.h index 4f8f523d..8727e0e0 100644 --- a/src/render/Draw.h +++ b/src/render/Draw.h @@ -36,13 +36,13 @@ public: static uint8 FadeBlue; #ifdef PROPER_SCALING - static int32 ms_bProperScaling; -#endif -#ifdef FIX_SPRITES - static int32 ms_bFixRadar; + static bool ms_bProperScaling; #endif #ifdef FIX_RADAR - static int32 ms_bFixSprites; + static bool ms_bFixRadar; +#endif +#ifdef FIX_SPRITES + static bool ms_bFixSprites; #endif static void SetNearClipZ(float nearclip) { ms_fNearClipZ = nearclip; } |