summaryrefslogtreecommitdiffstats
path: root/src/control/Script.cpp
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-05-26 11:39:16 +0200
committerGitHub <noreply@github.com>2020-05-26 11:39:16 +0200
commit800d706935a9ef2ccd360584416a4b24d99be718 (patch)
treeea345190077017dc3f5783cbe531f193e11ec5f6 /src/control/Script.cpp
parenteSurfaceType (diff)
parentPed.h include not needed (diff)
downloadre3-800d706935a9ef2ccd360584416a4b24d99be718.tar
re3-800d706935a9ef2ccd360584416a4b24d99be718.tar.gz
re3-800d706935a9ef2ccd360584416a4b24d99be718.tar.bz2
re3-800d706935a9ef2ccd360584416a4b24d99be718.tar.lz
re3-800d706935a9ef2ccd360584416a4b24d99be718.tar.xz
re3-800d706935a9ef2ccd360584416a4b24d99be718.tar.zst
re3-800d706935a9ef2ccd360584416a4b24d99be718.zip
Diffstat (limited to 'src/control/Script.cpp')
-rw-r--r--src/control/Script.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/control/Script.cpp b/src/control/Script.cpp
index abcb29bc..f13375ef 100644
--- a/src/control/Script.cpp
+++ b/src/control/Script.cpp
@@ -7298,7 +7298,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 +10655,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;
}