diff options
| author | aap <aap@papnet.eu> | 2020-04-09 16:35:24 +0200 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2020-04-09 17:45:05 +0200 |
| commit | 6225e5072309e69e98246f59222ba82ddf6a418a (patch) | |
| tree | 9a34067ead53a4b1dc5682ac2d78ede339b62c0d /src/objects | |
| parent | AddExplosion shadow fix (diff) | |
| download | re3-6225e5072309e69e98246f59222ba82ddf6a418a.tar re3-6225e5072309e69e98246f59222ba82ddf6a418a.tar.gz re3-6225e5072309e69e98246f59222ba82ddf6a418a.tar.bz2 re3-6225e5072309e69e98246f59222ba82ddf6a418a.tar.lz re3-6225e5072309e69e98246f59222ba82ddf6a418a.tar.xz re3-6225e5072309e69e98246f59222ba82ddf6a418a.tar.zst re3-6225e5072309e69e98246f59222ba82ddf6a418a.zip | |
Diffstat (limited to 'src/objects')
| -rw-r--r-- | src/objects/CutsceneHead.cpp | 2 | ||||
| -rw-r--r-- | src/objects/ParticleObject.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/objects/CutsceneHead.cpp b/src/objects/CutsceneHead.cpp index 8c417973..a7722b8a 100644 --- a/src/objects/CutsceneHead.cpp +++ b/src/objects/CutsceneHead.cpp @@ -20,7 +20,7 @@ CCutsceneHead::CCutsceneHead(CObject *obj) m_pHeadNode = RpAnimBlendClumpFindFrame((RpClump*)obj->m_rwObject, "Shead")->frame; atm = (RpAtomic*)GetFirstObject(m_pHeadNode); if(atm){ - assert(RwObjectGetType(atm) == rpATOMIC); + assert(RwObjectGetType((RwObject*)atm) == rpATOMIC); RpAtomicSetFlags(atm, RpAtomicGetFlags(atm) & ~rpATOMICRENDER); } } diff --git a/src/objects/ParticleObject.cpp b/src/objects/ParticleObject.cpp index 881510e8..9f7bcda5 100644 --- a/src/objects/ParticleObject.cpp +++ b/src/objects/ParticleObject.cpp @@ -154,7 +154,7 @@ CParticleObject::AddObject(uint16 type, CVector const &pos, CVector const &targe pobj->m_nRemoveTimer = 0; if ( color.alpha != 0 ) - RwRGBAAssign(&pobj->m_Color, &color); + pobj->m_Color, color; else pobj->m_Color.alpha = 0; |