summaryrefslogtreecommitdiffstats
path: root/src/render
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2019-05-31 00:33:01 +0200
committeraap <aap@papnet.eu>2019-05-31 00:33:01 +0200
commitc4368b7432b4484d3f086afb5589fcddc62a1915 (patch)
tree2cce45d6ba4feabb229eb349c5b32beb22849d39 /src/render
parentadded CCredits (diff)
parentMerge pull request #3 from Fire-Head/master (diff)
downloadre3-c4368b7432b4484d3f086afb5589fcddc62a1915.tar
re3-c4368b7432b4484d3f086afb5589fcddc62a1915.tar.gz
re3-c4368b7432b4484d3f086afb5589fcddc62a1915.tar.bz2
re3-c4368b7432b4484d3f086afb5589fcddc62a1915.tar.lz
re3-c4368b7432b4484d3f086afb5589fcddc62a1915.tar.xz
re3-c4368b7432b4484d3f086afb5589fcddc62a1915.tar.zst
re3-c4368b7432b4484d3f086afb5589fcddc62a1915.zip
Diffstat (limited to 'src/render')
-rw-r--r--src/render/Particle.cpp3
-rw-r--r--src/render/Shadows.cpp6
2 files changed, 2 insertions, 7 deletions
diff --git a/src/render/Particle.cpp b/src/render/Particle.cpp
index bd4f7696..03ff6bb2 100644
--- a/src/render/Particle.cpp
+++ b/src/render/Particle.cpp
@@ -210,7 +210,7 @@ RwTexture * (&gpRainDropTex)[MAX_RAINDROP_FILES] = *(RwTexture * (*)[MAX_RA
RwRaster *gpRainDropRaster[MAX_RAINDROP_FILES];
//Float CParticle::ms_afRandTable[CParticle::RAND_TABLE_SIZE]; //
-Float (&CParticle::ms_afRandTable)[CParticle::RAND_TABLE_SIZE] = *(Float (*)[CParticle::RAND_TABLE_SIZE])*(int *)0x6E9878;
+Float (&CParticle::ms_afRandTable)[CParticle::RAND_TABLE_SIZE] = *(Float (*)[CParticle::RAND_TABLE_SIZE])*(int *)0x6E98C8;
CParticle *CParticle::m_pUnusedListHead;
@@ -1853,7 +1853,6 @@ void CParticle::AddYardieDoorSmoke(CVector const &vecPos, CMatrix const &matMatr
}
STARTPATCHES
-return; // causes crash, out temporarily
//InjectHook(0x50C410, &CParticle::ctor, PATCH_JUMP);
//InjectHook(0x50C420, &CParticle::dtor, PATCH_JUMP);
InjectHook(0x50C430, CParticle::ReloadConfig, PATCH_JUMP);
diff --git a/src/render/Shadows.cpp b/src/render/Shadows.cpp
index 587dda99..81ba75aa 100644
--- a/src/render/Shadows.cpp
+++ b/src/render/Shadows.cpp
@@ -2,10 +2,6 @@
#include "patcher.h"
#include "Shadows.h"
-void CShadows::AddPermanentShadow(unsigned char ShadowType, RwTexture* pTexture, CVector* pPosn, float fX1, float fY1, float fX2, float fY2, short nTransparency, unsigned char nRed, unsigned char nGreen, unsigned char nBlue, float fZDistance, unsigned int nTime, float fScale)
-{
- ((void (__cdecl *)(unsigned char, RwTexture*, CVector*, float, float, float, float, short, unsigned char, unsigned char, unsigned char, float, unsigned int, float))0x56EC50)(ShadowType, pTexture, pPosn, fX1, fY1, fX2, fY2, nTransparency, nRed, nGreen, nBlue, fZDistance, nTime, fScale);
-}
-
+WRAPPER void CShadows::AddPermanentShadow(unsigned char ShadowType, RwTexture* pTexture, CVector* pPosn, float fX1, float fY1, float fX2, float fY2, short nTransparency, unsigned char nRed, unsigned char nGreen, unsigned char nBlue, float fZDistance, unsigned int nTime, float fScale) { EAXJMP(0x512FD0); }
WRAPPER void CShadows::RenderStaticShadows(void) { EAXJMP(0x5145F0); }
WRAPPER void CShadows::RenderStoredShadows(void) { EAXJMP(0x514010); }