From c54d3ba2ab218b9545e784abaf39b4054d3de4bc Mon Sep 17 00:00:00 2001
From: aap <aap@papnet.eu>
Date: Sat, 16 May 2020 14:34:51 +0200
Subject: fixes for 64 bit build

---
 src/control/Script.cpp |  2 +-
 src/fakerw/fake.cpp    |  2 +-
 src/rw/RwHelper.cpp    | 11 +++++++++++
 3 files changed, 13 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/control/Script.cpp b/src/control/Script.cpp
index 357436c6..631ca436 100644
--- a/src/control/Script.cpp
+++ b/src/control/Script.cpp
@@ -506,7 +506,7 @@ void CRunningScript::Init()
 #ifdef USE_DEBUG_SCRIPT_LOADER
 int open_script()
 {
-	static int scriptToLoad = 0;
+	static int scriptToLoad = 1;
 
 #ifdef _WIN32
 	if (GetAsyncKeyState('G') & 0x8000)
diff --git a/src/fakerw/fake.cpp b/src/fakerw/fake.cpp
index 50d12b2f..71646020 100644
--- a/src/fakerw/fake.cpp
+++ b/src/fakerw/fake.cpp
@@ -470,7 +470,7 @@ RwBool RwRenderStateSet(RwRenderState state, void *value)
 	uint32 uival = (uintptr)value;
 	uint32 fog;
 	switch(state){
-	case rwRENDERSTATETEXTURERASTER: SetRenderState(TEXTURERASTER, uival); return true;
+	case rwRENDERSTATETEXTURERASTER: SetRenderStatePtr(TEXTURERASTER, value); return true;
 	case rwRENDERSTATETEXTUREADDRESS: SetRenderState(TEXTUREADDRESS, uival); return true;
 	case rwRENDERSTATETEXTUREADDRESSU: SetRenderState(TEXTUREADDRESSU, uival); return true;
 	case rwRENDERSTATETEXTUREADDRESSV: SetRenderState(TEXTUREADDRESSV, uival); return true;
diff --git a/src/rw/RwHelper.cpp b/src/rw/RwHelper.cpp
index 5026e2c8..191fc7ab 100644
--- a/src/rw/RwHelper.cpp
+++ b/src/rw/RwHelper.cpp
@@ -59,6 +59,16 @@ void FlushObrsPrintfs()
 void *
 RwMallocAlign(RwUInt32 size, RwUInt32 align)
 {
+#ifdef FIX_BUGS
+	uintptr ptralign = align-1;
+	void *mem = (void *)malloc(size + sizeof(uintptr) + ptralign);
+
+	ASSERT(mem != nil);
+
+	void *addr = (void *)((((uintptr)mem) + sizeof(uintptr) + ptralign) & ~ptralign);
+
+	ASSERT(addr != nil);
+#else
 	void *mem = (void *)malloc(size + align);
 
 	ASSERT(mem != nil);
@@ -66,6 +76,7 @@ RwMallocAlign(RwUInt32 size, RwUInt32 align)
 	void *addr = (void *)((((uintptr)mem) + align) & ~(align - 1));
 
 	ASSERT(addr != nil);
+#endif
 
 	*(((void **)addr) - 1) = mem;
 
-- 
cgit v1.2.3