From c80403a2e0aa337968d77f5d4bcc33cdc91eeac1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?eray=20or=C3=A7unus?= <erayorcunus@gmail.com>
Date: Tue, 21 Apr 2020 13:28:06 +0300
Subject: Crossplatform work continues

---
 src/core/CdStream.cpp | 2 +-
 src/core/Game.cpp     | 2 --
 src/core/Timer.cpp    | 2 +-
 src/core/re3.cpp      | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/core')

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/re3.cpp b/src/core/re3.cpp
index e5f42696..0c96b262 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"
-- 
cgit v1.2.3


From 75acd781909378ba0395b0c52acee464c8221e72 Mon Sep 17 00:00:00 2001
From: Fire-Head <Fire-Head@users.noreply.github.com>
Date: Thu, 23 Apr 2020 11:24:03 +0300
Subject: ps2 particles, sampman oal started

---
 src/core/config.h | 5 +++++
 src/core/re3.cpp  | 1 -
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/core')

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..3c2bc31f 100644
--- a/src/core/re3.cpp
+++ b/src/core/re3.cpp
@@ -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
-- 
cgit v1.2.3