diff options
| author | aap <aap@papnet.eu> | 2020-04-09 20:35:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-09 20:35:04 +0200 |
| commit | d8cf6258b71dc09452b65f7d83dbd5a221fa54c4 (patch) | |
| tree | 8023dc2be8d67f430a5788bd850d287058f0cd8a /src/core/CutsceneMgr.cpp | |
| parent | CStats finished (diff) | |
| parent | fixed questionable RW usage; changed radar mask to PS2 techinque (diff) | |
| download | re3-d8cf6258b71dc09452b65f7d83dbd5a221fa54c4.tar re3-d8cf6258b71dc09452b65f7d83dbd5a221fa54c4.tar.gz re3-d8cf6258b71dc09452b65f7d83dbd5a221fa54c4.tar.bz2 re3-d8cf6258b71dc09452b65f7d83dbd5a221fa54c4.tar.lz re3-d8cf6258b71dc09452b65f7d83dbd5a221fa54c4.tar.xz re3-d8cf6258b71dc09452b65f7d83dbd5a221fa54c4.tar.zst re3-d8cf6258b71dc09452b65f7d83dbd5a221fa54c4.zip | |
Diffstat (limited to 'src/core/CutsceneMgr.cpp')
| -rw-r--r-- | src/core/CutsceneMgr.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/CutsceneMgr.cpp b/src/core/CutsceneMgr.cpp index 283f34b8..39066958 100644 --- a/src/core/CutsceneMgr.cpp +++ b/src/core/CutsceneMgr.cpp @@ -134,8 +134,8 @@ uint32 &CCutsceneMgr::ms_cutsceneLoadStatus = *(uint32*)0x95CB40; RpAtomic * CalculateBoundingSphereRadiusCB(RpAtomic *atomic, void *data) { - float radius = RpAtomicGetBoundingSphereMacro(atomic)->radius; - RwV3d center = RpAtomicGetBoundingSphereMacro(atomic)->center; + float radius = RpAtomicGetBoundingSphere(atomic)->radius; + RwV3d center = RpAtomicGetBoundingSphere(atomic)->center; for (RwFrame *frame = RpAtomicGetFrame(atomic); RwFrameGetParent(frame); frame = RwFrameGetParent(frame)) RwV3dTransformPoints(¢er, ¢er, 1, RwFrameGetMatrix(frame)); @@ -326,7 +326,7 @@ CCutsceneMgr::CreateCutsceneObject(int modelId) pModelInfo->SetColModel(pColModel); clump = (RpClump*)pModelInfo->GetRwObject(); - assert(RwObjectGetType(clump) == rpCLUMP); + assert(RwObjectGetType((RwObject*)clump) == rpCLUMP); RpClumpForAllAtomics(clump, CalculateBoundingSphereRadiusCB, &radius); pColModel->boundingSphere.radius = radius; |