From 8593fff48b78df7067f90ed57596855e32b91f54 Mon Sep 17 00:00:00 2001 From: Nikolay Korolev Date: Sun, 29 Aug 2021 19:36:44 +0300 Subject: [PATCH] fix PS2 script --- src/control/Script.h | 2 ++ src/control/Script5.cpp | 2 ++ src/control/Script6.cpp | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/control/Script.h b/src/control/Script.h index eedf17d4..22711005 100644 --- a/src/control/Script.h +++ b/src/control/Script.h @@ -347,7 +347,9 @@ public: void LocateCharCommand(int32, uint32*); void LocateCharCharCommand(int32, uint32*); void LocateCharCarCommand(int32, uint32*); +#if GTA_VERSION > GTA3_PS2_160 void LocateCharObjectCommand(int32, uint32*); +#endif void LocateCarCommand(int32, uint32*); void LocateSniperBulletCommand(int32, uint32*); void PlayerInAreaCheckCommand(int32, uint32*); diff --git a/src/control/Script5.cpp b/src/control/Script5.cpp index 76aa2442..837e3582 100644 --- a/src/control/Script5.cpp +++ b/src/control/Script5.cpp @@ -582,6 +582,7 @@ void CRunningScript::LocateCharCarCommand(int32 command, uint32* pIp) } } +#if GTA_VERSION > GTA3_PS2_160 void CRunningScript::LocateCharObjectCommand(int32 command, uint32* pIp) { bool b3D, result, debug; @@ -659,6 +660,7 @@ void CRunningScript::LocateCharObjectCommand(int32 command, uint32* pIp) CTheScripts::DrawDebugSquare(X - dX, Y - dY, X + dX, Y + dY); } } +#endif void CRunningScript::LocateCarCommand(int32 command, uint32* pIp) { diff --git a/src/control/Script6.cpp b/src/control/Script6.cpp index 0a2248f8..c576e3c2 100644 --- a/src/control/Script6.cpp +++ b/src/control/Script6.cpp @@ -1338,7 +1338,6 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command) CPed::nEnterCarRangeMultiplier = (float)ScriptParams[0]; #endif return 0; -#endif #if GTA_VERSION < GTA3_PC_11 case COMMAND_SET_THREAT_REACTION_RANGE_MULTIPLIER: CollectParameters(&m_nIp, 1); @@ -1348,6 +1347,7 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command) CPed::nThreatReactionRangeMultiplier = (float)ScriptParams[0]; #endif return 0; +#endif #endif default: script_assert(0);