summaryrefslogtreecommitdiffstats
path: root/src/control/Script8.cpp
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2021-01-18 20:19:30 +0100
committerNikolay Korolev <nickvnuk@gmail.com>2021-01-18 20:19:30 +0100
commitc09297997e9878f06e6cd513e26cbbe50ae860fb (patch)
tree810b97cfd49a9c3b43a3a3f1803d2e04f9c87ce9 /src/control/Script8.cpp
parentMerge branch 'lcs' into lcs-dev (diff)
downloadre3-c09297997e9878f06e6cd513e26cbbe50ae860fb.tar
re3-c09297997e9878f06e6cd513e26cbbe50ae860fb.tar.gz
re3-c09297997e9878f06e6cd513e26cbbe50ae860fb.tar.bz2
re3-c09297997e9878f06e6cd513e26cbbe50ae860fb.tar.lz
re3-c09297997e9878f06e6cd513e26cbbe50ae860fb.tar.xz
re3-c09297997e9878f06e6cd513e26cbbe50ae860fb.tar.zst
re3-c09297997e9878f06e6cd513e26cbbe50ae860fb.zip
Diffstat (limited to 'src/control/Script8.cpp')
-rw-r--r--src/control/Script8.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/control/Script8.cpp b/src/control/Script8.cpp
index 6de73b82..35cf6fa8 100644
--- a/src/control/Script8.cpp
+++ b/src/control/Script8.cpp
@@ -26,6 +26,8 @@
#include "World.h"
#include "Zones.h"
+// LCS: file done except TODOs (also check commented out strings)
+
int8 CRunningScript::ProcessCommands1400To1499(int32 command)
{
switch (command) {
@@ -37,7 +39,7 @@ int8 CRunningScript::ProcessCommands1400To1499(int32 command)
{
CollectParameters(&m_nIp, 1);
CPed* pPed = CPools::GetPedPool()->GetAt(GET_INTEGER_PARAM(0));
- if (pPed && pPed->GetPedState() != PED_DRIVING && !pPed->GetPedState() != PED_AIM_GUN) {
+ if (pPed && pPed->GetPedState() != PED_DRIVING && pPed->GetPedState() != PED_AIM_GUN) {
pPed->m_pVehicleAnim = nil;
pPed->RestartNonPartialAnims();
RpAnimBlendClumpRemoveAllAssociations(pPed->GetClump());
@@ -606,6 +608,7 @@ int8 CRunningScript::ProcessCommands1400To1499(int32 command)
}
SET_INTEGER_PARAM(0, -1);
StoreParameters(&m_nIp, 1);
+ return 0;
}
case COMMAND_REMOVE_SCRIPT_CORONA:
CollectParameters(&m_nIp, 1);