mirrors
/
re3
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix PS2 script

This commit is contained in:
Nikolay Korolev 2021-08-29 19:36:44 +03:00
parent 55e950fe84
commit 8593fff48b
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/control/Script.h
View File

@ -347,7 +347,9 @@ public:
void LocateCharCommand(int32, uint32*); void LocateCharCommand(int32, uint32*);
void LocateCharCharCommand(int32, uint32*); void LocateCharCharCommand(int32, uint32*);
void LocateCharCarCommand(int32, uint32*); void LocateCharCarCommand(int32, uint32*);
#if GTA_VERSION > GTA3_PS2_160
void LocateCharObjectCommand(int32, uint32*); void LocateCharObjectCommand(int32, uint32*);
#endif
void LocateCarCommand(int32, uint32*); void LocateCarCommand(int32, uint32*);
void LocateSniperBulletCommand(int32, uint32*); void LocateSniperBulletCommand(int32, uint32*);
void PlayerInAreaCheckCommand(int32, uint32*); void PlayerInAreaCheckCommand(int32, uint32*);

2
src/control/Script5.cpp
View File

@ -582,6 +582,7 @@ void CRunningScript::LocateCharCarCommand(int32 command, uint32* pIp)
} }
} }
#if GTA_VERSION > GTA3_PS2_160
void CRunningScript::LocateCharObjectCommand(int32 command, uint32* pIp) void CRunningScript::LocateCharObjectCommand(int32 command, uint32* pIp)
{ {
bool b3D, result, debug; 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); CTheScripts::DrawDebugSquare(X - dX, Y - dY, X + dX, Y + dY);
} }
} }
#endif
void CRunningScript::LocateCarCommand(int32 command, uint32* pIp) void CRunningScript::LocateCarCommand(int32 command, uint32* pIp)
{ {

2
src/control/Script6.cpp
View File

@ -1338,7 +1338,6 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
CPed::nEnterCarRangeMultiplier = (float)ScriptParams[0]; CPed::nEnterCarRangeMultiplier = (float)ScriptParams[0];
#endif #endif
return 0; return 0;
#endif
#if GTA_VERSION < GTA3_PC_11 #if GTA_VERSION < GTA3_PC_11
case COMMAND_SET_THREAT_REACTION_RANGE_MULTIPLIER: case COMMAND_SET_THREAT_REACTION_RANGE_MULTIPLIER:
CollectParameters(&m_nIp, 1); CollectParameters(&m_nIp, 1);
@ -1348,6 +1347,7 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
CPed::nThreatReactionRangeMultiplier = (float)ScriptParams[0]; CPed::nThreatReactionRangeMultiplier = (float)ScriptParams[0];
#endif #endif
return 0; return 0;
#endif
#endif #endif
default: default:
script_assert(0); script_assert(0);