From 81fa320f1e3184b5fadd87915f41cca09eb8390c Mon Sep 17 00:00:00 2001 From: Falco Girgis Date: Sun, 15 Jun 2025 11:36:40 -0500 Subject: [PATCH] Fixed DreamSDK Builds (liberty + miami). Looks like DreamSDK was shitting the bed on both games' "fake.cpp." Turns out there were two headers that typedef'd "uint32," so the compiiler would freak out and claim it was an ambigious typedef if it saw it used within that translation unit. - Changed references to "uint32" to "uint32_t" to no longer be ambiguous. --- src/liberty/fakerw/fake.cpp | 14 +++++++------- src/miami/fakerw/fake.cpp | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/liberty/fakerw/fake.cpp b/src/liberty/fakerw/fake.cpp index e4ed01ee..ac9a4456 100644 --- a/src/liberty/fakerw/fake.cpp +++ b/src/liberty/fakerw/fake.cpp @@ -449,8 +449,8 @@ RwBool RwIm3DRenderPrimitive(RwPrimitiveType primType); RwBool RwRenderStateGet(RwRenderState state, void *value) { - uint32 *uival = (uint32*)value; - uint32 fog; + uint32_t *uival = (uint32_t*)value; + uint32_t fog; switch(state){ case rwRENDERSTATETEXTURERASTER: *(void**)value = GetRenderStatePtr(TEXTURERASTER); return true; case rwRENDERSTATETEXTUREADDRESS: *uival = GetRenderState(TEXTUREADDRESS); return true; @@ -496,8 +496,8 @@ RwBool RwRenderStateGet(RwRenderState state, void *value) } RwBool RwRenderStateSet(RwRenderState state, void *value) { - uint32 uival = (uintptr)value; - uint32 fog; + uint32_t uival = (uintptr_t)value; + uint32_t fog; switch(state){ case rwRENDERSTATETEXTURERASTER: SetRenderStatePtr(TEXTURERASTER, value); return true; case rwRENDERSTATETEXTUREADDRESS: SetRenderState(TEXTUREADDRESS, uival); return true; @@ -544,8 +544,8 @@ RwBool RwRenderStateSet(RwRenderState state, void *value) static rw::MemoryFunctions gMemfuncs; static void *(*real_malloc)(size_t size); static void *(*real_realloc)(void *mem, size_t newSize); -static void *mallocWrap(size_t sz, uint32 hint) { if(sz == 0) return nil; return real_malloc(sz); } -static void *reallocWrap(void *p, size_t sz, uint32 hint) { return real_realloc(p, sz); } +static void *mallocWrap(size_t sz, uint32_t hint) { if(sz == 0) return nil; return real_malloc(sz); } +static void *reallocWrap(void *p, size_t sz, uint32_t hint) { return real_realloc(p, sz); } // WARNING: unused parameters @@ -830,7 +830,7 @@ RwCamera *RwCameraForAllClumpsNotInFrustum(RwCamera *camera, RwInt32 numClumps, RwBool RpMatFXPluginAttach( void ) { registerMatFXPlugin(); return true; } RpAtomic *RpMatFXAtomicEnableEffects( RpAtomic *atomic ) { MatFX::enableEffects(atomic); return atomic; } RpMatFXMaterialFlags RpMatFXMaterialGetEffects( const RpMaterial *material ){ return (RpMatFXMaterialFlags)MatFX::getEffects(material); } -RpMaterial *RpMatFXMaterialSetEffects( RpMaterial *material, RpMatFXMaterialFlags flags ) { MatFX::setEffects(material, (uint32)flags); return material; } +RpMaterial *RpMatFXMaterialSetEffects( RpMaterial *material, RpMatFXMaterialFlags flags ) { MatFX::setEffects(material, (uint32_t)flags); return material; } RpMaterial *RpMatFXMaterialSetupEnvMap( RpMaterial *material, RwTexture *texture, RwFrame *frame, RwBool useFrameBufferAlpha, RwReal coef ) { MatFX *mfx = MatFX::get(material); mfx->setEnvTexture(texture); diff --git a/src/miami/fakerw/fake.cpp b/src/miami/fakerw/fake.cpp index 53c965a9..32980be4 100644 --- a/src/miami/fakerw/fake.cpp +++ b/src/miami/fakerw/fake.cpp @@ -450,8 +450,8 @@ RwBool RwIm3DRenderPrimitive(RwPrimitiveType primType); RwBool RwRenderStateGet(RwRenderState state, void *value) { - uint32 *uival = (uint32*)value; - uint32 fog; + uint32_t *uival = (uint32_t*)value; + uint32_t fog; switch(state){ case rwRENDERSTATETEXTURERASTER: *(void**)value = GetRenderStatePtr(TEXTURERASTER); return true; case rwRENDERSTATETEXTUREADDRESS: *uival = GetRenderState(TEXTUREADDRESS); return true; @@ -497,8 +497,8 @@ RwBool RwRenderStateGet(RwRenderState state, void *value) } RwBool RwRenderStateSet(RwRenderState state, void *value) { - uint32 uival = (uintptr)value; - uint32 fog; + uint32_t uival = (uintptr_t)value; + uint32_t fog; switch(state){ case rwRENDERSTATETEXTURERASTER: SetRenderStatePtr(TEXTURERASTER, value); return true; case rwRENDERSTATETEXTUREADDRESS: SetRenderState(TEXTUREADDRESS, uival); return true; @@ -545,8 +545,8 @@ RwBool RwRenderStateSet(RwRenderState state, void *value) static rw::MemoryFunctions gMemfuncs; static void *(*real_malloc)(size_t size); static void *(*real_realloc)(void *mem, size_t newSize); -static void *mallocWrap(size_t sz, uint32 hint) { if(sz == 0) return nil; return real_malloc(sz); } -static void *reallocWrap(void *p, size_t sz, uint32 hint) { return real_realloc(p, sz); } +static void *mallocWrap(size_t sz, uint32_t hint) { if(sz == 0) return nil; return real_malloc(sz); } +static void *reallocWrap(void *p, size_t sz, uint32_t hint) { return real_realloc(p, sz); } // WARNING: unused parameters @@ -832,7 +832,7 @@ RwCamera *RwCameraForAllClumpsNotInFrustum(RwCamera *camera, RwInt32 numClumps, RwBool RpMatFXPluginAttach( void ) { registerMatFXPlugin(); return true; } RpAtomic *RpMatFXAtomicEnableEffects( RpAtomic *atomic ) { MatFX::enableEffects(atomic); return atomic; } RpMatFXMaterialFlags RpMatFXMaterialGetEffects( const RpMaterial *material ){ return (RpMatFXMaterialFlags)MatFX::getEffects(material); } -RpMaterial *RpMatFXMaterialSetEffects( RpMaterial *material, RpMatFXMaterialFlags flags ) { MatFX::setEffects(material, (uint32)flags); return material; } +RpMaterial *RpMatFXMaterialSetEffects( RpMaterial *material, RpMatFXMaterialFlags flags ) { MatFX::setEffects(material, (uint32_t)flags); return material; } RpMaterial *RpMatFXMaterialSetupEnvMap( RpMaterial *material, RwTexture *texture, RwFrame *frame, RwBool useFrameBufferAlpha, RwReal coef ) { MatFX *mfx = MatFX::get(material); mfx->setEnvTexture(texture);