From 8553120fdbfd74eb2d1609326acbdd8aaa382bea Mon Sep 17 00:00:00 2001
From: withmorten <morten.with@gmail.com>
Date: Thu, 4 Feb 2021 19:47:47 +0100
Subject: add missing ASCII_STRCMP stuff

---
 src/core/config.h | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/core')

diff --git a/src/core/config.h b/src/core/config.h
index e75cdfb0..cc82f8d6 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -251,6 +251,12 @@ enum Config {
 #define FIX_BUGS_64 // Must have fixes to be able to run 64 bit build
 #endif
 
+#define ASCII_STRCMP // use faster ascii str comparisons
+
+#if !defined _WIN32 || defined __MWERKS__ || defined __MINGW32__ || defined VANILLA_DEFINES
+#undef ASCII_STRCMP
+#endif
+
 // Just debug menu entries
 #ifdef DEBUGMENU
 #define RELOADABLES			// some debug menu options to reload TXD files
-- 
cgit v1.2.3


From a78212ea800fe1919d5380beb25514e3887bcdea Mon Sep 17 00:00:00 2001
From: withmorten <morten.with@gmail.com>
Date: Thu, 4 Feb 2021 23:43:04 +0100
Subject: fix MASTER crashes

---
 src/core/common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/core')

diff --git a/src/core/common.h b/src/core/common.h
index 75ba8863..d39531cc 100644
--- a/src/core/common.h
+++ b/src/core/common.h
@@ -355,7 +355,7 @@ __inline__ void TRACE(char *f, ...) { } // this is re3 only, and so the function
 #ifndef MASTER
 #define assert(_Expression) (void)( (!!(_Expression)) || (re3_assert(#_Expression, __FILE__, __LINE__, __FUNCTION__), 0) )
 #else
-#define assert(_Expression)
+#define assert(_Expression) (_Expression)
 #endif
 #define ASSERT assert
 
-- 
cgit v1.2.3