diff options
| author | aap <aap@papnet.eu> | 2020-05-09 13:00:39 +0200 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2020-05-09 13:00:39 +0200 |
| commit | 989ded6052f6bd1c5d518e65768cce85a92fc20b (patch) | |
| tree | a6560865ae82445f61b9e48082c0e82aeddf51c4 /src/control | |
| parent | Merge branch 'miami' of github.com:GTAmodding/re3 into miami (diff) | |
| download | re3-989ded6052f6bd1c5d518e65768cce85a92fc20b.tar re3-989ded6052f6bd1c5d518e65768cce85a92fc20b.tar.gz re3-989ded6052f6bd1c5d518e65768cce85a92fc20b.tar.bz2 re3-989ded6052f6bd1c5d518e65768cce85a92fc20b.tar.lz re3-989ded6052f6bd1c5d518e65768cce85a92fc20b.tar.xz re3-989ded6052f6bd1c5d518e65768cce85a92fc20b.tar.zst re3-989ded6052f6bd1c5d518e65768cce85a92fc20b.zip | |
Diffstat (limited to 'src/control')
| -rw-r--r-- | src/control/Replay.cpp | 2 | ||||
| -rw-r--r-- | src/control/Replay.h | 2 | ||||
| -rw-r--r-- | src/control/Script.cpp | 17 |
3 files changed, 4 insertions, 17 deletions
diff --git a/src/control/Replay.cpp b/src/control/Replay.cpp index 92cadab7..ab187c10 100644 --- a/src/control/Replay.cpp +++ b/src/control/Replay.cpp @@ -47,7 +47,7 @@ CAutomobile *CReplay::pBuf1; uint8 *CReplay::pBuf2; CPlayerPed *CReplay::pBuf3; uint8 *CReplay::pBuf4; -CCutsceneHead *CReplay::pBuf5; +CCutsceneObject *CReplay::pBuf5; uint8 *CReplay::pBuf6; CPtrNode *CReplay::pBuf7; uint8 *CReplay::pBuf8; diff --git a/src/control/Replay.h b/src/control/Replay.h index bf70a28a..6a07e593 100644 --- a/src/control/Replay.h +++ b/src/control/Replay.h @@ -213,7 +213,7 @@ private: static uint8* pBuf2; static CPlayerPed* pBuf3; static uint8* pBuf4; - static CCutsceneHead* pBuf5; + static CCutsceneObject* pBuf5; static uint8* pBuf6; static CPtrNode* pBuf7; static uint8* pBuf8; diff --git a/src/control/Script.cpp b/src/control/Script.cpp index b6729486..badcebf2 100644 --- a/src/control/Script.cpp +++ b/src/control/Script.cpp @@ -6175,25 +6175,12 @@ int8 CRunningScript::ProcessCommands700To799(int32 command) } case COMMAND_CREATE_CUTSCENE_HEAD: { - CollectParameters(&m_nIp, 2); - CObject* pObject = CPools::GetObjectPool()->GetAt(ScriptParams[0]); - assert(pObject); - CCutsceneHead* pCutHead = CCutsceneMgr::AddCutsceneHead(pObject, ScriptParams[1]); - ScriptParams[0] = CPools::GetObjectPool()->GetIndex(pCutHead); - StoreParameters(&m_nIp, 1); + assert(0); return 0; } case COMMAND_SET_CUTSCENE_HEAD_ANIM: { - CollectParameters(&m_nIp, 1); - CObject* pCutHead = CPools::GetObjectPool()->GetAt(ScriptParams[0]); - assert(pCutHead); - char name[KEY_LENGTH_IN_SCRIPT]; - strncpy(name, (const char*)&CTheScripts::ScriptSpace[m_nIp], KEY_LENGTH_IN_SCRIPT); - m_nIp += KEY_LENGTH_IN_SCRIPT; - CTimer::Stop(); - CCutsceneMgr::SetHeadAnim(name, pCutHead); - CTimer::Update(); + assert(0); return 0; } case COMMAND_SIN: |