diff options
| author | aap <aap@papnet.eu> | 2020-05-19 20:56:42 +0200 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2020-05-19 20:56:42 +0200 |
| commit | bdbe5d1080066073f063d653e80df6dbf4b326a2 (patch) | |
| tree | bc4f8fd0f648bc38789591efe73d661ed2981998 /src/control/Script.cpp | |
| parent | Merge pull request #564 from Xinerki/miami (diff) | |
| download | re3-bdbe5d1080066073f063d653e80df6dbf4b326a2.tar re3-bdbe5d1080066073f063d653e80df6dbf4b326a2.tar.gz re3-bdbe5d1080066073f063d653e80df6dbf4b326a2.tar.bz2 re3-bdbe5d1080066073f063d653e80df6dbf4b326a2.tar.lz re3-bdbe5d1080066073f063d653e80df6dbf4b326a2.tar.xz re3-bdbe5d1080066073f063d653e80df6dbf4b326a2.tar.zst re3-bdbe5d1080066073f063d653e80df6dbf4b326a2.zip | |
Diffstat (limited to 'src/control/Script.cpp')
| -rw-r--r-- | src/control/Script.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/control/Script.cpp b/src/control/Script.cpp index 2ad1e9de..cc5c698b 100644 --- a/src/control/Script.cpp +++ b/src/control/Script.cpp @@ -7167,12 +7167,13 @@ int8 CRunningScript::ProcessCommands800To899(int32 command) } case COMMAND_CREATE_FLOATING_PACKAGE: { - CollectParameters(&m_nIp, 3); - CVector pos = *(CVector*)&ScriptParams[0]; - if (pos.z <= MAP_Z_LOW_LIMIT) - pos.z = CWorld::FindGroundZForCoord(pos.x, pos.y) + PICKUP_PLACEMENT_OFFSET; - ScriptParams[0] = CPickups::GenerateNewOne(pos, MI_FLOATPACKAGE1, PICKUP_FLOATINGPACKAGE, 0); - StoreParameters(&m_nIp, 1); +// removed in MIAMI +// CollectParameters(&m_nIp, 3); +// CVector pos = *(CVector*)&ScriptParams[0]; +// if (pos.z <= MAP_Z_LOW_LIMIT) +// pos.z = CWorld::FindGroundZForCoord(pos.x, pos.y) + PICKUP_PLACEMENT_OFFSET; +// ScriptParams[0] = CPickups::GenerateNewOne(pos, MI_FLOATPACKAGE1, PICKUP_FLOATINGPACKAGE, 0); +// StoreParameters(&m_nIp, 1); return 0; } case COMMAND_PLACE_OBJECT_RELATIVE_TO_CAR: @@ -8626,8 +8627,8 @@ int8 CRunningScript::ProcessCommands1000To1099(int32 command) return 0; } case COMMAND_GET_BODY_CAST_HEALTH: - ScriptParams[0] = CObject::nBodyCastHealth; - StoreParameters(&m_nIp, 1); + // ScriptParams[0] = CObject::nBodyCastHealth; + // StoreParameters(&m_nIp, 1); return 0; case COMMAND_SET_CHARS_CHATTING: { |