diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2021-08-30 01:46:28 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2021-08-30 01:46:28 +0200 |
| commit | a1c241af37c31ea94e908eb719f80e6421f8b73d (patch) | |
| tree | 5ee1b15dce454aee038ac0da7e9ab611f32bee9e /src/control/Script7.cpp | |
| parent | merge (diff) | |
| download | re3-a1c241af37c31ea94e908eb719f80e6421f8b73d.tar re3-a1c241af37c31ea94e908eb719f80e6421f8b73d.tar.gz re3-a1c241af37c31ea94e908eb719f80e6421f8b73d.tar.bz2 re3-a1c241af37c31ea94e908eb719f80e6421f8b73d.tar.lz re3-a1c241af37c31ea94e908eb719f80e6421f8b73d.tar.xz re3-a1c241af37c31ea94e908eb719f80e6421f8b73d.tar.zst re3-a1c241af37c31ea94e908eb719f80e6421f8b73d.zip | |
Diffstat (limited to 'src/control/Script7.cpp')
| -rw-r--r-- | src/control/Script7.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/control/Script7.cpp b/src/control/Script7.cpp index ee197783..fb8e69fe 100644 --- a/src/control/Script7.cpp +++ b/src/control/Script7.cpp @@ -373,6 +373,7 @@ int8 CRunningScript::ProcessCommands1200To1299(int32 command) } case COMMAND_HAS_PHOTOGRAPH_BEEN_TAKEN: UpdateCompareFlag(CWeapon::bPhotographHasBeenTaken); + CWeapon::bPhotographHasBeenTaken = false; return 0; case COMMAND_GET_CHAR_ARMOUR: { @@ -508,7 +509,7 @@ int8 CRunningScript::ProcessCommands1200To1299(int32 command) CTheScripts::ReadTextLabelFromScript(&m_nIp, key); m_nIp += KEY_LENGTH_IN_SCRIPT; CStreaming::RemoveAnim(CAnimManager::GetAnimationBlockIndex(key)); - // + empty function on PS2 + // + empty function on PS2 (not PSP) return 0; } case COMMAND_IS_CHAR_WAITING_FOR_WORLD_COLLISION: @@ -636,11 +637,8 @@ int8 CRunningScript::ProcessCommands1200To1299(int32 command) SET_INTEGER_PARAM(1, 0); else if (GET_INTEGER_PARAM(1) == 3) SET_INTEGER_PARAM(1, 1); - pVehicle->BurstTyre(GET_INTEGER_PARAM(1), true); - } - else { - pVehicle->BurstTyre(GET_INTEGER_PARAM(1), true); } + pVehicle->BurstTyre(GET_INTEGER_PARAM(1), true); return 0; } case COMMAND_IS_CHAR_OBJ_NO_OBJ: @@ -812,7 +810,7 @@ int8 CRunningScript::ProcessCommands1300To1399(int32 command) m_nIp += KEY_LENGTH_IN_SCRIPT; // TheText.Get(key); CPickups::GetActualPickupIndex(CollectNextParameterWithoutIncreasingPC(m_nIp)); - SET_INTEGER_PARAM(0, CPickups::GenerateNewOne(pos, MI_PICKUP_PROPERTY, PICKUP_PROPERTY_LOCKED, 0, 0, false, key)); // TODO: gpModelIndices + SET_INTEGER_PARAM(0, CPickups::GenerateNewOne(pos, MI_PICKUP_PROPERTY, PICKUP_PROPERTY_LOCKED, 0, 0, false, key)); StoreParameters(&m_nIp, 1); return 0; } @@ -825,9 +823,9 @@ int8 CRunningScript::ProcessCommands1300To1399(int32 command) char key[KEY_LENGTH_IN_SCRIPT]; CTheScripts::ReadTextLabelFromScript(&m_nIp, key); m_nIp += KEY_LENGTH_IN_SCRIPT; - // TheText.Get(key); + TheText.Get(key); CPickups::GetActualPickupIndex(CollectNextParameterWithoutIncreasingPC(m_nIp)); - SET_INTEGER_PARAM(0, CPickups::GenerateNewOne(pos, MI_PICKUP_PROPERTY_FORSALE, PICKUP_PROPERTY_FORSALE, GET_INTEGER_PARAM(3), 0, false, key)); // TODO: gpModelIndices + SET_INTEGER_PARAM(0, CPickups::GenerateNewOne(pos, MI_PICKUP_PROPERTY_FORSALE, PICKUP_PROPERTY_FORSALE, GET_INTEGER_PARAM(3), 0, false, key)); StoreParameters(&m_nIp, 1); return 0; } |