diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-04-23 18:12:20 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-04-23 18:12:20 +0200 |
| commit | 05ddc80ea22cee3c97f274b1d5c3d3d1d5cafdbd (patch) | |
| tree | d1b9a842f2d767a0d05b1a23c3a0a4746d2b5e70 /src/core | |
| parent | Merge remote-tracking branch 'upstream/master' (diff) | |
| parent | removed fix that made no sense (diff) | |
| download | re3-05ddc80ea22cee3c97f274b1d5c3d3d1d5cafdbd.tar re3-05ddc80ea22cee3c97f274b1d5c3d3d1d5cafdbd.tar.gz re3-05ddc80ea22cee3c97f274b1d5c3d3d1d5cafdbd.tar.bz2 re3-05ddc80ea22cee3c97f274b1d5c3d3d1d5cafdbd.tar.lz re3-05ddc80ea22cee3c97f274b1d5c3d3d1d5cafdbd.tar.xz re3-05ddc80ea22cee3c97f274b1d5c3d3d1d5cafdbd.tar.zst re3-05ddc80ea22cee3c97f274b1d5c3d3d1d5cafdbd.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/CdStream.cpp | 2 | ||||
| -rw-r--r-- | src/core/Game.cpp | 2 | ||||
| -rw-r--r-- | src/core/Timer.cpp | 2 | ||||
| -rw-r--r-- | src/core/config.h | 5 | ||||
| -rw-r--r-- | src/core/re3.cpp | 3 |
5 files changed, 8 insertions, 6 deletions
diff --git a/src/core/CdStream.cpp b/src/core/CdStream.cpp index 1ab1c8b0..ea79fb9a 100644 --- a/src/core/CdStream.cpp +++ b/src/core/CdStream.cpp @@ -1,4 +1,4 @@ -#include <windows.h> +#define WITHWINDOWS #include "common.h" #include "CdStream.h" diff --git a/src/core/Game.cpp b/src/core/Game.cpp index 6f3eee29..bfe6eee3 100644 --- a/src/core/Game.cpp +++ b/src/core/Game.cpp @@ -1,7 +1,5 @@ #pragma warning( push ) #pragma warning( disable : 4005) -#define DIRECTINPUT_VERSION 0x0800 -#include <dinput.h> #pragma warning( pop ) #include "common.h" #include "win.h" diff --git a/src/core/Timer.cpp b/src/core/Timer.cpp index 8f8570d7..aca7c1dc 100644 --- a/src/core/Timer.cpp +++ b/src/core/Timer.cpp @@ -1,4 +1,4 @@ -#include <windows.h> +#define WITHWINDOWS #include "common.h" #include "DMAudio.h" diff --git a/src/core/config.h b/src/core/config.h index b5022b9f..c52a708d 100644 --- a/src/core/config.h +++ b/src/core/config.h @@ -193,6 +193,11 @@ enum Config { #define DEFAULT_NATIVE_RESOLUTION // Set default video mode to your native resolution (fixes Windows 10 launch) //#define USE_TXD_CDIMAGE // generate and load textures from txd.img //#define USE_TEXTURE_POOL +//#define OPENAL + +// Particle +//#define PC_PARTICLE +//#define PS2_ALTERNATIVE_CARSPLASH // unused on PS2 // Pad #define XINPUT diff --git a/src/core/re3.cpp b/src/core/re3.cpp index e5f42696..4cec5773 100644 --- a/src/core/re3.cpp +++ b/src/core/re3.cpp @@ -1,6 +1,6 @@ #include <direct.h> #include <csignal> -#include <windows.h> +#define WITHWINDOWS #include "common.h" #include "patcher.h" #include "Renderer.h" @@ -372,7 +372,6 @@ DebugMenuPopulate(void) DebugMenuAddVarBool8("Debug", "Don't render Vehicles", (int8*)&gbDontRenderVehicles, nil); DebugMenuAddVarBool8("Debug", "Don't render Objects", (int8*)&gbDontRenderObjects, nil); #ifdef TOGGLEABLE_BETA_FEATURES - DebugMenuAddVarBool8("Debug", "Toggle banned particles", (int8*)&CParticle::bEnableBannedParticles, nil); DebugMenuAddVarBool8("Debug", "Toggle popping heads on headshot", (int8*)&CPed::bPopHeadsOnHeadshot, nil); DebugMenuAddVarBool8("Debug", "Toggle peds running to phones to report crimes", (int8*)&CPed::bMakePedsRunToPhonesToReportCrimes, nil); #endif |