summaryrefslogtreecommitdiffstats
path: root/src/control/Script.cpp
diff options
context:
space:
mode:
authorRoman Masanin <36927roma@gmail.com>2020-09-13 20:45:53 +0200
committerRoman Masanin <36927roma@gmail.com>2020-09-13 20:45:53 +0200
commit8f948228d5e60eb89055a8d40210e99e9f4f2c47 (patch)
treeee8c238c77e53e29c650d911e9d198452f5a7ba9 /src/control/Script.cpp
parentvehicle audio(first part) and temp fix for openAL (diff)
parentMerge pull request #702 from Sergeanur/VC/MusicManager (diff)
downloadre3-8f948228d5e60eb89055a8d40210e99e9f4f2c47.tar
re3-8f948228d5e60eb89055a8d40210e99e9f4f2c47.tar.gz
re3-8f948228d5e60eb89055a8d40210e99e9f4f2c47.tar.bz2
re3-8f948228d5e60eb89055a8d40210e99e9f4f2c47.tar.lz
re3-8f948228d5e60eb89055a8d40210e99e9f4f2c47.tar.xz
re3-8f948228d5e60eb89055a8d40210e99e9f4f2c47.tar.zst
re3-8f948228d5e60eb89055a8d40210e99e9f4f2c47.zip
Diffstat (limited to 'src/control/Script.cpp')
-rw-r--r--src/control/Script.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/control/Script.cpp b/src/control/Script.cpp
index b313e308..c560e500 100644
--- a/src/control/Script.cpp
+++ b/src/control/Script.cpp
@@ -3773,7 +3773,7 @@ int8 CRunningScript::ProcessCommands100To199(int32 command)
CPed* pNearPed = ped->m_nearPeds[i];
if (pNearPed->m_leader == ped) {
pNearPed->Teleport(pos);
- pNearPed->PositionPedOutOfCollision(); // TODO(MIAMI): this is PositionAnyPedOutOfCollision!!!
+ pNearPed->PositionAnyPedOutOfCollision();
}
}
}
@@ -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: