summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-05-16 14:34:51 +0200
committeraap <aap@papnet.eu>2020-05-16 14:34:51 +0200
commitc54d3ba2ab218b9545e784abaf39b4054d3de4bc (patch)
treee9801a3f0afbae2bf9dbb3a93fe6b3790e1e1dfc /src
parentfixed CText to be 64 bit compatible (diff)
downloadre3-c54d3ba2ab218b9545e784abaf39b4054d3de4bc.tar
re3-c54d3ba2ab218b9545e784abaf39b4054d3de4bc.tar.gz
re3-c54d3ba2ab218b9545e784abaf39b4054d3de4bc.tar.bz2
re3-c54d3ba2ab218b9545e784abaf39b4054d3de4bc.tar.lz
re3-c54d3ba2ab218b9545e784abaf39b4054d3de4bc.tar.xz
re3-c54d3ba2ab218b9545e784abaf39b4054d3de4bc.tar.zst
re3-c54d3ba2ab218b9545e784abaf39b4054d3de4bc.zip
Diffstat (limited to 'src')
-rw-r--r--src/control/Script.cpp2
-rw-r--r--src/fakerw/fake.cpp2
-rw-r--r--src/rw/RwHelper.cpp11
3 files changed, 13 insertions, 2 deletions
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;