archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-07-11 23:58:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #569 from aap/miami

Browse Source 
CEntity and friends
This commit is contained in:
aap
2020-05-20 12:41:12 +02:00
committed by GitHub
parent 98b158c783 bdbe5d1080
commit fd4cd3e8f1
26 changed files with 581 additions and 650 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/control/Script.cpp
View File

@ -7120,12 +7120,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:
@ -8579,8 +8580,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:
{