script 1000-1154

src/control/Cranes.cpp

@@ -5,6 +5,7 @@
 WRAPPER bool CCranes::IsThisCarBeingTargettedByAnyCrane(CVehicle*) { EAXJMP(0x5451E0); }
 WRAPPER bool CCranes::IsThisCarBeingCarriedByAnyCrane(CVehicle*) { EAXJMP(0x545190); }
 WRAPPER bool CCranes::IsThisCarPickedUp(float, float, CVehicle*) { EAXJMP(0x543940); }
+WRAPPER bool CCranes::HaveAllCarsBeenCollectedByMilitaryCrane() { EAXJMP(0x544BE0); }
 WRAPPER void CCranes::ActivateCrane(float, float, float, float, float, float, float, float, bool, bool, float, float) { EAXJMP(0x543650); }
 WRAPPER void CCranes::DeActivateCrane(float, float) { EAXJMP(0x543890); }
 WRAPPER void CCranes::InitCranes(void) { EAXJMP(0x543360); }

src/control/Cranes.h

@@ -9,6 +9,7 @@ public:
 	static bool IsThisCarBeingTargettedByAnyCrane(CVehicle*);
 	static bool IsThisCarBeingCarriedByAnyCrane(CVehicle*);
 	static bool IsThisCarPickedUp(float, float, CVehicle*);
+	static bool HaveAllCarsBeenCollectedByMilitaryCrane();
 	static void ActivateCrane(float, float, float, float, float, float, float, float, bool, bool, float, float);
 	static void DeActivateCrane(float, float);
 	static void InitCranes(void);

src/control/Garages.cpp

@@ -99,6 +99,7 @@ void CGarages::GivePlayerDetonator()
 WRAPPER bool CGarages::HasThisCarBeenCollected(int16 garage, uint8 id) { EAXJMP(0x426D50); }
 WRAPPER void CGarages::ChangeGarageType(int16 garage, eGarageType type, int32 mi) { EAXJMP(0x4222A0); }
 WRAPPER bool CGarages::HasResprayHappened(int16 garage) { EAXJMP(0x4274F0); }
+WRAPPER bool CGarages::IsThisCarWithinGarageArea(int16 garage, CEntity* pCar) { EAXJMP(0x427570); }
 
 void CGarage::OpenThisGarage()
 {

src/control/Garages.h

@@ -162,6 +162,7 @@ public:
 	static void SetGarageDoorToRotate(int16);
 	static bool HasImportExportGarageCollectedThisCar(int16, int8);
 	static void SetLeaveCameraForThisGarage(int16);
+	static bool IsThisCarWithinGarageArea(int16, CEntity*);
 
 	static int GetCarsCollectedIndexForGarageType(eGarageType type) { return type - GARAGE_COLLECTCARS_1; }
 };

src/control/PathFind.cpp

@@ -893,7 +893,7 @@ CPathFind::MarkRoadsBetweenLevelsInArea(float x1, float x2, float y1, float y2,
 }
 
 void
-CPathFind::MarkPedRoadsBetweenLevelsInArea(float x1, float x2, float y1, float y2, float z1, float z2)
+CPathFind::PedMarkRoadsBetweenLevelsInArea(float x1, float x2, float y1, float y2, float z1, float z2)
 {
 	int i;
 
@@ -1476,7 +1476,7 @@ STARTPATCHES
 	InjectHook(0x42DB50, &CPathFind::SwitchRoadsInAngledArea, PATCH_JUMP);
 	InjectHook(0x42E140, &CPathFind::MarkRoadsBetweenLevelsNodeAndNeighbours, PATCH_JUMP);
 	InjectHook(0x42DF50, &CPathFind::MarkRoadsBetweenLevelsInArea, PATCH_JUMP);
-	InjectHook(0x42E040, &CPathFind::MarkPedRoadsBetweenLevelsInArea, PATCH_JUMP);
+	InjectHook(0x42E040, &CPathFind::PedMarkRoadsBetweenLevelsInArea, PATCH_JUMP);
 	InjectHook(0x42CC30, &CPathFind::FindNodeClosestToCoors, PATCH_JUMP);
 	InjectHook(0x42CDC0, &CPathFind::FindNodeClosestToCoorsFavourDirection, PATCH_JUMP);
 	InjectHook(0x42CFC0, &CPathFind::FindNodeOrientationForCarPlacement, PATCH_JUMP);

src/control/PathFind.h

@@ -186,7 +186,7 @@ public:
 	void SwitchRoadsInAngledArea(float x1, float y1, float z1, float x2, float y2, float z2, float length, uint8 type, uint8 enable);
 	void MarkRoadsBetweenLevelsNodeAndNeighbours(int32 nodeId);
 	void MarkRoadsBetweenLevelsInArea(float x1, float x2, float y1, float y2, float z1, float z2);
-	void MarkPedRoadsBetweenLevelsInArea(float x1, float x2, float y1, float y2, float z1, float z2);
+	void PedMarkRoadsBetweenLevelsInArea(float x1, float x2, float y1, float y2, float z1, float z2);
 	int32 FindNodeClosestToCoors(CVector coors, uint8 type, float distLimit, bool ignoreDisabled = false, bool ignoreBetweenLevels = false);
 	int32 FindNodeClosestToCoorsFavourDirection(CVector coors, uint8 type, float dirX, float dirY);
 	float FindNodeOrientationForCarPlacement(int32 nodeId);

src/control/Population.cpp

@@ -38,6 +38,7 @@ WRAPPER void CPopulation::UpdatePedCount(uint32, bool) { EAXJMP(0x4F5A60); }
 WRAPPER void CPopulation::DealWithZoneChange(eLevelName oldLevel, eLevelName newLevel, bool) { EAXJMP(0x4F6200); }
 WRAPPER CPed *CPopulation::AddPedInCar(CVehicle *vehicle) { EAXJMP(0x4F5800); }
 WRAPPER bool CPopulation::IsPointInSafeZone(CVector *coors) { EAXJMP(0x4F60C0); }
+WRAPPER void CPopulation::ConvertToRealObject(CDummyObject* obj) { EAXJMP(0x4F45A0); }
 
 void
 CPopulation::Initialise()

src/control/Population.h

@@ -4,6 +4,7 @@
 
 class CPed;
 class CVehicle;
+class CDummyObject;
 
 struct PedGroup
 {
@@ -48,4 +49,5 @@ public:
 	static bool IsPointInSafeZone(CVector *coors);
 	static void RemovePed(CEntity* ent);
 	static int32 ChooseCivilianOccupation(int32);
+	static void ConvertToRealObject(CDummyObject*);
 };

src/control/Record.cpp

@@ -13,3 +13,5 @@ WRAPPER void CRecordDataForChase::ProcessControlCars(void) { EAXJMP(0x435540); }
 WRAPPER void CRecordDataForChase::SaveOrRetrieveCarPositions(void) { EAXJMP(0x434B20); }
 WRAPPER void CRecordDataForChase::StartChaseScene(float) { EAXJMP(0x435690); }
 WRAPPER void CRecordDataForChase::CleanUpChaseScene() { EAXJMP(0x4357C0); }
+WRAPPER void CRecordDataForChase::RemoveCarFromChase(int32) { EAXJMP(0x435BC0); }
+WRAPPER CVehicle* CRecordDataForChase::TurnChaseCarIntoScriptCar(int32) { EAXJMP(0x435C00); }

src/control/Record.h

@@ -1,5 +1,7 @@
 #pragma once
 
+class CVehicle;
+
 enum {
 	RECORDSTATE_0,
 	RECORDSTATE_1,
@@ -16,6 +18,8 @@ public:
 	static void SaveOrRetrieveCarPositions(void);
 	static void StartChaseScene(float);
 	static void CleanUpChaseScene();
+	static void RemoveCarFromChase(int32);
+	static CVehicle* TurnChaseCarIntoScriptCar(int32);
 };
 
 

src/control/Script.h

@@ -139,7 +139,9 @@ public:
 	int8 ProcessCommands800To899(int32);
 	int8 ProcessCommands900To999(int32);
 	int8 ProcessCommands1000To1099(int32);
+#ifndef GTA_PS2
 	int8 ProcessCommands1100To1199(int32);
+#endif
 	void UpdateCompareFlag(bool);
 	int16 GetPadState(uint16, uint16);
 	void LocatePlayerCommand(int32, uint32*);

src/control/ScriptCommands.h

@@ -1108,6 +1108,7 @@ enum {
 	COMMAND_SET_JAMES_CAR_ON_PATH_TO_PLAYER,
 	COMMAND_LOAD_END_OF_GAME_TUNE,
 	COMMAND_ENABLE_PLAYER_CONTROL_CAMERA,
+#ifndef GTA_PS2
 	COMMAND_SET_OBJECT_ROTATION,
 	COMMAND_GET_DEBUG_CAMERA_COORDINATES,
 	COMMAND_GET_DEBUG_CAMERA_FRONT_VECTOR,
@@ -1127,7 +1128,7 @@ enum {
 	COMMAND_GET_DEBUG_CAMERA_POINT_AT,
 	COMMAND_ATTACH_CHAR_TO_CAR,
 	COMMAND_DETACH_CHAR_FROM_CAR,
-	COMMAND_SET_CAR_STAY_IN_FAST_LANE,
+	COMMAND_SET_CAR_CHANGE_LANE,
 	COMMAND_CLEAR_CHAR_LAST_WEAPON_DAMAGE,
 	COMMAND_CLEAR_CAR_LAST_WEAPON_DAMAGE,
 	COMMAND_GET_RANDOM_COP_IN_AREA,
@@ -1144,7 +1145,7 @@ enum {
 	COMMAND_LOCATE_CHAR_ANY_MEANS_OBJECT_3D,
 	COMMAND_LOCATE_CHAR_ON_FOOT_OBJECT_3D,
 	COMMAND_LOCATE_CHAR_IN_CAR_OBJECT_3D,
-	COMMAND_SET_CAR_TEMP_ACTION,
+	COMMAND_SET_CAR_HANDBRAKE_TURN_LEFT,
 	COMMAND_SET_CAR_HANDBRAKE_TURN_RIGHT,
 	COMMAND_SET_CAR_HANDBRAKE_STOP,
 	COMMAND_IS_CHAR_ON_ANY_BIKE,
@@ -1155,4 +1156,5 @@ enum {
 	COMMAND_IS_CHAR_LYING_DOWN,
 	COMMAND_CAN_CHAR_SEE_DEAD_CHAR,
 	COMMAND_SET_ENTER_CAR_RANGE_MULTIPLIER,
+#endif
 };