summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2021-08-29 18:36:44 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2021-08-29 18:36:44 +0200
commit8593fff48b78df7067f90ed57596855e32b91f54 (patch)
tree4fc9fe5888b0eceaaa012f21eff9c2da84b9d864 /src
parentAudio: fixing bugs, fixing types, making code more accurate to original (diff)
downloadre3-8593fff48b78df7067f90ed57596855e32b91f54.tar
re3-8593fff48b78df7067f90ed57596855e32b91f54.tar.gz
re3-8593fff48b78df7067f90ed57596855e32b91f54.tar.bz2
re3-8593fff48b78df7067f90ed57596855e32b91f54.tar.lz
re3-8593fff48b78df7067f90ed57596855e32b91f54.tar.xz
re3-8593fff48b78df7067f90ed57596855e32b91f54.tar.zst
re3-8593fff48b78df7067f90ed57596855e32b91f54.zip
Diffstat (limited to 'src')
-rw-r--r--src/control/Script.h2
-rw-r--r--src/control/Script5.cpp2
-rw-r--r--src/control/Script6.cpp2
3 files changed, 5 insertions, 1 deletions
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);
@@ -1349,6 +1348,7 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
#endif
return 0;
#endif
+#endif
default:
script_assert(0);
}