diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2020-09-13 02:10:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-13 02:10:14 +0200 |
| commit | 25a22cc6f25c01c7fc777bc41f632e6237ac8426 (patch) | |
| tree | 4323944c27801c403fcea94a4fee9913570b172e /src/control | |
| parent | Merge pull request #701 from erorcun/miami (diff) | |
| parent | Add missing file (diff) | |
| download | re3-25a22cc6f25c01c7fc777bc41f632e6237ac8426.tar re3-25a22cc6f25c01c7fc777bc41f632e6237ac8426.tar.gz re3-25a22cc6f25c01c7fc777bc41f632e6237ac8426.tar.bz2 re3-25a22cc6f25c01c7fc777bc41f632e6237ac8426.tar.lz re3-25a22cc6f25c01c7fc777bc41f632e6237ac8426.tar.xz re3-25a22cc6f25c01c7fc777bc41f632e6237ac8426.tar.zst re3-25a22cc6f25c01c7fc777bc41f632e6237ac8426.zip | |
Diffstat (limited to 'src/control')
| -rw-r--r-- | src/control/Script.cpp | 10 | ||||
| -rw-r--r-- | src/control/Script.h | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/control/Script.cpp b/src/control/Script.cpp index f7f9b058..c560e500 100644 --- a/src/control/Script.cpp +++ b/src/control/Script.cpp @@ -11936,7 +11936,7 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command) return 0; case COMMAND_SHUT_CHAR_UP: CollectParameters(&m_nIp, 2); - debug("SHUT_CHAR_UP not implemented"); // TODO(MIAMI) + DMAudio.SetPedTalkingStatus(CPools::GetPedPool()->GetAt(ScriptParams[0]), ScriptParams[1] == 0); return 0; case COMMAND_SET_ENABLE_RC_DETONATE: CollectParameters(&m_nIp, 1); @@ -12563,13 +12563,13 @@ int8 CRunningScript::ProcessCommands1200To1299(int32 command) case COMMAND_SHUT_PLAYER_UP: { CollectParameters(&m_nIp, 2); - debug("SHUT_PLAYER_UP is not implemented\n"); // TODO(MIAMI) + DMAudio.ShutUpPlayerTalking(!!ScriptParams[1]); return 0; } case COMMAND_SET_PLAYER_MOOD: { CollectParameters(&m_nIp, 3); - debug("SET_PLAYER_MOOD is not implemented\n"); // TODO(MIAMI) + DMAudio.SetPlayersMood(ScriptParams[1], ScriptParams[2]); return 0; } case COMMAND_REQUEST_COLLISION: @@ -13001,7 +13001,7 @@ int8 CRunningScript::ProcessCommands1300To1399(int32 command) } case COMMAND_DISABLE_CUTSCENE_SHADOWS: { - debug("DISABLE_CUTSCENE_SHADOWS not implemented, skipping\n"); // TODO(MIAMI) + CCutsceneMgr::DisableCutsceneShadows(); return 0; } case COMMAND_HAS_GLASS_BEEN_SHATTERED_NEARBY: @@ -13186,7 +13186,7 @@ int8 CRunningScript::ProcessCommands1300To1399(int32 command) return 0; case COMMAND_REMOVE_EVERYTHING_FOR_HUGE_CUTSCENE: { - debug("REMOVE_EVERYTHING_FOR_HUGE_CUTSCENE not implemented, skipping\n"); + CCutsceneMgr::RemoveEverythingFromTheWorldForTheBiggestFuckoffCutsceneEver(); return 0; } case COMMAND_IS_PLAYER_TOUCHING_VEHICLE: diff --git a/src/control/Script.h b/src/control/Script.h index 4493ade3..f3455797 100644 --- a/src/control/Script.h +++ b/src/control/Script.h @@ -282,12 +282,12 @@ class CTheScripts static uint8 UseTextCommands; static uint16 CommandsExecuted; static uint16 ScriptsUpdated; - static uint8 RiotIntensity; static uint32 LastMissionPassedTime; static uint16 NumberOfExclusiveMissionScripts; static bool bPlayerIsInTheStatium; +public: + static uint8 RiotIntensity; static bool bPlayerHasMetDebbieHarry; - public: static void Init(); static void Process(); |