diff options
| author | aap <aap@papnet.eu> | 2019-05-30 00:47:33 +0200 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2019-05-30 00:47:33 +0200 |
| commit | 0a36d49d2cd4346dc99a52155e2599917c1e6a42 (patch) | |
| tree | 9d07fa357fca32b4dfa56b6f52584fdf2c349a30 /src/render | |
| parent | Merge pull request #2 from Fire-Head/master (diff) | |
| download | re3-0a36d49d2cd4346dc99a52155e2599917c1e6a42.tar re3-0a36d49d2cd4346dc99a52155e2599917c1e6a42.tar.gz re3-0a36d49d2cd4346dc99a52155e2599917c1e6a42.tar.bz2 re3-0a36d49d2cd4346dc99a52155e2599917c1e6a42.tar.lz re3-0a36d49d2cd4346dc99a52155e2599917c1e6a42.tar.xz re3-0a36d49d2cd4346dc99a52155e2599917c1e6a42.tar.zst re3-0a36d49d2cd4346dc99a52155e2599917c1e6a42.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/render/Particle.cpp | 4 | ||||
| -rw-r--r-- | src/render/ParticleMgr.cpp (renamed from src/ParticleMgr.cpp) | 0 | ||||
| -rw-r--r-- | src/render/ParticleMgr.h (renamed from src/ParticleMgr.h) | 0 | ||||
| -rw-r--r-- | src/render/Sprite.cpp | 6 | ||||
| -rw-r--r-- | src/render/Sprite2d.cpp | 7 |
5 files changed, 3 insertions, 14 deletions
diff --git a/src/render/Particle.cpp b/src/render/Particle.cpp index aade3578..18ea4c6c 100644 --- a/src/render/Particle.cpp +++ b/src/render/Particle.cpp @@ -1229,7 +1229,9 @@ void CParticle::Update() moveStep.z = point.point.z; if ( psystem->m_Type == PARTICLE_DEBRIS2 ) { - particle->m_vecVelocity *= CVector(0.8f, 0.8f, -0.4f); + particle->m_vecVelocity.x *= 0.8f; + particle->m_vecVelocity.y *= 0.8f; + particle->m_vecVelocity.z *= -0.4f; if ( particle->m_vecVelocity.z < 0.005f ) particle->m_vecVelocity.z = 0.0f; } diff --git a/src/ParticleMgr.cpp b/src/render/ParticleMgr.cpp index d259c4b4..d259c4b4 100644 --- a/src/ParticleMgr.cpp +++ b/src/render/ParticleMgr.cpp diff --git a/src/ParticleMgr.h b/src/render/ParticleMgr.h index a2dcbdb5..a2dcbdb5 100644 --- a/src/ParticleMgr.h +++ b/src/render/ParticleMgr.h diff --git a/src/render/Sprite.cpp b/src/render/Sprite.cpp index 509564ac..900b4dba 100644 --- a/src/render/Sprite.cpp +++ b/src/render/Sprite.cpp @@ -4,12 +4,6 @@ #include "Camera.h" #include "Sprite.h" -// Get rid of bullshit windows definitions, we're not running on an 8086 -#ifdef far -#undef far -#undef near -#endif - float &CSprite::m_f2DNearScreenZ = *(float*)0x8F1ABC; float &CSprite::m_f2DFarScreenZ = *(float*)0x8F2C94; float &CSprite::m_fRecipNearClipPlane = *(float*)0x8F5FFC; diff --git a/src/render/Sprite2d.cpp b/src/render/Sprite2d.cpp index 2311a75e..ff6cd0db 100644 --- a/src/render/Sprite2d.cpp +++ b/src/render/Sprite2d.cpp @@ -4,12 +4,6 @@ #include "Camera.h" #include "Sprite2d.h" -// Get rid of bullshit windows definitions, we're not running on an 8086 -#ifdef far -#undef far -#undef near -#endif - RwIm2DVertex *CSprite2d::maVertices = (RwIm2DVertex*)0x6E9168; float &CSprite2d::RecipNearClip = *(float*)0x880DB4; int32 &CSprite2d::mCurrentBank = *(int32*)0x8F1AF4; @@ -18,7 +12,6 @@ int32 *CSprite2d::mCurrentSprite = (int32*)0x6F4500; int32 *CSprite2d::mBankStart = (int32*)0x774BE8; RwIm2DVertex *CSprite2d::maBankVertices = (RwIm2DVertex*)0x8429F8; - void CSprite2d::SetRecipNearClip(void) { |