diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-23 01:17:27 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-23 01:17:27 +0200 |
| commit | f8a509ffb3ffe6a66dfd8b81f1a4405513cb7622 (patch) | |
| tree | eced802fadfad1ee2f5d186f7b440493727b9902 /src/control/Script.cpp | |
| parent | Merge remote-tracking branch 'upstream/miami' into miami (diff) | |
| download | re3-f8a509ffb3ffe6a66dfd8b81f1a4405513cb7622.tar re3-f8a509ffb3ffe6a66dfd8b81f1a4405513cb7622.tar.gz re3-f8a509ffb3ffe6a66dfd8b81f1a4405513cb7622.tar.bz2 re3-f8a509ffb3ffe6a66dfd8b81f1a4405513cb7622.tar.lz re3-f8a509ffb3ffe6a66dfd8b81f1a4405513cb7622.tar.xz re3-f8a509ffb3ffe6a66dfd8b81f1a4405513cb7622.tar.zst re3-f8a509ffb3ffe6a66dfd8b81f1a4405513cb7622.zip | |
Diffstat (limited to 'src/control/Script.cpp')
| -rw-r--r-- | src/control/Script.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/control/Script.cpp b/src/control/Script.cpp index 1f30f6a4..dbbfd59e 100644 --- a/src/control/Script.cpp +++ b/src/control/Script.cpp @@ -8712,6 +8712,7 @@ int8 CRunningScript::ProcessCommands900To999(int32 command) return 0; case COMMAND_PRINT_HELP: { + debug("PRINT_HELP %s\n", (char*)&CTheScripts::ScriptSpace[m_nIp]); if (CCamera::m_bUseMouse3rdPerson && ( strncmp((char*)&CTheScripts::ScriptSpace[m_nIp], "HELP15", 7) == 0 || strncmp((char*)&CTheScripts::ScriptSpace[m_nIp], "GUN_2A", 7) == 0 || @@ -10149,7 +10150,7 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command) return 0; case COMMAND_SET_ENABLE_RC_DETONATE: CollectParameters(&m_nIp, 1); - CVehicle::bDisableRemoteDetonation = ScriptParams[0]; + CVehicle::bDisableRemoteDetonation = !ScriptParams[0]; return 0; case COMMAND_SET_CAR_RANDOM_ROUTE_SEED: { @@ -10690,7 +10691,7 @@ int8 CRunningScript::ProcessCommands1200To1299(int32 command) } case COMMAND_HAS_OBJECT_COLLIDED_WITH_ANYTHING: { - CollectParameters(&m_nIp, 2); + CollectParameters(&m_nIp, 1); CObject* pObject = CPools::GetObjectPool()->GetAt(ScriptParams[0]); assert(pObject); UpdateCompareFlag(pObject->m_nCollisionRecords != 0); |