diff options
| author | majestic <majesticcoding@gmail.com> | 2020-10-09 14:53:22 +0200 |
|---|---|---|
| committer | majestic <majesticcoding@gmail.com> | 2020-10-11 02:49:54 +0200 |
| commit | e7ef45a6069493ce4a49ad0fd613aeb598709524 (patch) | |
| tree | 2d59c72422e839808f1fca5a2dad1212c60db470 /src/entities | |
| parent | CWaterCreatures (diff) | |
| parent | Fix sniper and water creatures bug, mark some files (diff) | |
| download | re3-e7ef45a6069493ce4a49ad0fd613aeb598709524.tar re3-e7ef45a6069493ce4a49ad0fd613aeb598709524.tar.gz re3-e7ef45a6069493ce4a49ad0fd613aeb598709524.tar.bz2 re3-e7ef45a6069493ce4a49ad0fd613aeb598709524.tar.lz re3-e7ef45a6069493ce4a49ad0fd613aeb598709524.tar.xz re3-e7ef45a6069493ce4a49ad0fd613aeb598709524.tar.zst re3-e7ef45a6069493ce4a49ad0fd613aeb598709524.zip | |
Diffstat (limited to 'src/entities')
| -rw-r--r-- | src/entities/Dummy.cpp | 2 | ||||
| -rw-r--r-- | src/entities/Entity.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/entities/Dummy.cpp b/src/entities/Dummy.cpp index 92b69761..544e24a6 100644 --- a/src/entities/Dummy.cpp +++ b/src/entities/Dummy.cpp @@ -4,6 +4,8 @@ #include "World.h" #include "Dummy.h" +// --MIAMI: file done + void *CDummy::operator new(size_t sz) { return CPools::GetDummyPool()->New(); } void CDummy::operator delete(void *p, size_t sz) { CPools::GetDummyPool()->Delete((CDummy*)p); } diff --git a/src/entities/Entity.cpp b/src/entities/Entity.cpp index d7159e8c..2285c93f 100644 --- a/src/entities/Entity.cpp +++ b/src/entities/Entity.cpp @@ -1230,7 +1230,7 @@ void CEntity::SetRwObjectAlpha(int32 alpha) { if (m_rwObject != nil) { switch (RwObjectGetType(m_rwObject)) { case rpATOMIC: { - RpGeometry *geometry = RpAtomicGetGeometry(GetFirstAtomic(GetClump())); + RpGeometry *geometry = RpAtomicGetGeometry((RpAtomic*)m_rwObject); RpGeometrySetFlags(geometry, RpGeometryGetFlags(geometry) | rpGEOMETRYMODULATEMATERIALCOLOR); RpGeometryForAllMaterials(geometry, SetAtomicAlphaCB, (void*)alpha); break; |