12 files changed, 12 insertions, 404 deletions

diff --git a/src/peds/CivilianPed.cpp b/src/peds/CivilianPed.cpp
index a9e0580e..f38f5a73 100644
--- a/src/peds/CivilianPed.cpp
+++ b/src/peds/CivilianPed.cpp
@@ -1,5 +1,5 @@
 #include "common.h"
-#include "patcher.h"
+
 #include "CivilianPed.h"
 #include "Phones.h"
 #include "General.h"
@@ -376,21 +376,3 @@ CCivilianPed::ProcessControl(void)
 	if (m_moved.Magnitude() > 0.0f)
 		Avoid();
 }
-
-#include <new>
-
-class CCivilianPed_ : public CCivilianPed
-{
-public:
-	CCivilianPed *ctor(ePedType pedtype, uint32 mi) { return ::new (this) CCivilianPed(pedtype, mi); };
-	void dtor(void) { CCivilianPed::~CCivilianPed(); }
-	void ProcessControl_(void) { CCivilianPed::ProcessControl(); }
-};
-
-STARTPATCHES
-	InjectHook(0x4BFF30, &CCivilianPed_::ctor, PATCH_JUMP);
-	InjectHook(0x4BFFC0, &CCivilianPed_::dtor, PATCH_JUMP);
-	InjectHook(0x4BFFE0, &CCivilianPed_::ProcessControl_, PATCH_JUMP);
-
-	InjectHook(0x4C07A0, &CCivilianPed::CivilianAI, PATCH_JUMP);
-ENDPATCHES
diff --git a/src/peds/CopPed.cpp b/src/peds/CopPed.cpp
index b5812136..e62743de 100644
--- a/src/peds/CopPed.cpp
+++ b/src/peds/CopPed.cpp
@@ -1,5 +1,5 @@
 #include "common.h"
-#include "patcher.h"
+
 #include "World.h"
 #include "PlayerPed.h"
 #include "CopPed.h"
@@ -736,25 +736,3 @@ CCopPed::ProcessControl(void)
 		SetAttack(m_pedInObjective);
 	}
 }
-
-#include <new>
-
-class CCopPed_ : public CCopPed
-{
-public:
-	CCopPed *ctor(eCopType type) { return ::new (this) CCopPed(type); };
-	void dtor(void) { CCopPed::~CCopPed(); }
-	void ProcessControl_(void) { CCopPed::ProcessControl(); }
-};
-
-STARTPATCHES
-	InjectHook(0x4C11B0, &CCopPed_::ctor, PATCH_JUMP);
-	InjectHook(0x4C13E0, &CCopPed_::dtor, PATCH_JUMP);
-	InjectHook(0x4C1400, &CCopPed_::ProcessControl_, PATCH_JUMP);
-	InjectHook(0x4C28C0, &CCopPed::ClearPursuit, PATCH_JUMP);
-	InjectHook(0x4C2B00, &CCopPed::SetArrestPlayer, PATCH_JUMP);
-	InjectHook(0x4C27D0, &CCopPed::SetPursuit, PATCH_JUMP);
-	InjectHook(0x4C2C90, &CCopPed::ArrestPlayer, PATCH_JUMP);
-	InjectHook(0x4C26A0, &CCopPed::ScanForCrimes, PATCH_JUMP);
-	InjectHook(0x4C1B50, &CCopPed::CopAI, PATCH_JUMP);
-ENDPATCHES
diff --git a/src/peds/EmergencyPed.cpp b/src/peds/EmergencyPed.cpp
index 3a5067e7..7229ed3f 100644
--- a/src/peds/EmergencyPed.cpp
+++ b/src/peds/EmergencyPed.cpp
@@ -1,5 +1,5 @@
 #include "common.h"
-#include "patcher.h"
+
 #include "EmergencyPed.h"
 #include "DMAudio.h"
 #include "ModelIndices.h"
@@ -413,20 +413,3 @@ CEmergencyPed::MedicAI(void)
 		}
 	}
 }
-
-#include <new>
-
-class CEmergencyPed_ : public CEmergencyPed
-{
-public:
-	CEmergencyPed* ctor(int pedtype) { return ::new (this) CEmergencyPed(pedtype); };
-	void dtor(void) { CEmergencyPed::~CEmergencyPed(); }
-	void ProcessControl_(void) { CEmergencyPed::ProcessControl(); }
-};
-
-STARTPATCHES
-	InjectHook(0x4C2E40, &CEmergencyPed_::ctor, PATCH_JUMP);
-	InjectHook(0x4C2EF0, &CEmergencyPed_::dtor, PATCH_JUMP);
-	InjectHook(0x4C2F10, &CEmergencyPed_::ProcessControl_, PATCH_JUMP);
-	InjectHook(0x4C3EC0, &CEmergencyPed::InRange, PATCH_JUMP);
-ENDPATCHES
diff --git a/src/peds/Gangs.cpp b/src/peds/Gangs.cpp
index c67fe599..8859e61e 100644
--- a/src/peds/Gangs.cpp
+++ b/src/peds/Gangs.cpp
@@ -1,5 +1,5 @@
 #include "common.h"
-#include "patcher.h"
+
 #include "ModelIndices.h"
 #include "Gangs.h"
 #include "Weapon.h"
@@ -75,13 +75,3 @@ INITSAVEBUF
 		Gang[i] = ReadSaveBuf<CGangInfo>(buf);
 VALIDATESAVEBUF(size);
 }
-
-STARTPATCHES
-	InjectHook(0x4C3FB0, CGangs::Initialise, PATCH_JUMP);
-	InjectHook(0x4C4010, CGangs::SetGangVehicleModel, PATCH_JUMP);
-	InjectHook(0x4C4030, CGangs::SetGangWeapons, PATCH_JUMP);
-	InjectHook(0x4C4050, CGangs::SetGangPedModelOverride, PATCH_JUMP);
-	InjectHook(0x4C4070, CGangs::GetGangPedModelOverride, PATCH_JUMP);
-	InjectHook(0x4C4080, CGangs::SaveAllGangData, PATCH_JUMP);
-	InjectHook(0x4C4100, CGangs::LoadAllGangData, PATCH_JUMP);
-ENDPATCHES
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp
index 8ea41230..4737051e 100644
--- a/src/peds/Ped.cpp
+++ b/src/peds/Ped.cpp
@@ -1,5 +1,5 @@
 #include "common.h"
-#include "patcher.h"
+
 #include "main.h"
 #include "Pools.h"
 #include "Particle.h"
@@ -17502,240 +17502,3 @@ CPed::SetExitBoat(CVehicle *boat)
 	// Not there in VC.
 	CWaterLevel::FreeBoatWakeArray();
 }
-
-#include <new>
-
-class CPed_ : public CPed
-{
-public:
-	CPed *ctor(uint32 pedType) { return ::new (this) CPed(pedType); }
-	void dtor(void) { CPed::~CPed(); }
-
-	void SetModelIndex_(uint32 mi) { CPed::SetModelIndex(mi); }
-	void FlagToDestroyWhenNextProcessed_(void) { CPed::FlagToDestroyWhenNextProcessed(); }
-	bool SetupLighting_(void) { return CPed::SetupLighting(); }
-	void RemoveLighting_(bool reset) { CPed::RemoveLighting(reset); }
-	void Teleport_(CVector pos) { CPed::Teleport(pos); }
-	void ProcessControl_(void) { CPed::ProcessControl(); }
-	void Render_(void) { CPed::Render(); }
-	void PreRender_(void) { CPed::PreRender(); }
-	int32 ProcessEntityCollision_(CEntity *collidingEnt, CColPoint *collidingPoints) { return CPed::ProcessEntityCollision(collidingEnt, collidingPoints); }
-	void SetMoveAnim_(void) { CPed::SetMoveAnim(); }
-};
-
-STARTPATCHES
-	InjectHook(0x4C41C0, &CPed_::ctor, PATCH_JUMP);
-	InjectHook(0x4C50D0, &CPed_::dtor, PATCH_JUMP);
-	InjectHook(0x4C52A0, &CPed_::SetModelIndex_, PATCH_JUMP);
-	InjectHook(0x4D6570, &CPed_::FlagToDestroyWhenNextProcessed_, PATCH_JUMP);
-	InjectHook(0x4A7D30, &CPed_::SetupLighting_, PATCH_JUMP);
-	InjectHook(0x4A7DC0, &CPed_::RemoveLighting_, PATCH_JUMP);
-	InjectHook(0x4D3E70, &CPed_::Teleport_, PATCH_JUMP);
-	InjectHook(0x4C8910, &CPed_::ProcessControl_, PATCH_JUMP);
-	InjectHook(0x4D03F0, &CPed_::Render_, PATCH_JUMP);
-	InjectHook(0x4CBB30, &CPed_::ProcessEntityCollision_, PATCH_JUMP);
-	InjectHook(0x4CFDD0, &CPed_::PreRender_, PATCH_JUMP);
-	InjectHook(0x4C5A40, &CPed_::SetMoveAnim_, PATCH_JUMP);
-
-	InjectHook(0x4CF8F0, &CPed::AddWeaponModel, PATCH_JUMP);
-	InjectHook(0x4C6AA0, &CPed::AimGun, PATCH_JUMP);
-	InjectHook(0x4EB470, &CPed::ApplyHeadShot, PATCH_JUMP);
-	InjectHook(0x4EAEE0, &CPed::RemoveBodyPart, PATCH_JUMP);
-	InjectHook(0x4C6460, (void (CPed::*)(CEntity*, bool)) &CPed::SetLookFlag, PATCH_JUMP);
-	InjectHook(0x4C63E0, (void (CPed::*)(float, bool)) &CPed::SetLookFlag, PATCH_JUMP);
-	InjectHook(0x4D12E0, &CPed::SetLookTimer, PATCH_JUMP);
-	InjectHook(0x4C5700, &CPed::OurPedCanSeeThisOne, PATCH_JUMP);
-	InjectHook(0x4D2BB0, &CPed::Avoid, PATCH_JUMP);
-	InjectHook(0x4C6A50, &CPed::ClearAimFlag, PATCH_JUMP);
-	InjectHook(0x4C64F0, &CPed::ClearLookFlag, PATCH_JUMP);
-	InjectHook(0x4EB670, &CPed::IsPedHeadAbovePos, PATCH_JUMP);
-	InjectHook(0x4E68A0, &CPed::FinishedAttackCB, PATCH_JUMP);
-	InjectHook(0x4E5BD0, &CheckForPedsOnGroundToAttack, PATCH_JUMP);
-	InjectHook(0x4E6BA0, &CPed::Attack, PATCH_JUMP);
-	InjectHook(0x4CF980, &CPed::RemoveWeaponModel, PATCH_JUMP);
-	InjectHook(0x4CFA60, &CPed::SetCurrentWeapon, PATCH_JUMP);
-	InjectHook(0x4E4A10, &CPed::Duck, PATCH_JUMP);
-	InjectHook(0x4E4A30, &CPed::ClearDuck, PATCH_JUMP);
-	InjectHook(0x4E6180, &CPed::ClearPointGunAt, PATCH_JUMP);
-	InjectHook(0x4E07D0, &CPed::BeingDraggedFromCar, PATCH_JUMP);
-	InjectHook(0x4CF000, &CPed::PedSetDraggedOutCarCB, PATCH_JUMP);
-	InjectHook(0x4C5D80, &CPed::RestartNonPartialAnims, PATCH_JUMP);
-	InjectHook(0x4E4730, &CPed::GetLocalPositionToOpenCarDoor, PATCH_JUMP);
-	InjectHook(0x4E4660, (CVector (*)(CVehicle*, uint32, float)) CPed::GetPositionToOpenCarDoor, PATCH_JUMP);
-	InjectHook(0x4E1A30, (CVector (*)(CVehicle*, uint32)) CPed::GetPositionToOpenCarDoor, PATCH_JUMP);
-	InjectHook(0x4DF940, &CPed::LineUpPedWithCar, PATCH_JUMP);
-	InjectHook(0x4CC6C0, &CPed::PlayFootSteps, PATCH_JUMP);
-	InjectHook(0x4C5350, &CPed::BuildPedLists, PATCH_JUMP);
-	InjectHook(0x4CF9B0, &CPed::GiveWeapon, PATCH_JUMP);
-	InjectHook(0x4C7EA0, &CPed::CalculateNewOrientation, PATCH_JUMP);
-	InjectHook(0x4C78F0, &CPed::WorkOutHeadingForMovingFirstPerson, PATCH_JUMP);
-	InjectHook(0x4C73F0, &CPed::CalculateNewVelocity, PATCH_JUMP);
-	InjectHook(0x4DD820, &CPed::CanSeeEntity, PATCH_JUMP);
-	InjectHook(0x4D9460, &CPed::RestorePreviousObjective, PATCH_JUMP);
-	InjectHook(0x4D82C0, (void (CPed::*)(eObjective)) &CPed::SetObjective, PATCH_JUMP);
-	InjectHook(0x4D83E0, (void (CPed::*)(eObjective, void*)) &CPed::SetObjective, PATCH_JUMP);
-	InjectHook(0x4D89A0, (void (CPed::*)(eObjective, int16, int16)) &CPed::SetObjective, PATCH_JUMP);
-	InjectHook(0x4D8A90, (void (CPed::*)(eObjective, CVector)) &CPed::SetObjective, PATCH_JUMP);
-	InjectHook(0x4D8770, (void (CPed::*)(eObjective, CVector, float)) &CPed::SetObjective, PATCH_JUMP);
-	InjectHook(0x4DDEC0, &CPed::ReactToAttack, PATCH_JUMP);
-	InjectHook(0x4D0600, &CPed::SetIdle, PATCH_JUMP);
-	InjectHook(0x4E0E00, &CPed::QuitEnteringCar, PATCH_JUMP);
-	InjectHook(0x4E4AD0, &CPed::InformMyGangOfAttack, PATCH_JUMP);
-	InjectHook(0x4D3C80, &CPed::ClearChat, PATCH_JUMP);
-	InjectHook(0x4D1390, &CPed::TurnBody, PATCH_JUMP);
-	InjectHook(0x4D3AC0, &CPed::Chat, PATCH_JUMP);
-	InjectHook(0x4D0490, &CPed::CheckAroundForPossibleCollisions, PATCH_JUMP);
-	InjectHook(0x4D3E20, &CPed::MakePhonecall, PATCH_JUMP);
-	InjectHook(0x4D3CC0, &CPed::FacePhone, PATCH_JUMP);
-	InjectHook(0x4D4860, &CPed::CheckForDeadPeds, PATCH_JUMP);
-	InjectHook(0x4D4650, &CPed::CheckForExplosions, PATCH_JUMP);
-	InjectHook(0x4D47D0, &CPed::CheckForGunShots, PATCH_JUMP);
-	InjectHook(0x4E6990, &CPed::CheckForPointBlankPeds, PATCH_JUMP);
-	InjectHook(0x4D0BE0, &CPed::CheckIfInTheAir, PATCH_JUMP);
-	InjectHook(0x4C7F20, &CPed::ClearAll, PATCH_JUMP);
-	InjectHook(0x4E6790, &CPed::ClearAttack, PATCH_JUMP);
-	InjectHook(0x4E67F0, &CPed::ClearAttackByRemovingAnim, PATCH_JUMP);
-	InjectHook(0x4D37D0, &CPed::SetDie, PATCH_JUMP);
-	InjectHook(0x4C5D50, &CPed::StopNonPartialAnims, PATCH_JUMP);
-	InjectHook(0x4C5DB0, &CPed::SetStoredState, PATCH_JUMP);
-	InjectHook(0x4EA420, &CPed::InflictDamage, PATCH_JUMP);
-	InjectHook(0x4D1EA0, &CPed::ClearFlee, PATCH_JUMP);
-	InjectHook(0x4D0BB0, &CPed::ClearFall, PATCH_JUMP);
-	InjectHook(0x4D0F20, &CPed::SetGetUp, PATCH_JUMP);
-	InjectHook(0x4D6550, &CPed::RestoreHeadingRateCB, PATCH_JUMP);
-	InjectHook(0x4C5E30, &CPed::RestorePreviousState, PATCH_JUMP);
-	InjectHook(0x4E5F70, &CPed::SetPointGunAt, PATCH_JUMP);
-	InjectHook(0x4D2750, &CPed::SetWanderPath, PATCH_JUMP);
-	InjectHook(0x4D30C0, &CPed::SetEvasiveStep, PATCH_JUMP);
-	InjectHook(0x4EA360, &CPed::ClearInvestigateEvent, PATCH_JUMP);
-	InjectHook(0x4D8E80, &CPed::ClearLeader, PATCH_JUMP);
-	InjectHook(0x4D1360, &CPed::ClearLook, PATCH_JUMP);
-	InjectHook(0x4D8DF0, &CPed::ClearObjective, PATCH_JUMP);
-	InjectHook(0x4D0970, &CPed::ClearPause, PATCH_JUMP);
-	InjectHook(0x4D1620, &CPed::ClearSeek, PATCH_JUMP);
-	InjectHook(0x4CFB70, &CPed::ClearWeapons, PATCH_JUMP);
-	InjectHook(0x4C6BB0, &CPed::RestoreGunPosition, PATCH_JUMP);
-	InjectHook(0x4D6540, &CPed::RestoreHeadingRate, PATCH_JUMP);
-	InjectHook(0x4C69E0, (void (CPed::*)(CEntity*)) &CPed::SetAimFlag, PATCH_JUMP);
-	InjectHook(0x4C6960, (void (CPed::*)(float)) &CPed::SetAimFlag, PATCH_JUMP);
-	InjectHook(0x4CFAD0, &CPed::GrantAmmo, PATCH_JUMP);
-	InjectHook(0x4CFB20, &CPed::SetAmmo, PATCH_JUMP);
-	InjectHook(0x4D33A0, &CPed::SetEvasiveDive, PATCH_JUMP);
-	InjectHook(0x4D09B0, &CPed::SetFall, PATCH_JUMP);
-	InjectHook(0x4E6220, &CPed::SetAttack, PATCH_JUMP);
-	InjectHook(0x4E7530, &CPed::StartFightAttack, PATCH_JUMP);
-	InjectHook(0x4E8EC0, &CPed::FightStrike, PATCH_JUMP);
-	InjectHook(0x4CCE20, &CPed::GetLocalDirection, PATCH_JUMP);
-	InjectHook(0x4E8E20, &CPed::PlayHitSound, PATCH_JUMP);
-	InjectHook(0x4E5A10, &CPed::Say, PATCH_JUMP);
-	InjectHook(0x4D58D0, &CPed::SetWaitState, PATCH_JUMP);
-	InjectHook(0x4D1D70, (void (CPed::*)(CEntity*, int)) &CPed::SetFlee, PATCH_JUMP);
-	InjectHook(0x4D1C40, (void (CPed::*)(CVector2D const &, int)) &CPed::SetFlee, PATCH_JUMP);
-	InjectHook(0x4EB9A0, &CPed::CollideWithPed, PATCH_JUMP);
-	InjectHook(0x433490, &CPed::CreateDeadPedMoney, PATCH_JUMP);
-	InjectHook(0x433660, &CPed::CreateDeadPedWeaponPickups, PATCH_JUMP);
-	InjectHook(0x4D3970, &CPed::SetDead, PATCH_JUMP);
-	InjectHook(0x53CDF0, &CPed::DeadPedMakesTyresBloody, PATCH_JUMP);
-	InjectHook(0x4E0640, &CPed::SetBeingDraggedFromCar, PATCH_JUMP);
-	InjectHook(0x4D1300, &CPed::SetAttackTimer, PATCH_JUMP);
-	InjectHook(0x4D6950, &CPed::SetBuyIceCream, PATCH_JUMP);
-	InjectHook(0x4D3A60, &CPed::SetChat, PATCH_JUMP);
-	InjectHook(0x4D14B0, (void (CPed::*)(CVector, float)) &CPed::SetSeek, PATCH_JUMP);
-	InjectHook(0x4D15A0, (void (CPed::*)(CEntity*, float)) &CPed::SetSeek, PATCH_JUMP);
-	InjectHook(0x4EB5C0, &CPed::DoesLOSBulletHitPed, PATCH_JUMP);
-	InjectHook(0x4E3EC0, &CPed::DuckAndCover, PATCH_JUMP);
-	InjectHook(0x4E8D30, &CPed::EndFight, PATCH_JUMP);
-	InjectHook(0x4E0D30, &CPed::EnterCar, PATCH_JUMP);
-	InjectHook(0x4E2E50, &CPed::GetNearestTrainPedPosition, PATCH_JUMP);
-	InjectHook(0x4E2D70, &CPed::GetNearestTrainDoor, PATCH_JUMP);
-	InjectHook(0x4E33D0, &CPed::LineUpPedWithTrain, PATCH_JUMP);
-	InjectHook(0x4E18D0, &CPed::ExitCar, PATCH_JUMP);
-	InjectHook(0x4E7EE0, &CPed::Fight, PATCH_JUMP);
-	InjectHook(0x4D3950, &CPed::FinishDieAnimCB, PATCH_JUMP);
-	InjectHook(0x4E9830, &CPed::FinishFightMoveCB, PATCH_JUMP);
-	InjectHook(0x4D7A80, &CPed::FinishHitHeadCB, PATCH_JUMP);
-	InjectHook(0x4D7A50, &CPed::FinishJumpCB, PATCH_JUMP);
-	InjectHook(0x4D7490, &CPed::FinishLaunchCB, PATCH_JUMP);
-	InjectHook(0x4D6520, &CPed::FinishedWaitCB, PATCH_JUMP);
-	InjectHook(0x4D5D80, &CPed::Wait, PATCH_JUMP);
-	InjectHook(0x4E3A90, &CPed::FindBestCoordsFromNodes, PATCH_JUMP);
-	InjectHook(0x4D2E70, &CPed::SeekFollowingPath, PATCH_JUMP);
-	InjectHook(0x4D1640, &CPed::Seek, PATCH_JUMP);
-	InjectHook(0x4D3020, &CPed::FollowPath, PATCH_JUMP);
-	InjectHook(0x4D1ED0, &CPed::Flee, PATCH_JUMP);
-	InjectHook(0x4E1CF0, &CPed::GetNearestDoor, PATCH_JUMP);
-	InjectHook(0x4DF420, &CPed::GetFormationPosition, PATCH_JUMP);
-	InjectHook(0x4E1F30, &CPed::GetNearestPassengerDoor, PATCH_JUMP);
-	InjectHook(0x4D0690, &CPed::Idle, PATCH_JUMP);
-	InjectHook(0x4DD720, &CPed::GetNextPointOnRoute, PATCH_JUMP);
-	InjectHook(0x4D7B50, &CPed::GetPedRadioCategory, PATCH_JUMP);
-	InjectHook(0x4CFA40, &CPed::GetWeaponSlot, PATCH_JUMP);
-	InjectHook(0x4E2220, &CPed::GoToNearestDoor, PATCH_JUMP);
-	InjectHook(0x4DD7B0, &CPed::HaveReachedNextPointOnRoute, PATCH_JUMP);
-	InjectHook(0x4D0D10, &CPed::InTheAir, PATCH_JUMP);
-	InjectHook(0x4C5270, &CPed::Initialise, PATCH_JUMP);
-	InjectHook(0x4D0E40, &CPed::SetLanding, PATCH_JUMP);
-	InjectHook(0x4E9B50, &CPed::InvestigateEvent, PATCH_JUMP);
-	InjectHook(0x564BB0, &CPed::IsPedDoingDriveByShooting, PATCH_JUMP);
-	InjectHook(0x4E4D90, &CPed::IsRoomToBeCarJacked, PATCH_JUMP);
-	InjectHook(0x4EC430, &CPed::KillPedWithCar, PATCH_JUMP);
-	InjectHook(0x4E9A80, &CPed::SetInvestigateEvent, PATCH_JUMP);
-	InjectHook(0x4D5040, &CPed::LookForInterestingNodes, PATCH_JUMP);
-	InjectHook(0x4D4F50, &CPed::LookForSexyCars, PATCH_JUMP);
-	InjectHook(0x4D4DF0, &CPed::LookForSexyPeds, PATCH_JUMP);
-	InjectHook(0x53CFD0, &CPed::MakeTyresMuddySectorList, PATCH_JUMP);
-	InjectHook(0x4C6580, &FinishFuckUCB, PATCH_JUMP);
-	InjectHook(0x4D11D0, &CPed::Mug, PATCH_JUMP);
-	InjectHook(0x4DE130, &CPed::PedAnimAlignCB, PATCH_JUMP);
-	InjectHook(0x4D0980, &CPed::Pause, PATCH_JUMP);
-	InjectHook(0x4C65B0, &CPed::MoveHeadToLook, PATCH_JUMP);
-	InjectHook(0x4DF1B0, &CPed::PedAnimDoorCloseCB, PATCH_JUMP);
-	InjectHook(0x4E4B90, &CPed::PedAnimDoorCloseRollingCB, PATCH_JUMP);
-	InjectHook(0x4DE500, &CPed::PedAnimDoorOpenCB, PATCH_JUMP);
-	InjectHook(0x4D73D0, &CPed::SetJump, PATCH_JUMP);
-	InjectHook(0x4E4E20, &CPed::RemoveInCarAnims, PATCH_JUMP);
-	InjectHook(0x4DEC80, &CPed::PedAnimGetInCB, PATCH_JUMP);
-	InjectHook(0x4DEAF0, &CPed::PedAnimPullPedOutCB, PATCH_JUMP);
-	InjectHook(0x4DF5C0, &CPed::PedAnimStepOutCarCB, PATCH_JUMP);
-	InjectHook(0x4D36E0, &CPed::PedEvadeCB, PATCH_JUMP);
-	InjectHook(0x4CE810, &CPed::PedGetupCB, PATCH_JUMP);
-	InjectHook(0x4CE8A0, &CPed::PedLandCB, PATCH_JUMP);
-	InjectHook(0x4E2920, &CPed::PedSetDraggedOutCarPositionCB, PATCH_JUMP);
-	InjectHook(0x4CF220, &CPed::PedSetInCarCB, PATCH_JUMP);
-	InjectHook(0x4E3290, &CPed::PedSetInTrainCB, PATCH_JUMP);
-	InjectHook(0x4C10C0, &CPed::RunToReportCrime, PATCH_JUMP);
-	InjectHook(0x4E3870, &CPed::RegisterThreatWithGangPeds, PATCH_JUMP);
-	InjectHook(0x4DD980, &CPed::ReactToPointGun, PATCH_JUMP);
-	InjectHook(0x4CE8F0, &CPed::PedSetOutCarCB, PATCH_JUMP);
-	InjectHook(0x4E36E0, &CPed::PedSetOutTrainCB, PATCH_JUMP);
-	InjectHook(0x4EB6E0, &CPed::PlacePedOnDryLand, PATCH_JUMP);
-	InjectHook(0x4E2480, &CPed::PedSetQuickDraggedOutCarPositionCB, PATCH_JUMP);
-	InjectHook(0x4E4F30, &CPed::PositionPedOutOfCollision, PATCH_JUMP);
-	InjectHook(0x4D6A00, &CPed::PossiblyFindBetterPosToSeekCar, PATCH_JUMP);
-	InjectHook(0x4D94E0, &CPed::ProcessObjective, PATCH_JUMP);
-	InjectHook(0x4CCEB0, &CPed::SetDirectionToWalkAroundObject, PATCH_JUMP);
-	InjectHook(0x4DF3E0, &CPed::SetFormation, PATCH_JUMP);
-	InjectHook(0x4C7340, &CPed::WillChat, PATCH_JUMP);
-	InjectHook(0x4E32D0, &CPed::SetEnterTrain, PATCH_JUMP);
-	InjectHook(0x4E4920, &CPed::SetDuck, PATCH_JUMP);
-	InjectHook(0x4E0920, &CPed::SetEnterCar, PATCH_JUMP);
-	InjectHook(0x4D7BC0, &CPed::SetRadioStation, PATCH_JUMP);
-	InjectHook(0x4C7FF0, &CPed::ProcessBuoyancy, PATCH_JUMP);
-	InjectHook(0x4D6620, &CPed::SetSolicit, PATCH_JUMP);
-	InjectHook(0x4D2EA0, &CPed::SetFollowPath, PATCH_JUMP);
-	InjectHook(0x4E1010, &CPed::SetExitCar, PATCH_JUMP);
-	InjectHook(0x4C5FE0, &CPed::ScanForThreats, PATCH_JUMP);
-	InjectHook(0x4C6C10, &CPed::ScanForInterestingStuff, PATCH_JUMP);
-	InjectHook(0x4D3F90, &CPed::SeekCar, PATCH_JUMP);
-	InjectHook(0x4E5870, &CPed::ServiceTalking, PATCH_JUMP);
-	InjectHook(0x4E7780, &CPed::StartFightDefend, PATCH_JUMP);
-	InjectHook(0x4D8F30, &CPed::UpdateFromLeader, PATCH_JUMP);
-	InjectHook(0x4D4970, &CPed::SetPedPositionInCar, PATCH_JUMP);
-	InjectHook(0x4D7D20, &CPed::WarpPedIntoCar, PATCH_JUMP);
-	InjectHook(0x4E0A40, &CPed::SetEnterCar_AllClear, PATCH_JUMP);
-	InjectHook(0x4D28D0, &CPed::WanderPath, PATCH_JUMP);
-	InjectHook(0x4E5570, &CPed::WarpPedToNearEntityOffScreen, PATCH_JUMP);
-	InjectHook(0x4E52A0, &CPed::WarpPedToNearLeaderOffScreen, PATCH_JUMP);
-	InjectHook(0x4E0220, &CPed::SetCarJack, PATCH_JUMP);
-	InjectHook(0x4D6780, &CPed::Solicit, PATCH_JUMP);
-ENDPATCHES
diff --git a/src/peds/PedIK.cpp b/src/peds/PedIK.cpp
index 8e450ee6..1464c4e8 100644
--- a/src/peds/PedIK.cpp
+++ b/src/peds/PedIK.cpp
@@ -1,5 +1,5 @@
 #include "common.h"
-#include "patcher.h"
+
 #include "Camera.h"
 #include "PedIK.h"
 #include "Ped.h"
@@ -362,19 +362,3 @@ CPedIK::ExtractYawAndPitchLocal(RwMatrix *mat, float *yaw, float *pitch)
 	*pitch = Acos(f);
 	if (mat->up.x > 0.0f) *pitch = -*pitch;
 }
-
-STARTPATCHES
-	InjectHook(0x4ED0F0, &CPedIK::GetComponentPosition, PATCH_JUMP);
-	InjectHook(0x4ED060, &CPedIK::GetWorldMatrix, PATCH_JUMP);
-	InjectHook(0x4EDDB0, &CPedIK::RotateTorso, PATCH_JUMP);
-	InjectHook(0x4ED440, &CPedIK::MoveLimb, PATCH_JUMP);
-	InjectHook(0x4EDD70, &CPedIK::RestoreGunPosn, PATCH_JUMP);
-	InjectHook(0x4ED620, &CPedIK::LookInDirection, PATCH_JUMP);
-	InjectHook(0x4ED590, &CPedIK::LookAtPosition, PATCH_JUMP);
-	InjectHook(0x4ED9B0, &CPedIK::PointGunInDirection, PATCH_JUMP);
-	InjectHook(0x4EDB20, &CPedIK::PointGunInDirectionUsingArm, PATCH_JUMP);
-	InjectHook(0x4ED920, &CPedIK::PointGunAtPosition, PATCH_JUMP);
-	InjectHook(0x4ED810, &CPedIK::RestoreLookAt, PATCH_JUMP);
-	InjectHook(0x4ED140, &CPedIK::ExtractYawAndPitchWorld, PATCH_JUMP);
-	InjectHook(0x4ED2C0, &CPedIK::ExtractYawAndPitchLocal, PATCH_JUMP);
-ENDPATCHES
\ No newline at end of file
diff --git a/src/peds/PedPlacement.cpp b/src/peds/PedPlacement.cpp
index e5f6a077..6038cf91 100644
--- a/src/peds/PedPlacement.cpp
+++ b/src/peds/PedPlacement.cpp
@@ -1,5 +1,5 @@
 #include "common.h"
-#include "patcher.h"
+
 #include "Ped.h"
 #include "PedPlacement.h"
 #include "World.h"
@@ -49,8 +49,3 @@ CPedPlacement::IsPositionClearForPed(CVector* pos)
 	CWorld::FindObjectsKindaColliding(*pos, 0.75f, true, &count, 2, nil, false, true, true, false, false);
 	return count == 0;
 }
-
-STARTPATCHES
-	InjectHook(0x4EE340, &CPedPlacement::FindZCoorForPed, PATCH_JUMP);
-	InjectHook(0x4EE310, &CPedPlacement::IsPositionClearOfCars, PATCH_JUMP);
-ENDPATCHES
diff --git a/src/peds/PedRoutes.cpp b/src/peds/PedRoutes.cpp
index b6512edd..3ff080e6 100644
--- a/src/peds/PedRoutes.cpp
+++ b/src/peds/PedRoutes.cpp
@@ -1,5 +1,5 @@
 #include "common.h"
-#include "patcher.h"
+
 #include "main.h"
 #include "PedRoutes.h"
 
diff --git a/src/peds/PedStats.cpp b/src/peds/PedStats.cpp
index a2ccb567..06e39039 100644
--- a/src/peds/PedStats.cpp
+++ b/src/peds/PedStats.cpp
@@ -1,5 +1,5 @@
 #include "common.h"
-#include "patcher.h"
+
 #include "General.h"
 #include "FileMgr.h"
 #include "PedStats.h"
@@ -116,10 +116,3 @@ CPedStats::GetPedStatType(char *name)
 
 	return NUM_PEDSTATS;
 }
-
-STARTPATCHES
-	InjectHook(0x4EF460, &CPedStats::Initialise, PATCH_JUMP);
-	InjectHook(0x4EF540, &CPedStats::Shutdown, PATCH_JUMP);
-	InjectHook(0x4EF580, &CPedStats::LoadPedStats, PATCH_JUMP);
-	InjectHook(0x4EF780, &CPedStats::GetPedStatType, PATCH_JUMP);
-ENDPATCHES
diff --git a/src/peds/PedType.cpp b/src/peds/PedType.cpp
index 30af6dcc..8bf4c6e1 100644
--- a/src/peds/PedType.cpp
+++ b/src/peds/PedType.cpp
@@ -1,5 +1,5 @@
 #include "common.h"
-#include "patcher.h"
+
 #include "FileMgr.h"
 #include "PedType.h"
 
@@ -202,12 +202,3 @@ INITSAVEBUF
 		*ms_apPedType[i] = ReadSaveBuf<CPedType>(buf);
 VALIDATESAVEBUF(size)
 }
-
-STARTPATCHES
-	InjectHook(0x4EE7E0, &CPedType::Initialise, PATCH_JUMP);
-	InjectHook(0x4EE890, &CPedType::Shutdown, PATCH_JUMP);
-	InjectHook(0x4EEC10, &CPedType::FindPedType, PATCH_JUMP);
-	InjectHook(0x4EEF40, &CPedType::FindPedFlag, PATCH_JUMP);
-	InjectHook(0x4EF320, &CPedType::Save, PATCH_JUMP);
-	InjectHook(0x4EF3D0, &CPedType::Load, PATCH_JUMP);
-ENDPATCHES
diff --git a/src/peds/PlayerPed.cpp b/src/peds/PlayerPed.cpp
index dcd9486f..0a0fe6a3 100644
--- a/src/peds/PlayerPed.cpp
+++ b/src/peds/PlayerPed.cpp
@@ -1,5 +1,5 @@
 #include "common.h"
-#include "patcher.h"
+
 #include "PlayerPed.h"
 #include "Wanted.h"
 #include "Fire.h"
@@ -1495,41 +1495,3 @@ CPlayerPed::ProcessControl(void)
 		m_bSpeedTimerFlag = false;
 	}
 }
-
-#include <new>
-
-class CPlayerPed_ : public CPlayerPed
-{
-public:
-	CPlayerPed* ctor(void) { return ::new (this) CPlayerPed(); }
-	void dtor(void) { CPlayerPed::~CPlayerPed(); }
-	void SetMoveAnim_(void) { CPlayerPed::SetMoveAnim(); }
-	void ProcessControl_(void) { CPlayerPed::ProcessControl(); }
-};
-
-STARTPATCHES
-	InjectHook(0x4EF7E0, &CPlayerPed_::ctor, PATCH_JUMP);
-	InjectHook(0x4EFB30, &CPlayerPed_::dtor, PATCH_JUMP);
-	InjectHook(0x4F3760, &CPlayerPed_::SetMoveAnim_, PATCH_JUMP);
-	InjectHook(0x4EFD90, &CPlayerPed_::ProcessControl_, PATCH_JUMP);
-	InjectHook(0x4F28A0, &CPlayerPed::ClearWeaponTarget, PATCH_JUMP);
-	InjectHook(0x4F3700, &CPlayerPed::AnnoyPlayerPed, PATCH_JUMP);
-	InjectHook(0x4F36C0, &CPlayerPed::GetPlayerInfoForThisPlayerPed, PATCH_JUMP);
-	InjectHook(0x4F2560, &CPlayerPed::MakeChangesForNewWeapon, PATCH_JUMP);
-	InjectHook(0x4F07C0, &CPlayerPed::ReApplyMoveAnims, PATCH_JUMP);
-	InjectHook(0x4F0880, &CPlayerPed::SetRealMoveAnim, PATCH_JUMP);
-	InjectHook(0x4F1810, &CPlayerPed::PlayerControlFighter, PATCH_JUMP);
-	InjectHook(0x4F1340, &CPlayerPed::RestoreSprintEnergy, PATCH_JUMP);
-	InjectHook(0x4F1380, &CPlayerPed::DoWeaponSmoothSpray, PATCH_JUMP);
-	InjectHook(0x4F36E0, &CPlayerPed::DoStuffToGoOnFire, PATCH_JUMP);
-	InjectHook(0x4F3350, &CPlayerPed::DoesTargetHaveToBeBroken, PATCH_JUMP);
-	InjectHook(0x4F31D0, &CPlayerPed::RunningLand, PATCH_JUMP);
-	InjectHook(0x4F2D00, &CPlayerPed::IsThisPedAttackingPlayer, PATCH_JUMP);
-	InjectHook(0x4F1CF0, &CPlayerPed::PlayerControlSniper, PATCH_JUMP);
-	InjectHook(0x4F2310, &CPlayerPed::ProcessWeaponSwitch, PATCH_JUMP);
-	InjectHook(0x4F1DF0, &CPlayerPed::PlayerControlM16, PATCH_JUMP);
-	InjectHook(0x4F3460, &CPlayerPed::KeepAreaAroundPlayerClear, PATCH_JUMP);
-	InjectHook(0x4F1970, &CPlayerPed::PlayerControl1stPersonRunAround, PATCH_JUMP);
-	InjectHook(0x4F1EF0, &CPlayerPed::ProcessPlayerWeapon, PATCH_JUMP);
-	InjectHook(0x4F2640, &CPlayerPed::ProcessAnimGroups, PATCH_JUMP);
-ENDPATCHES
diff --git a/src/peds/Population.cpp b/src/peds/Population.cpp
index d3a67a57..681c6b1a 100644
--- a/src/peds/Population.cpp
+++ b/src/peds/Population.cpp
@@ -1,5 +1,5 @@
 #include "common.h"
-#include "patcher.h"
+
 #include "Game.h"
 #include "General.h"
 #include "World.h"
@@ -1180,16 +1180,3 @@ CPopulation::ManagePopulation(void)
 		}
 	}
 }
-
-STARTPATCHES
-	InjectHook(0x4F3770, &CPopulation::Initialise, PATCH_JUMP);
-	InjectHook(0x4F5780, &CPopulation::ChooseGangOccupation, PATCH_JUMP);
-	InjectHook(0x4F6200, &CPopulation::DealWithZoneChange, PATCH_JUMP);
-	InjectHook(0x4F6010, &CPopulation::FindCollisionZoneForCoors, PATCH_JUMP);
-	InjectHook(0x4F6410, &CPopulation::PedCreationDistMultiplier, PATCH_JUMP);
-	InjectHook(0x4F5280, &CPopulation::AddPed, PATCH_JUMP);
-	InjectHook(0x4F4470, &CPopulation::ConvertToRealObject, PATCH_JUMP);
-	InjectHook(0x4F4690, &CPopulation::TestRoomForDummyObject, PATCH_JUMP);
-	InjectHook(0x4F45A0, &CPopulation::ConvertToDummyObject, PATCH_JUMP);
-	InjectHook(0x4F4410, &CPopulation::ConvertAllObjectsToDummyObjects, PATCH_JUMP);
-ENDPATCHES