summaryrefslogtreecommitdiffstats
path: root/src/control
diff options
context:
space:
mode:
authornrb <email.com>2020-05-24 17:27:12 +0200
committernrb <email.com>2020-05-24 17:27:12 +0200
commitd59862eb5e9b56fe5b9fb0b2332e07b5266dcd22 (patch)
treecb26faa96123be56fe3bad98a6447ae5f476b11b /src/control
parenthow did saving even work in original III? (diff)
downloadre3-d59862eb5e9b56fe5b9fb0b2332e07b5266dcd22.tar
re3-d59862eb5e9b56fe5b9fb0b2332e07b5266dcd22.tar.gz
re3-d59862eb5e9b56fe5b9fb0b2332e07b5266dcd22.tar.bz2
re3-d59862eb5e9b56fe5b9fb0b2332e07b5266dcd22.tar.lz
re3-d59862eb5e9b56fe5b9fb0b2332e07b5266dcd22.tar.xz
re3-d59862eb5e9b56fe5b9fb0b2332e07b5266dcd22.tar.zst
re3-d59862eb5e9b56fe5b9fb0b2332e07b5266dcd22.zip
Diffstat (limited to 'src/control')
-rw-r--r--src/control/Script.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/control/Script.cpp b/src/control/Script.cpp
index cf2545c0..cbaaf32e 100644
--- a/src/control/Script.cpp
+++ b/src/control/Script.cpp
@@ -11,6 +11,7 @@
#include "CarAI.h"
#include "CarCtrl.h"
#include "CarGen.h"
+#include "Ped.h"
#include "CivilianPed.h"
#include "Clock.h"
#include "ColStore.h"
@@ -7298,7 +7299,7 @@ int8 CRunningScript::ProcessCommands800To899(int32 command)
case COMMAND_WARP_CHAR_FROM_CAR_TO_COORD:
{
CollectParameters(&m_nIp, 4);
- CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+ CPed *pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
assert(pPed);
CVector pos = *(CVector*)&ScriptParams[1];
if (pos.z <= MAP_Z_LOW_LIMIT)
@@ -10655,7 +10656,7 @@ int8 CRunningScript::ProcessCommands1200To1299(int32 command)
CVector pos = *(CVector*)&ScriptParams[0];
if (pos.z <= MAP_Z_LOW_LIMIT)
pos.z = CWorld::FindGroundZForCoord(pos.x, pos.y);
- CCoronas::RegisterCorona((uint32)this + m_nIp, ScriptParams[6], ScriptParams[7], ScriptParams[8], 255, pos, *(float*)&ScriptParams[3],
+ CCoronas::RegisterCorona((uintptr)this + m_nIp, ScriptParams[6], ScriptParams[7], ScriptParams[8], 255, pos, *(float*)&ScriptParams[3],
150.0f, ScriptParams[4], ScriptParams[5], 1, 0, 0, 0.0f, false, 0.2f);
return 0;
}