diff options
author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-04-10 20:17:00 +0200 |
---|---|---|
committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-04-10 20:17:00 +0200 |
commit | be260b49b1e5421a96f78ae2f0512220d5805274 (patch) | |
tree | 16f21f6f45c749120e3853a4369fe39348344102 /src/animation | |
parent | record init (diff) | |
parent | disabling the code that freezes gang members (diff) | |
download | re3-be260b49b1e5421a96f78ae2f0512220d5805274.tar re3-be260b49b1e5421a96f78ae2f0512220d5805274.tar.gz re3-be260b49b1e5421a96f78ae2f0512220d5805274.tar.bz2 re3-be260b49b1e5421a96f78ae2f0512220d5805274.tar.lz re3-be260b49b1e5421a96f78ae2f0512220d5805274.tar.xz re3-be260b49b1e5421a96f78ae2f0512220d5805274.tar.zst re3-be260b49b1e5421a96f78ae2f0512220d5805274.zip |
Diffstat (limited to '')
-rw-r--r-- | src/animation/CutsceneMgr.cpp (renamed from src/core/CutsceneMgr.cpp) | 7 | ||||
-rw-r--r-- | src/animation/CutsceneMgr.h (renamed from src/core/CutsceneMgr.h) | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/core/CutsceneMgr.cpp b/src/animation/CutsceneMgr.cpp index 283f34b8..0e35599b 100644 --- a/src/core/CutsceneMgr.cpp +++ b/src/animation/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; @@ -352,6 +352,7 @@ CCutsceneMgr::DeleteCutsceneData(void) CWorld::Remove(ms_pCutsceneObjects[ms_numCutsceneObjs]); ms_pCutsceneObjects[ms_numCutsceneObjs]->DeleteRwObject(); delete ms_pCutsceneObjects[ms_numCutsceneObjs]; + ms_pCutsceneObjects[ms_numCutsceneObjs] = nil; } ms_numCutsceneObjs = 0; diff --git a/src/core/CutsceneMgr.h b/src/animation/CutsceneMgr.h index 7b809964..3c915eea 100644 --- a/src/core/CutsceneMgr.h +++ b/src/animation/CutsceneMgr.h @@ -26,7 +26,7 @@ public: static CDirectory *&ms_pCutsceneDir; static uint32 &ms_cutsceneLoadStatus; - static void SetRunning(bool running) { ms_running = running; } + static void StartCutsceneProcessing() { ms_cutsceneProcessing = true; } static bool IsRunning(void) { return ms_running; } static bool IsCutsceneProcessing(void) { return ms_cutsceneProcessing; } static bool UseLodMultiplier(void) { return ms_useLodMultiplier; } |