summaryrefslogtreecommitdiffstats
path: root/src/control
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-04-17 15:31:11 +0200
committerSergeanur <s.anureev@yandex.ua>2020-04-17 15:31:11 +0200
commit599164006a9e7eb7328fc194c9bae1acbb2c887d (patch)
treec4dc5a5e2bf370e74ffc8ab4b9220ea6e066e952 /src/control
parentMerge remote-tracking branch 'samler/world' into Standalone (diff)
downloadre3-599164006a9e7eb7328fc194c9bae1acbb2c887d.tar
re3-599164006a9e7eb7328fc194c9bae1acbb2c887d.tar.gz
re3-599164006a9e7eb7328fc194c9bae1acbb2c887d.tar.bz2
re3-599164006a9e7eb7328fc194c9bae1acbb2c887d.tar.lz
re3-599164006a9e7eb7328fc194c9bae1acbb2c887d.tar.xz
re3-599164006a9e7eb7328fc194c9bae1acbb2c887d.tar.zst
re3-599164006a9e7eb7328fc194c9bae1acbb2c887d.zip
Diffstat (limited to 'src/control')
-rw-r--r--src/control/AutoPilot.cpp2
-rw-r--r--src/control/Bridge.cpp10
-rw-r--r--src/control/CarAI.cpp5
-rw-r--r--src/control/CarCtrl.cpp19
-rw-r--r--src/control/Curves.cpp2
-rw-r--r--src/control/Darkel.cpp18
-rw-r--r--src/control/GameLogic.cpp10
-rw-r--r--src/control/Garages.cpp9
-rw-r--r--src/control/OnscreenTimer.cpp17
-rw-r--r--src/control/PathFind.cpp47
-rw-r--r--src/control/Phones.cpp19
-rw-r--r--src/control/Pickups.cpp46
-rw-r--r--src/control/Record.cpp2
-rw-r--r--src/control/Remote.cpp7
-rw-r--r--src/control/Replay.cpp15
-rw-r--r--src/control/Restart.cpp15
-rw-r--r--src/control/RoadBlocks.cpp8
-rw-r--r--src/control/SceneEdit.cpp2
-rw-r--r--src/control/Script.cpp16
-rw-r--r--src/control/TrafficLights.cpp8
20 files changed, 20 insertions, 257 deletions
diff --git a/src/control/AutoPilot.cpp b/src/control/AutoPilot.cpp
index 65e73e5d..3fc9b154 100644
--- a/src/control/AutoPilot.cpp
+++ b/src/control/AutoPilot.cpp
@@ -1,5 +1,5 @@
#include "common.h"
-#include "patcher.h"
+
#include "AutoPilot.h"
#include "CarCtrl.h"
diff --git a/src/control/Bridge.cpp b/src/control/Bridge.cpp
index 53cf6af2..8514ef9e 100644
--- a/src/control/Bridge.cpp
+++ b/src/control/Bridge.cpp
@@ -1,5 +1,5 @@
#include "common.h"
-#include "patcher.h"
+
#include "Bridge.h"
#include "Pools.h"
#include "ModelIndices.h"
@@ -144,11 +144,3 @@ bool CBridge::ThisIsABridgeObjectMovingUp(int index)
return State == STATE_LIFT_PART_ABOUT_TO_MOVE_UP || State == STATE_LIFT_PART_MOVING_UP;
}
-
-STARTPATCHES
- InjectHook(0x413A30, &CBridge::Init, PATCH_JUMP);
- InjectHook(0x413AC0, &CBridge::Update, PATCH_JUMP);
- InjectHook(0x413D10, &CBridge::ShouldLightsBeFlashing, PATCH_JUMP);
- InjectHook(0x413D20, &CBridge::FindBridgeEntities, PATCH_JUMP);
- InjectHook(0x413DE0, &CBridge::ThisIsABridgeObjectMovingUp, PATCH_JUMP);
-ENDPATCHES
diff --git a/src/control/CarAI.cpp b/src/control/CarAI.cpp
index f48e4c78..7c9a1ad4 100644
--- a/src/control/CarAI.cpp
+++ b/src/control/CarAI.cpp
@@ -1,5 +1,5 @@
#include "common.h"
-#include "patcher.h"
+
#include "CarAI.h"
#include "Accident.h"
@@ -636,6 +636,3 @@ void CCarAI::MakeWayForCarWithSiren(CVehicle *pVehicle)
}
}
}
-
-STARTPATCHES
-ENDPATCHES
diff --git a/src/control/CarCtrl.cpp b/src/control/CarCtrl.cpp
index 6e47670d..827c97e7 100644
--- a/src/control/CarCtrl.cpp
+++ b/src/control/CarCtrl.cpp
@@ -1,5 +1,5 @@
#include "common.h"
-#include "patcher.h"
+
#include "CarCtrl.h"
#include "Accident.h"
@@ -2736,20 +2736,3 @@ bool CCarCtrl::MapCouldMoveInThisArea(float x, float y)
return x > -342.0f && x < -219.0f &&
y > -677.0f && y < -580.0f;
}
-
-STARTPATCHES
-InjectHook(0x416580, &CCarCtrl::GenerateRandomCars, PATCH_JUMP);
-InjectHook(0x417EC0, &CCarCtrl::ChooseModel, PATCH_JUMP);
-InjectHook(0x418320, &CCarCtrl::RemoveDistantCars, PATCH_JUMP);
-InjectHook(0x418430, &CCarCtrl::PossiblyRemoveVehicle, PATCH_JUMP);
-InjectHook(0x41D280, &CCarCtrl::Init, PATCH_JUMP);
-InjectHook(0x41D3B0, &CCarCtrl::ReInit, PATCH_JUMP);
-InjectHook(0x41E250, &CCarCtrl::SteerAIBoatWithPhysics, PATCH_JUMP);
-InjectHook(0x41F6E0, &CCarCtrl::RegisterVehicleOfInterest, PATCH_JUMP);
-InjectHook(0x41F780, &CCarCtrl::IsThisVehicleInteresting, PATCH_JUMP);
-InjectHook(0x41F7A0, &CCarCtrl::RemoveFromInterestingVehicleList, PATCH_JUMP);
-InjectHook(0x41F7D0, &CCarCtrl::ClearInterestingVehicleList, PATCH_JUMP);
-InjectHook(0x41F7F0, &CCarCtrl::SwitchVehicleToRealPhysics, PATCH_JUMP);
-InjectHook(0x41F820, &CCarCtrl::JoinCarWithRoadSystem, PATCH_JUMP);
-InjectHook(0x41FA00, &CCarCtrl::JoinCarWithRoadSystemGotoCoors, PATCH_JUMP);
-ENDPATCHES
diff --git a/src/control/Curves.cpp b/src/control/Curves.cpp
index 5c6ef06d..623ab040 100644
--- a/src/control/Curves.cpp
+++ b/src/control/Curves.cpp
@@ -1,5 +1,5 @@
#include "common.h"
-#include "patcher.h"
+
#include "Curves.h"
float CCurves::CalcSpeedScaleFactor(CVector* pPoint1, CVector* pPoint2, float dir1X, float dir1Y, float dir2X, float dir2Y)
diff --git a/src/control/Darkel.cpp b/src/control/Darkel.cpp
index 3265d1c2..e81d4112 100644
--- a/src/control/Darkel.cpp
+++ b/src/control/Darkel.cpp
@@ -1,5 +1,5 @@
#include "common.h"
-#include "patcher.h"
+
#include "main.h"
#include "Darkel.h"
#include "PlayerPed.h"
@@ -371,19 +371,3 @@ CDarkel::Update()
DMAudio.PlayFrontEndSound(SOUND_RAMPAGE_PASSED, 0);
}
}
-
-STARTPATCHES
- InjectHook(0x421380, CDarkel::CalcFade, PATCH_JUMP);
- InjectHook(0x420650, CDarkel::Init, PATCH_JUMP);
- InjectHook(0x420660, CDarkel::Update, PATCH_JUMP);
- InjectHook(0x420E60, CDarkel::FrenzyOnGoing, PATCH_JUMP);
- InjectHook(0x420E50, CDarkel::ReadStatus, PATCH_JUMP);
- InjectHook(0x420E70, CDarkel::ResetOnPlayerDeath, PATCH_JUMP);
- InjectHook(0x4210E0, CDarkel::StartFrenzy, PATCH_JUMP);
- InjectHook(0x421370, CDarkel::QueryModelsKilledByPlayer, PATCH_JUMP);
- InjectHook(0x421060, CDarkel::RegisterKillNotByPlayer, PATCH_JUMP);
- InjectHook(0x421310, CDarkel::ResetModelsKilledByPlayer, PATCH_JUMP);
- InjectHook(0x420920, CDarkel::DrawMessages, PATCH_JUMP);
- InjectHook(0x421070, CDarkel::RegisterCarBlownUpByPlayer, PATCH_JUMP);
- InjectHook(0x420F60, CDarkel::RegisterKillByPlayer, PATCH_JUMP);
-ENDPATCHES \ No newline at end of file
diff --git a/src/control/GameLogic.cpp b/src/control/GameLogic.cpp
index 0cfaac17..e7f642fe 100644
--- a/src/control/GameLogic.cpp
+++ b/src/control/GameLogic.cpp
@@ -1,5 +1,5 @@
#include "common.h"
-#include "patcher.h"
+
#include "GameLogic.h"
#include "Clock.h"
#include "Stats.h"
@@ -284,11 +284,3 @@ CGameLogic::RestorePlayerStuffDuringResurrection(CPlayerPed *pPlayerPed, CVector
CWorld::Remove(pPlayerPed);
CWorld::Add(pPlayerPed);
}
-
-STARTPATCHES
- InjectHook(0x4213F0, &CGameLogic::InitAtStartOfGame, PATCH_JUMP);
- InjectHook(0x421C00, &CGameLogic::PassTime, PATCH_JUMP);
- InjectHook(0x421A20, &CGameLogic::SortOutStreamingAndMemory, PATCH_JUMP);
- InjectHook(0x421400, &CGameLogic::Update, PATCH_JUMP);
- InjectHook(0x421A60, &CGameLogic::RestorePlayerStuffDuringResurrection, PATCH_JUMP);
-ENDPATCHES \ No newline at end of file
diff --git a/src/control/Garages.cpp b/src/control/Garages.cpp
index cca8c3b8..1ee8f99c 100644
--- a/src/control/Garages.cpp
+++ b/src/control/Garages.cpp
@@ -1,5 +1,5 @@
#include "common.h"
-#include "patcher.h"
+
#include "Garages.h"
#include "main.h"
@@ -2357,10 +2357,3 @@ CGarages::IsModelIndexADoor(uint32 id)
id == MI_CRUSHERBODY ||
id == MI_CRUSHERLID;
}
-
-
-STARTPATCHES
- InjectHook(0x427AB0, CGarages::IsPointInAGarageCameraZone, PATCH_JUMP); // CCamera::CamControl
- InjectHook(0x427BC0, CGarages::CameraShouldBeOutside, PATCH_JUMP); // CCamera::CamControl
- InjectHook(0x428940, CGarages::Load, PATCH_JUMP); // GenericLoad
-ENDPATCHES
diff --git a/src/control/OnscreenTimer.cpp b/src/control/OnscreenTimer.cpp
index 5406522c..d128efeb 100644
--- a/src/control/OnscreenTimer.cpp
+++ b/src/control/OnscreenTimer.cpp
@@ -1,5 +1,5 @@
#include "common.h"
-#include "patcher.h"
+
#include "DMAudio.h"
#include "Hud.h"
@@ -153,18 +153,3 @@ void COnscreenTimerEntry::ProcessForDisplayCounter() {
uint32 counter = *CTheScripts::GetPointerToScriptVariable(m_nCounterOffset);
sprintf(m_bCounterBuffer, "%d", counter);
}
-
-STARTPATCHES
- InjectHook(0x429160, &COnscreenTimerEntry::Process, PATCH_JUMP);
- InjectHook(0x429110, &COnscreenTimerEntry::ProcessForDisplay, PATCH_JUMP);
- InjectHook(0x429080, &COnscreenTimerEntry::ProcessForDisplayClock, PATCH_JUMP);
- InjectHook(0x4290F0, &COnscreenTimerEntry::ProcessForDisplayCounter, PATCH_JUMP);
-
- InjectHook(0x429220, &COnscreenTimer::Init, PATCH_JUMP);
- InjectHook(0x429320, &COnscreenTimer::Process, PATCH_JUMP);
- InjectHook(0x4292E0, &COnscreenTimer::ProcessForDisplay, PATCH_JUMP);
- InjectHook(0x429450, &COnscreenTimer::ClearCounter, PATCH_JUMP);
- InjectHook(0x429410, &COnscreenTimer::ClearClock, PATCH_JUMP);
- InjectHook(0x4293B0, &COnscreenTimer::AddCounter, PATCH_JUMP);
- InjectHook(0x429350, &COnscreenTimer::AddClock, PATCH_JUMP);
-ENDPATCHES \ No newline at end of file
diff --git a/src/control/PathFind.cpp b/src/control/PathFind.cpp
index d9594490..9d0959a8 100644
--- a/src/control/PathFind.cpp
+++ b/src/control/PathFind.cpp
@@ -1,5 +1,5 @@
#include "common.h"
-#include "patcher.h"
+
#include "General.h"
#include "FileMgr.h" // only needed for empty function
#include "Camera.h"
@@ -1766,48 +1766,3 @@ CPathFind::DisplayPathData(void)
}
}
}
-
-STARTPATCHES
- InjectHook(0x42E680, &CPedPath::CalcPedRoute, PATCH_JUMP);
- InjectHook(0x42F100, &CPedPath::AddNodeToPathList, PATCH_JUMP);
- InjectHook(0x42F140, &CPedPath::RemoveNodeFromList, PATCH_JUMP);
- InjectHook(0x42F160, &CPedPath::AddNodeToList, PATCH_JUMP);
- InjectHook(0x42F1A0, &CPedPath::AddBlockade, PATCH_JUMP);
- InjectHook(0x42F420, &CPedPath::AddBlockadeSectorList, PATCH_JUMP);
-
- InjectHook(0x4294A0, &CPathFind::Init, PATCH_JUMP);
- InjectHook(0x42D580, &CPathFind::AllocatePathFindInfoMem, PATCH_JUMP);
- InjectHook(0x429540, &CPathFind::RegisterMapObject, PATCH_JUMP);
- InjectHook(0x42D7E0, &CPathFind::StoreNodeInfoPed, PATCH_JUMP);
- InjectHook(0x42D690, &CPathFind::StoreNodeInfoCar, PATCH_JUMP);
- InjectHook(0x429610, &CPathFind::PreparePathData, PATCH_JUMP);
- InjectHook(0x42B810, &CPathFind::CountFloodFillGroups, PATCH_JUMP);
- InjectHook(0x429C20, &CPathFind::PreparePathDataForType, PATCH_JUMP);
-
- InjectHook(0x42C990, &CPathFind::CalcRoadDensity, PATCH_JUMP);
- InjectHook(0x42E1B0, &CPathFind::TestForPedTrafficLight, PATCH_JUMP);
- InjectHook(0x42E340, &CPathFind::TestCrossesRoad, PATCH_JUMP);
- InjectHook(0x42CBE0, &CPathFind::AddNodeToList, PATCH_JUMP);
- InjectHook(0x42CBB0, &CPathFind::RemoveNodeFromList, PATCH_JUMP);
- InjectHook(0x42B790, &CPathFind::RemoveBadStartNode, PATCH_JUMP);
- InjectHook(0x42E3B0, &CPathFind::SetLinksBridgeLights, PATCH_JUMP);
- InjectHook(0x42DED0, &CPathFind::SwitchOffNodeAndNeighbours, PATCH_JUMP);
- InjectHook(0x42D960, &CPathFind::SwitchRoadsOffInArea, PATCH_JUMP);
- InjectHook(0x42DA50, &CPathFind::SwitchPedRoadsOffInArea, PATCH_JUMP);
- InjectHook(0x42DB50, &CPathFind::SwitchRoadsInAngledArea, PATCH_JUMP);
- InjectHook(0x42E140, &CPathFind::MarkRoadsBetweenLevelsNodeAndNeighbours, PATCH_JUMP);
- InjectHook(0x42DF50, &CPathFind::MarkRoadsBetweenLevelsInArea, 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);
- InjectHook(0x42D060, &CPathFind::FindNodeOrientationForCarPlacementFacingDestination, PATCH_JUMP);
- InjectHook(0x42BF10, &CPathFind::NewGenerateCarCreationCoors, PATCH_JUMP);
- InjectHook(0x42C1E0, &CPathFind::GeneratePedCreationCoors, PATCH_JUMP);
- InjectHook(0x42D2A0, &CPathFind::FindRoadObjectClosestToCoors, PATCH_JUMP);
- InjectHook(0x42B9F0, &CPathFind::FindNextNodeWandering, PATCH_JUMP);
- InjectHook(0x42B040, &CPathFind::DoPathSearch, PATCH_JUMP);
- InjectHook(0x42C8C0, &CPathFind::TestCoorsCloseness, PATCH_JUMP);
- InjectHook(0x42E450, &CPathFind::Save, PATCH_JUMP);
- InjectHook(0x42E550, &CPathFind::Load, PATCH_JUMP);
-ENDPATCHES
diff --git a/src/control/Phones.cpp b/src/control/Phones.cpp
index 90939f0e..7fdc81c5 100644
--- a/src/control/Phones.cpp
+++ b/src/control/Phones.cpp
@@ -1,5 +1,5 @@
#include "common.h"
-#include "patcher.h"
+
#include "Phones.h"
#include "Pools.h"
#include "ModelIndices.h"
@@ -377,20 +377,3 @@ PhonePickUpCB(CAnimBlendAssociation *assoc, void *arg)
CPhoneInfo::pCallBackPed = nil;
}
-
-STARTPATCHES
- InjectHook(0x42F720, &CPhoneInfo::FindNearestFreePhone, PATCH_JUMP);
- InjectHook(0x42FD50, &CPhoneInfo::PhoneAtThisPosition, PATCH_JUMP);
- InjectHook(0x42FFF0, &CPhoneInfo::HasMessageBeenDisplayed, PATCH_JUMP);
- InjectHook(0x430030, &CPhoneInfo::IsMessageBeingDisplayed, PATCH_JUMP);
- InjectHook(0x430120, &CPhoneInfo::Load, PATCH_JUMP);
- InjectHook(0x42FF90, &CPhoneInfo::SetPhoneMessage_JustOnce, PATCH_JUMP);
- InjectHook(0x42FF30, &CPhoneInfo::SetPhoneMessage_Repeatedly, PATCH_JUMP);
- InjectHook(0x430060, &CPhoneInfo::Save, PATCH_JUMP);
- InjectHook(0x42F710, &CPhoneInfo::Shutdown, PATCH_JUMP);
- InjectHook(0x42F640, &CPhoneInfo::Initialise, PATCH_JUMP);
- InjectHook(0x42FDB0, &CPhoneInfo::GrabPhone, PATCH_JUMP);
- InjectHook(0x42F7A0, &CPhoneInfo::Update, PATCH_JUMP);
- InjectHook(0x42F570, &PhonePutDownCB, PATCH_JUMP);
- InjectHook(0x42F470, &PhonePickUpCB, PATCH_JUMP);
-ENDPATCHES \ No newline at end of file
diff --git a/src/control/Pickups.cpp b/src/control/Pickups.cpp
index d52c386c..9836c9c2 100644
--- a/src/control/Pickups.cpp
+++ b/src/control/Pickups.cpp
@@ -1,5 +1,5 @@
#include "common.h"
-#include "patcher.h"
+
#include "main.h"
#include "Camera.h"
@@ -1406,47 +1406,3 @@ CPacManPickups::ResetPowerPillsCarriedByPlayer()
FindPlayerVehicle()->m_fForceMultiplier = 1.0f;
}
}
-
-STARTPATCHES
- InjectHook(0x430220, CPickups::Init, PATCH_JUMP);
- InjectHook(0x4303D0, CPickups::Update, PATCH_JUMP);
- InjectHook(0x432440, CPickups::RenderPickUpText, PATCH_JUMP);
- InjectHook(0x431C30, CPickups::DoCollectableEffects, PATCH_JUMP);
- InjectHook(0x431F40, CPickups::DoMoneyEffects, PATCH_JUMP);
- InjectHook(0x4321C0, CPickups::DoMineEffects, PATCH_JUMP);
- InjectHook(0x431520, CPickups::DoPickUpEffects, PATCH_JUMP);
- InjectHook(0x4304B0, CPickups::GenerateNewOne, PATCH_JUMP);
- InjectHook(0x430660, CPickups::GenerateNewOne_WeaponType, PATCH_JUMP);
- InjectHook(0x4307A0, CPickups::RemovePickUp, PATCH_JUMP);
- InjectHook(0x430800, CPickups::RemoveAllFloatingPickups, PATCH_JUMP);
- InjectHook(0x433D60, CPickups::AddToCollectedPickupsArray, PATCH_JUMP);
- InjectHook(0x430770, CPickups::IsPickUpPickedUp, PATCH_JUMP);
- InjectHook(0x430690, CPickups::ModelForWeapon, PATCH_JUMP);
- InjectHook(0x4306F0, CPickups::WeaponForModel, PATCH_JUMP);
- InjectHook(0x431510, CPickups::FindColourIndexForWeaponMI, PATCH_JUMP);/**/
- InjectHook(0x433DF0, CPickups::GetActualPickupIndex, PATCH_JUMP);
- InjectHook(0x433DB0, CPickups::GetNewUniquePickupIndex, PATCH_JUMP);
- InjectHook(0x433B60, CPickups::PassTime, PATCH_JUMP);
- InjectHook(0x4339F0, CPickups::GivePlayerGoodiesWithPickUpMI, PATCH_JUMP);
- InjectHook(0x433F60, CPickups::Load, PATCH_JUMP);
- InjectHook(0x433E40, CPickups::Save, PATCH_JUMP);
- InjectHook(0x433BA0, &CPickup::GiveUsAPickUpObject, PATCH_JUMP);
- InjectHook(0x430860, &CPickup::Update, PATCH_JUMP);
- InjectHook(0x4331B0, &CPacManPickup::Update, PATCH_JUMP);
- InjectHook(0x432760, CPacManPickups::Init, PATCH_JUMP);
- InjectHook(0x432800, CPacManPickups::Update, PATCH_JUMP);
- InjectHook(0x432AE0, CPacManPickups::GeneratePMPickUps, PATCH_JUMP);
- InjectHook(0x432D50, CPacManPickups::GeneratePMPickUpsForRace, PATCH_JUMP);
- InjectHook(0x432F20, CPacManPickups::GenerateOnePMPickUp, PATCH_JUMP);
- InjectHook(0x432F60, CPacManPickups::Render, PATCH_JUMP);
- InjectHook(0x433150, CPacManPickups::ClearPMPickUps, PATCH_JUMP);
- InjectHook(0x433340, CPacManPickups::StartPacManRace, PATCH_JUMP);
- InjectHook(0x433360, CPacManPickups::StartPacManRecord, PATCH_JUMP);
- InjectHook(0x4333A0, CPacManPickups::QueryPowerPillsEatenInRace, PATCH_JUMP);
- InjectHook(0x4333B0, CPacManPickups::ResetPowerPillsEatenInRace, PATCH_JUMP);
- InjectHook(0x4333C0, CPacManPickups::CleanUpPacManStuff, PATCH_JUMP);
- InjectHook(0x4333D0, CPacManPickups::StartPacManScramble, PATCH_JUMP);
- InjectHook(0x4333F0, CPacManPickups::QueryPowerPillsCarriedByPlayer, PATCH_JUMP);
- InjectHook(0x433410, CPacManPickups::ResetPowerPillsCarriedByPlayer, PATCH_JUMP);
-
-ENDPATCHES
diff --git a/src/control/Record.cpp b/src/control/Record.cpp
index 08e3c5b9..6687cbff 100644
--- a/src/control/Record.cpp
+++ b/src/control/Record.cpp
@@ -1,5 +1,5 @@
#include "common.h"
-#include "patcher.h"
+
#include "Record.h"
#include "FileMgr.h"
diff --git a/src/control/Remote.cpp b/src/control/Remote.cpp
index f7d12702..9c749bd9 100644
--- a/src/control/Remote.cpp
+++ b/src/control/Remote.cpp
@@ -1,5 +1,5 @@
#include "common.h"
-#include "patcher.h"
+
#include "Automobile.h"
#include "CarCtrl.h"
#include "Camera.h"
@@ -49,8 +49,3 @@ CRemote::TakeRemoteControlledCarFromPlayer(void)
CWorld::Players[CWorld::PlayerInFocus].m_bInRemoteMode = true;
CWorld::Players[CWorld::PlayerInFocus].m_pRemoteVehicle->bRemoveFromWorld = true;
}
-
-STARTPATCHES
- InjectHook(0x435C30, &CRemote::GivePlayerRemoteControlledCar, PATCH_JUMP);
- InjectHook(0x435DA0, &CRemote::TakeRemoteControlledCarFromPlayer, PATCH_JUMP);
-ENDPATCHES \ No newline at end of file
diff --git a/src/control/Replay.cpp b/src/control/Replay.cpp
index 0570f9a8..c67e7cbf 100644
--- a/src/control/Replay.cpp
+++ b/src/control/Replay.cpp
@@ -1,5 +1,5 @@
#include "common.h"
-#include "patcher.h"
+
#include "AnimBlendAssociation.h"
#include "Boat.h"
#include "SpecialFX.h"
@@ -1570,16 +1570,3 @@ void CReplay::Display()
if (Mode == MODE_PLAYBACK)
CFont::PrintString(SCREEN_SCALE_X(63.5f), SCREEN_SCALE_Y(30.0f), TheText.Get("REPLAY"));
}
-
-STARTPATCHES
-InjectHook(0x592FE0, &CReplay::Init, PATCH_JUMP);
-InjectHook(0x593150, &CReplay::DisableReplays, PATCH_JUMP);
-InjectHook(0x593160, &CReplay::EnableReplays, PATCH_JUMP);
-InjectHook(0x593170, &CReplay::Update, PATCH_JUMP);
-InjectHook(0x595B20, &CReplay::FinishPlayback, PATCH_JUMP);
-InjectHook(0x595BD0, &CReplay::EmptyReplayBuffer, PATCH_JUMP);
-InjectHook(0x595EE0, &CReplay::Display, PATCH_JUMP);
-InjectHook(0x596030, &CReplay::TriggerPlayback, PATCH_JUMP);
-InjectHook(0x597560, &CReplay::StreamAllNecessaryCarsAndPeds, PATCH_JUMP);
-InjectHook(0x597680, &CReplay::ShouldStandardCameraBeProcessed, PATCH_JUMP);
-ENDPATCHES
diff --git a/src/control/Restart.cpp b/src/control/Restart.cpp
index 2730f5c0..2a31f8f1 100644
--- a/src/control/Restart.cpp
+++ b/src/control/Restart.cpp
@@ -1,5 +1,5 @@
#include "common.h"
-#include "patcher.h"
+
#include "Restart.h"
#include "Zones.h"
#include "PathFind.h"
@@ -247,16 +247,3 @@ INITSAVEBUF
WriteSaveBuf(buf, OverridePoliceStationLevel);
VALIDATESAVEBUF(*size);
}
-
-
-STARTPATCHES
- InjectHook(0x435E20, &CRestart::Initialise, PATCH_JUMP);
- InjectHook(0x436100, &CRestart::AddHospitalRestartPoint, PATCH_JUMP);
- InjectHook(0x436150, &CRestart::AddPoliceRestartPoint, PATCH_JUMP);
- InjectHook(0x4366C0, &CRestart::OverrideNextRestart, PATCH_JUMP);
- InjectHook(0x4366F0, &CRestart::CancelOverrideRestart, PATCH_JUMP);
- InjectHook(0x4361A0, &CRestart::FindClosestHospitalRestartPoint, PATCH_JUMP);
- InjectHook(0x436450, &CRestart::FindClosestPoliceRestartPoint, PATCH_JUMP);
- InjectHook(0x436B20, &CRestart::LoadAllRestartPoints, PATCH_JUMP);
- InjectHook(0x436700, &CRestart::SaveAllRestartPoints, PATCH_JUMP);
-ENDPATCHES \ No newline at end of file
diff --git a/src/control/RoadBlocks.cpp b/src/control/RoadBlocks.cpp
index fcfa42e3..7fb0c211 100644
--- a/src/control/RoadBlocks.cpp
+++ b/src/control/RoadBlocks.cpp
@@ -1,5 +1,5 @@
#include "common.h"
-#include "patcher.h"
+
#include "RoadBlocks.h"
#include "PathFind.h"
#include "ModelIndices.h"
@@ -195,9 +195,3 @@ CRoadBlocks::GenerateRoadBlocks(void)
}
}
}
-
-STARTPATCHES
- InjectHook(0x436F50, &CRoadBlocks::Init, PATCH_JUMP);
- InjectHook(0x4376A0, &CRoadBlocks::GenerateRoadBlockCopsForCar, PATCH_JUMP);
- InjectHook(0x436FA0, &CRoadBlocks::GenerateRoadBlocks, PATCH_JUMP);
-ENDPATCHES \ No newline at end of file
diff --git a/src/control/SceneEdit.cpp b/src/control/SceneEdit.cpp
index 8d804e4d..571b526a 100644
--- a/src/control/SceneEdit.cpp
+++ b/src/control/SceneEdit.cpp
@@ -1,5 +1,5 @@
#include "common.h"
-#include "patcher.h"
+
#include "SceneEdit.h"
#include "Automobile.h"
diff --git a/src/control/Script.cpp b/src/control/Script.cpp
index d4ede846..6a8028a2 100644
--- a/src/control/Script.cpp
+++ b/src/control/Script.cpp
@@ -1,6 +1,6 @@
#define WITHWINDOWS // for our script loading hack
#include "common.h"
-#include "patcher.h"
+
#include "Script.h"
#include "ScriptCommands.h"
@@ -11626,17 +11626,3 @@ void CTheScripts::ReadMultiScriptFileOffsetsFromScript()
MultiScriptArray[i] = Read4BytesFromScript(&ip);
}
}
-
-STARTPATCHES
-InjectHook(0x438790, &CTheScripts::Init, PATCH_JUMP);
-InjectHook(0x439040, &CTheScripts::Process, PATCH_JUMP);
-InjectHook(0x439400, &CTheScripts::StartTestScript, PATCH_JUMP);
-InjectHook(0x439410, &CTheScripts::IsPlayerOnAMission, PATCH_JUMP);
-InjectHook(0x44FD10, &CTheScripts::UndoBuildingSwaps, PATCH_JUMP);
-InjectHook(0x44FD60, &CTheScripts::UndoEntityInvisibilitySettings, PATCH_JUMP);
-InjectHook(0x4534E0, &CTheScripts::ScriptDebugLine3D, PATCH_JUMP);
-InjectHook(0x453550, &CTheScripts::RenderTheScriptDebugLines, PATCH_JUMP);
-InjectHook(0x4535E0, &CTheScripts::SaveAllScripts, PATCH_JUMP);
-InjectHook(0x453B30, &CTheScripts::LoadAllScripts, PATCH_JUMP);
-InjectHook(0x454060, &CTheScripts::ClearSpaceForMissionEntity, PATCH_JUMP);
-ENDPATCHES
diff --git a/src/control/TrafficLights.cpp b/src/control/TrafficLights.cpp
index ab9cd92d..096bb484 100644
--- a/src/control/TrafficLights.cpp
+++ b/src/control/TrafficLights.cpp
@@ -1,5 +1,5 @@
#include "common.h"
-#include "patcher.h"
+
#include "General.h"
#include "Camera.h"
#include "World.h"
@@ -327,9 +327,3 @@ CTrafficLights::LightForCars2(void)
else
return CAR_LIGHTS_RED;
}
-
-STARTPATCHES
- InjectHook(0x455760, &CTrafficLights::LightForCars1, PATCH_JUMP);
- InjectHook(0x455790, &CTrafficLights::LightForCars2, PATCH_JUMP);
- InjectHook(0x4557D0, &CTrafficLights::LightForPeds, PATCH_JUMP);
-ENDPATCHES