13 files changed, 14 insertions, 302 deletions

diff --git a/src/vehicles/Automobile.cpp b/src/vehicles/Automobile.cpp
index 0a0bc7a6..c2a664a6 100644
--- a/src/vehicles/Automobile.cpp
+++ b/src/vehicles/Automobile.cpp
@@ -1,6 +1,6 @@
 #include "common.h"
 #include "main.h"
-#include "patcher.h"
+
 #include "General.h"
 #include "RwHelper.h"
 #include "Pad.h"
@@ -4492,88 +4492,3 @@ CAutomobile::SetAllTaxiLights(bool set)
 {
 	m_sAllTaxiLights = set;
 }
-
-#include <new>
-
-class CAutomobile_ : public CAutomobile
-{
-public:
-	void ctor(int32 id, uint8 CreatedBy) { ::new (this) CAutomobile(id, CreatedBy); }
-	void dtor() { CAutomobile::~CAutomobile(); }
-	void SetModelIndex_(uint32 id) { CAutomobile::SetModelIndex(id); }
-	void ProcessControl_(void) { CAutomobile::ProcessControl(); }
-	void Teleport_(CVector v) { CAutomobile::Teleport(v); }
-	void PreRender_(void) { CAutomobile::PreRender(); }
-	void Render_(void) { CAutomobile::Render(); }
-
-	int32 ProcessEntityCollision_(CEntity *ent, CColPoint *colpoints){ return CAutomobile::ProcessEntityCollision(ent, colpoints); }
-
-	void ProcessControlInputs_(uint8 pad) { CAutomobile::ProcessControlInputs(pad); }
-	void GetComponentWorldPosition_(int32 component, CVector &pos) { CAutomobile::GetComponentWorldPosition(component, pos); }
-	bool IsComponentPresent_(int32 component) { return CAutomobile::IsComponentPresent(component); }
-	void SetComponentRotation_(int32 component, CVector rotation) { CAutomobile::SetComponentRotation(component, rotation); }
-	void OpenDoor_(int32 component, eDoors door, float ratio) { CAutomobile::OpenDoor(component, door, ratio); }
-	void ProcessOpenDoor_(uint32 component, uint32 anim, float time) { CAutomobile::ProcessOpenDoor(component, anim, time); }
-	bool IsDoorReady_(eDoors door) { return CAutomobile::IsDoorReady(door); }
-	bool IsDoorFullyOpen_(eDoors door) { return CAutomobile::IsDoorFullyOpen(door); }
-	bool IsDoorClosed_(eDoors door) { return CAutomobile::IsDoorClosed(door); }
-	bool IsDoorMissing_(eDoors door) { return CAutomobile::IsDoorMissing(door); }
-	void RemoveRefsToVehicle_(CEntity *ent) { CAutomobile::RemoveRefsToVehicle(ent); }
-	void BlowUpCar_(CEntity *ent) { CAutomobile::BlowUpCar(ent); }
-	bool SetUpWheelColModel_(CColModel *colModel) { return CAutomobile::SetUpWheelColModel(colModel); }
-	void BurstTyre_(uint8 tyre) { CAutomobile::BurstTyre(tyre); }
-	bool IsRoomForPedToLeaveCar_(uint32 door, CVector *pos) { return CAutomobile::IsRoomForPedToLeaveCar(door, pos); }
-	float GetHeightAboveRoad_(void) { return CAutomobile::GetHeightAboveRoad(); }
-	void PlayCarHorn_(void) { CAutomobile::PlayCarHorn(); }
-};
-
-STARTPATCHES
-	InjectHook(0x52C6B0, &CAutomobile_::ctor, PATCH_JUMP);
-	InjectHook(0x52D170, &CAutomobile_::dtor, PATCH_JUMP);
-	InjectHook(0x52D190, &CAutomobile_::SetModelIndex_, PATCH_JUMP);
-	InjectHook(0x531470, &CAutomobile_::ProcessControl_, PATCH_JUMP);
-	InjectHook(0x535180, &CAutomobile_::Teleport_, PATCH_JUMP);
-	InjectHook(0x539EA0, &CAutomobile_::Render_, PATCH_JUMP);
-	InjectHook(0x535B40, &CAutomobile_::PreRender_, PATCH_JUMP);
-	InjectHook(0x53B270, &CAutomobile_::ProcessEntityCollision_, PATCH_JUMP);
-	InjectHook(0x53B660, &CAutomobile_::ProcessControlInputs_, PATCH_JUMP);
-	InjectHook(0x52E5F0, &CAutomobile_::GetComponentWorldPosition_, PATCH_JUMP);
-	InjectHook(0x52E660, &CAutomobile_::IsComponentPresent_, PATCH_JUMP);
-	InjectHook(0x52E680, &CAutomobile_::SetComponentRotation_, PATCH_JUMP);
-	InjectHook(0x52E750, &CAutomobile_::OpenDoor_, PATCH_JUMP);
-	InjectHook(0x52EF10, &CAutomobile_::IsDoorReady_, PATCH_JUMP);
-	InjectHook(0x52EF90, &CAutomobile_::IsDoorFullyOpen_, PATCH_JUMP);
-	InjectHook(0x52EFD0, &CAutomobile_::IsDoorClosed_, PATCH_JUMP);
-	InjectHook(0x52F000, &CAutomobile_::IsDoorMissing_, PATCH_JUMP);
-	InjectHook(0x53BF40, &CAutomobile_::RemoveRefsToVehicle_, PATCH_JUMP);
-	InjectHook(0x53BC60, &CAutomobile_::BlowUpCar_, PATCH_JUMP);
-	InjectHook(0x53BF70, &CAutomobile_::SetUpWheelColModel_, PATCH_JUMP);
-	InjectHook(0x53C0E0, &CAutomobile_::BurstTyre_, PATCH_JUMP);
-	InjectHook(0x53C5B0, &CAutomobile_::IsRoomForPedToLeaveCar_, PATCH_JUMP);
-	InjectHook(0x437690, &CAutomobile_::GetHeightAboveRoad_, PATCH_JUMP);
-	InjectHook(0x53C450, &CAutomobile_::PlayCarHorn_, PATCH_JUMP);
-	InjectHook(0x53E090, &CAutomobile::PlaceOnRoadProperly, PATCH_JUMP);
-	InjectHook(0x52F030, &CAutomobile::dmgDrawCarCollidingParticles, PATCH_JUMP);
-	InjectHook(0x535450, &CAutomobile::AddDamagedVehicleParticles, PATCH_JUMP);
-	InjectHook(0x5357D0, &CAutomobile::AddWheelDirtAndWater, PATCH_JUMP);
-	InjectHook(0x5353A0, &CAutomobile::ResetSuspension, PATCH_JUMP);
-	InjectHook(0x52D210, &CAutomobile::SetupSuspensionLines, PATCH_JUMP);
-	InjectHook(0x53E000, &CAutomobile::BlowUpCarsInPath, PATCH_JUMP);
-	InjectHook(0x42E220, &CAutomobile::HasCarStoppedBecauseOfLight, PATCH_JUMP);
-	InjectHook(0x53D320, &CAutomobile::SetBusDoorTimer, PATCH_JUMP);
-	InjectHook(0x53D370, &CAutomobile::ProcessAutoBusDoors, PATCH_JUMP);
-	InjectHook(0x535250, &CAutomobile::ProcessSwingingDoor, PATCH_JUMP);
-	InjectHook(0x53C240, &CAutomobile::Fix, PATCH_JUMP);
-	InjectHook(0x53C310, &CAutomobile::SetupDamageAfterLoad, PATCH_JUMP);
-	InjectHook(0x530300, &CAutomobile::SpawnFlyingComponent, PATCH_JUMP);
-	InjectHook(0x535320, &CAutomobile::RemoveBonnetInPedCollision, PATCH_JUMP);
-	InjectHook(0x5301A0, &CAutomobile::SetPanelDamage, PATCH_JUMP);
-	InjectHook(0x530120, &CAutomobile::SetBumperDamage, PATCH_JUMP);
-	InjectHook(0x530200, &CAutomobile::SetDoorDamage, PATCH_JUMP);
-	InjectHook(0x5300E0, &CAutomobile::SetComponentVisibility, PATCH_JUMP);
-	InjectHook(0x52D1B0, &CAutomobile::SetupModelNodes, PATCH_JUMP);
-	InjectHook(0x53C420, &CAutomobile::SetTaxiLight, PATCH_JUMP);
-	InjectHook(0x53BC40, &CAutomobile::GetAllWheelsOffGround, PATCH_JUMP);
-	InjectHook(0x5308C0, &CAutomobile::ReduceHornCounter, PATCH_JUMP);
-	InjectHook(0x53C440, &CAutomobile::SetAllTaxiLights, PATCH_JUMP);
-ENDPATCHES
diff --git a/src/vehicles/Boat.cpp b/src/vehicles/Boat.cpp
index 478257b6..ed38bafd 100644
--- a/src/vehicles/Boat.cpp
+++ b/src/vehicles/Boat.cpp
@@ -1,5 +1,5 @@
 #include "common.h"
-#include "patcher.h"
+
 #include "General.h"
 #include "Timecycle.h"
 #include "HandlingMgr.h"
@@ -850,24 +850,3 @@ CBoat::AddWakePoint(CVector point)
 		m_nNumWakePoints = 1;
 	}
 }
-
-#include <new>
-
-class CBoat_ : public CBoat
-{
-public:
-	CBoat* ctor(int32 id, uint8 CreatedBy) { return ::new (this) CBoat(id, CreatedBy); }
-	void dtor() { CBoat::~CBoat(); };
-};
-
-STARTPATCHES
-	InjectHook(0x53E3E0, &CBoat_::ctor, PATCH_JUMP);
-	InjectHook(0x53E790, &CBoat_::dtor, PATCH_JUMP);
-	InjectHook(0x53E7D0, &CBoat::SetupModelNodes, PATCH_JUMP);
-	InjectHook(0x542370, CBoat::IsSectorAffectedByWake, PATCH_JUMP);
-	InjectHook(0x5424A0, CBoat::IsVertexAffectedByWake, PATCH_JUMP);
-	InjectHook(0x542250, CBoat::FillBoatList, PATCH_JUMP);
-	InjectHook(0x542140, &CBoat::AddWakePoint, PATCH_JUMP);
-	InjectHook(0x5420D0, &CBoat::PruneWakeTrail, PATCH_JUMP);
-	InjectHook(0x541A30, &CBoat::ApplyWaterResistance, PATCH_JUMP);
-ENDPATCHES
diff --git a/src/vehicles/CarGen.cpp b/src/vehicles/CarGen.cpp
index c35005a1..4156ec2a 100644
--- a/src/vehicles/CarGen.cpp
+++ b/src/vehicles/CarGen.cpp
@@ -1,5 +1,5 @@
 #include "common.h"
-#include "patcher.h"
+
 #include "CarGen.h"
 
 #include "Automobile.h"
@@ -249,10 +249,3 @@ INITSAVEBUF
 		CarGeneratorArray[i] = ReadSaveBuf<CCarGenerator>(buffer);
 VALIDATESAVEBUF(size)
 }
-
-STARTPATCHES
-InjectHook(0x543020, CTheCarGenerators::Init, PATCH_JUMP);
-InjectHook(0x542F40, CTheCarGenerators::Process, PATCH_JUMP);
-InjectHook(0x543050, CTheCarGenerators::SaveAllCarGenerators, PATCH_JUMP);
-InjectHook(0x5431E0, CTheCarGenerators::LoadAllCarGenerators, PATCH_JUMP);
-ENDPATCHES
diff --git a/src/vehicles/Cranes.cpp b/src/vehicles/Cranes.cpp
index dbc3c340..ef19873c 100644
--- a/src/vehicles/Cranes.cpp
+++ b/src/vehicles/Cranes.cpp
@@ -1,5 +1,5 @@
 #include "common.h"
-#include "patcher.h"
+
 #include "Cranes.h"
 
 #include "Camera.h"
diff --git a/src/vehicles/DamageManager.cpp b/src/vehicles/DamageManager.cpp
index 9a697b6b..03ccfe77 100644
--- a/src/vehicles/DamageManager.cpp
+++ b/src/vehicles/DamageManager.cpp
@@ -1,5 +1,5 @@
 #include "common.h"
-#include "patcher.h"
+
 #include "General.h"
 #include "Vehicle.h"
 #include "DamageManager.h"
@@ -228,24 +228,3 @@ CDamageManager::ProgressEngineDamage(void)
 	SetEngineStatus(newstatus);
 	return true;
 }
-
-STARTPATCHES
-	InjectHook(0x545850, &CDamageManager::ResetDamageStatus, PATCH_JUMP);
-	InjectHook(0x545B70, &CDamageManager::FuckCarCompletely, PATCH_JUMP);
-	InjectHook(0x545790, &CDamageManager::GetComponentGroup, PATCH_JUMP);
-	InjectHook(0x545A80, &CDamageManager::ApplyDamage, PATCH_JUMP);
-	InjectHook(0x545920, &CDamageManager::SetDoorStatus, PATCH_JUMP);
-	InjectHook(0x545930, &CDamageManager::GetDoorStatus, PATCH_JUMP);
-	InjectHook(0x545970, &CDamageManager::ProgressDoorDamage, PATCH_JUMP);
-	InjectHook(0x5458B0, &CDamageManager::SetPanelStatus, PATCH_JUMP);
-	InjectHook(0x5458E0, (int32 (CDamageManager::*)(int32))&CDamageManager::GetPanelStatus, PATCH_JUMP);
-	InjectHook(0x545A00, &CDamageManager::ProgressPanelDamage, PATCH_JUMP);
-	InjectHook(0x545860, &CDamageManager::SetLightStatus, PATCH_JUMP);
-	InjectHook(0x545890, &CDamageManager::GetLightStatus, PATCH_JUMP);
-	InjectHook(0x545900, &CDamageManager::SetWheelStatus, PATCH_JUMP);
-	InjectHook(0x545910, &CDamageManager::GetWheelStatus, PATCH_JUMP);
-	InjectHook(0x545A40, &CDamageManager::ProgressWheelDamage, PATCH_JUMP);
-	InjectHook(0x545940, &CDamageManager::SetEngineStatus, PATCH_JUMP);
-	InjectHook(0x545960, &CDamageManager::GetEngineStatus, PATCH_JUMP);
-	InjectHook(0x5459B0, &CDamageManager::ProgressEngineDamage, PATCH_JUMP);
-ENDPATCHES
diff --git a/src/vehicles/Door.cpp b/src/vehicles/Door.cpp
index c569be59..c80965aa 100644
--- a/src/vehicles/Door.cpp
+++ b/src/vehicles/Door.cpp
@@ -1,5 +1,5 @@
 #include "common.h"
-#include "patcher.h"
+
 #include "Vehicle.h"
 #include "Door.h"
 
@@ -168,19 +168,3 @@ CTrainDoor::IsClosed(void)
 {
 	return m_fPosn == RetTranslationWhenClosed();
 }
-
-STARTPATCHES
-	InjectHook(0x545EF0, &CDoor::Open, PATCH_JUMP);
-	InjectHook(0x545BD0, &CDoor::Process, PATCH_JUMP);
-	InjectHook(0x545FE0, &CDoor::RetAngleWhenClosed, PATCH_JUMP);
-	InjectHook(0x546020, &CDoor::RetAngleWhenOpen, PATCH_JUMP);
-	InjectHook(0x545F80, &CDoor::GetAngleOpenRatio, PATCH_JUMP);
-	InjectHook(0x546090, &CDoor::IsFullyOpen, PATCH_JUMP);
-	InjectHook(0x546060, &CDoor::IsClosed, PATCH_JUMP);
-
-	InjectHook(0x546200, &CTrainDoor::Open, PATCH_JUMP);
-	InjectHook(0x546180, &CTrainDoor::RetTranslationWhenClosed, PATCH_JUMP);
-	InjectHook(0x5461C0, &CTrainDoor::RetTranslationWhenOpen, PATCH_JUMP);
-	InjectHook(0x546120, &CTrainDoor::IsFullyOpen, PATCH_JUMP);
-	InjectHook(0x5460F0, &CTrainDoor::IsClosed, PATCH_JUMP);
-ENDPATCHES
diff --git a/src/vehicles/Floater.cpp b/src/vehicles/Floater.cpp
index 8b5e1e0a..1ae1c5c3 100644
--- a/src/vehicles/Floater.cpp
+++ b/src/vehicles/Floater.cpp
@@ -1,5 +1,5 @@
 #include "common.h"
-#include "patcher.h"
+
 #include "Timer.h"
 #include "WaterLevel.h"
 #include "ModelIndices.h"
@@ -183,12 +183,3 @@ cBuoyancy::CalcBuoyancyForce(CPhysical *phys, CVector *point, CVector *impulse)
 	*impulse = CVector(0.0f, 0.0f, m_volumeUnderWater*m_buoyancy*CTimer::GetTimeStep());
 	return true;
 }
-
-STARTPATCHES
-	InjectHook(0x546270, &cBuoyancy::ProcessBuoyancy, PATCH_JUMP);
-	InjectHook(0x546360, &cBuoyancy::PreCalcSetup, PATCH_JUMP);
-	InjectHook(0x5466F0, &cBuoyancy::SimpleCalcBuoyancy, PATCH_JUMP);
-	InjectHook(0x546820, &cBuoyancy::SimpleSumBuoyancyData, PATCH_JUMP);
-	InjectHook(0x546620, &cBuoyancy::FindWaterLevel, PATCH_JUMP);
-	InjectHook(0x5465A0, &cBuoyancy::CalcBuoyancyForce, PATCH_JUMP);
-ENDPATCHES
diff --git a/src/vehicles/HandlingMgr.cpp b/src/vehicles/HandlingMgr.cpp
index b33015ab..3ac0da38 100644
--- a/src/vehicles/HandlingMgr.cpp
+++ b/src/vehicles/HandlingMgr.cpp
@@ -1,5 +1,5 @@
 #include "common.h"
-#include "patcher.h"
+
 #include "main.h"
 #include "FileMgr.h"
 #include "HandlingMgr.h"
@@ -237,11 +237,3 @@ cHandlingDataMgr::GetHandlingId(const char *name)
 			break;
 	return i;
 }
-
-STARTPATCHES
-	InjectHook(0x546D80, &cHandlingDataMgr::Initialise, PATCH_JUMP);
-	InjectHook(0x546DB0, &cHandlingDataMgr::LoadHandlingData, PATCH_JUMP);
-	InjectHook(0x546BB0, &cHandlingDataMgr::ConvertDataToGameUnits, PATCH_JUMP);
-	InjectHook(0x546AA0, &cHandlingDataMgr::FindExactWord, PATCH_JUMP);
-	InjectHook(0x546B70, &cHandlingDataMgr::GetHandlingId, PATCH_JUMP);
-ENDPATCHES
diff --git a/src/vehicles/Heli.cpp b/src/vehicles/Heli.cpp
index 81ac9bd3..1f92b678 100644
--- a/src/vehicles/Heli.cpp
+++ b/src/vehicles/Heli.cpp
@@ -1,6 +1,6 @@
 #include "common.h"
 #include "main.h"
-#include "patcher.h"
+
 #include "General.h"
 #include "Darkel.h"
 #include "Stats.h"
@@ -1043,24 +1043,3 @@ void CHeli::MakeCatalinaHeliFlyAway(void) { pHelis[HELI_CATALINA]->m_pathState =
 bool CHeli::HasCatalinaBeenShotDown(void) { return CatalinaHasBeenShotDown; }
 
 void CHeli::ActivateHeli(bool activate) { ScriptHeliOn = activate; }
-
-#include <new>
-
-class CHeli_ : public CHeli
-{
-public:
-	void ctor(int32 id, uint8 CreatedBy) { ::new (this) CHeli(id, CreatedBy); }
-	void dtor(void) { CHeli::~CHeli(); }
-};
-
-STARTPATCHES
-	InjectHook(0x547220, &CHeli_::ctor, PATCH_JUMP);
-	InjectHook(0x5474A0, &CHeli_::dtor, PATCH_JUMP);
-	InjectHook(0x54AE50, &CHeli::SpawnFlyingComponent, PATCH_JUMP);
-	InjectHook(0x549970, CHeli::InitHelis, PATCH_JUMP);
-	InjectHook(0x5499F0, CHeli::UpdateHelis, PATCH_JUMP);
-	InjectHook(0x54AE10, CHeli::SpecialHeliPreRender, PATCH_JUMP);
-	InjectHook(0x54AA30, CHeli::TestRocketCollision, PATCH_JUMP);
-	InjectHook(0x54AB30, CHeli::TestBulletCollision, PATCH_JUMP);
-	InjectHook(0x54A640, GenerateHeli, PATCH_JUMP);
-ENDPATCHES
diff --git a/src/vehicles/Plane.cpp b/src/vehicles/Plane.cpp
index 892bc0d5..273ac54a 100644
--- a/src/vehicles/Plane.cpp
+++ b/src/vehicles/Plane.cpp
@@ -1,6 +1,6 @@
 #include "common.h"
 #include "main.h"
-#include "patcher.h"
+
 #include "General.h"
 #include "ModelIndices.h"
 #include "FileMgr.h"
@@ -965,24 +965,3 @@ const CVector CPlane::FindDropOffCesnaCoordinates(void) { return pDropOffCesna->
 bool CPlane::HasCesnaLanded(void) { return CesnaMissionStatus == CESNA_STATUS_LANDED; }
 bool CPlane::HasCesnaBeenDestroyed(void) { return CesnaMissionStatus == CESNA_STATUS_DESTROYED; }
 bool CPlane::HasDropOffCesnaBeenShotDown(void) { return DropOffCesnaMissionStatus == CESNA_STATUS_DESTROYED; }
-
-#include <new>
-
-class CPlane_ : public CPlane
-{
-public:
-	void ctor(int32 id, uint8 CreatedBy) { ::new (this) CPlane(id, CreatedBy); }
-	void dtor(void) { CPlane::~CPlane(); }
-};
-
-STARTPATCHES
-	InjectHook(0x54B170, &CPlane_::ctor, PATCH_JUMP);
-	InjectHook(0x54B270, &CPlane_::dtor, PATCH_JUMP);
-	InjectHook(0x54B820, CPlane::InitPlanes, PATCH_JUMP);
-	InjectHook(0x54BCD0, CPlane::Shutdown, PATCH_JUMP);
-	InjectHook(0x54BD50, CPlane::LoadPath, PATCH_JUMP);
-	InjectHook(0x54BEC0, CPlane::UpdatePlanes, PATCH_JUMP);
-	InjectHook(0x54DE90, CPlane::TestRocketCollision, PATCH_JUMP);
-	InjectHook(0x54E000, CPlane::CreateIncomingCesna, PATCH_JUMP);
-	InjectHook(0x54E160, CPlane::CreateDropOffCesna, PATCH_JUMP);
-ENDPATCHES
diff --git a/src/vehicles/Train.cpp b/src/vehicles/Train.cpp
index 25be193c..0d1ff9b0 100644
--- a/src/vehicles/Train.cpp
+++ b/src/vehicles/Train.cpp
@@ -1,6 +1,6 @@
 #include "common.h"
 #include "main.h"
-#include "patcher.h"
+
 #include "Timer.h"
 #include "ModelIndices.h"
 #include "FileMgr.h"
@@ -691,32 +691,3 @@ CTrain::UpdateTrains(void)
 		time += 0x40000/4;
 	}
 }
-
-#include <new>
-
-class CTrain_ : public CTrain
-{
-public:
-	void ctor(int32 id, uint8 CreatedBy) { ::new (this) CTrain(id, CreatedBy); }
-	void SetModelIndex_(uint32 id) { CTrain::SetModelIndex(id); }
-	void ProcessControl_(void) { CTrain::ProcessControl(); }
-	void PreRender_(void) { CTrain::PreRender(); }
-	void Render_(void) { CTrain::Render(); }
-	void dtor(void) { CTrain::~CTrain(); }
-};
-
-STARTPATCHES
-	InjectHook(0x54E470, &CTrain_::SetModelIndex_, PATCH_JUMP);
-	InjectHook(0x54E4C0, &CTrain_::PreRender_, PATCH_JUMP);
-	InjectHook(0x54EAA0, &CTrain_::Render_, PATCH_JUMP);
-	InjectHook(0x54E450, &CTrain_::dtor, PATCH_JUMP);
-	InjectHook(0x54E2A0, &CTrain_::ctor, PATCH_JUMP);
-	InjectHook(0x550300, &CTrain::TrainHitStuff, PATCH_JUMP);
-	InjectHook(0x5504A0, &CTrain::AddPassenger, PATCH_JUMP);
-	InjectHook(0x550360, &CTrain::OpenTrainDoor, PATCH_JUMP);
-
-	InjectHook(0x54F000, CTrain::InitTrains, PATCH_JUMP);
-	InjectHook(0x54F360, CTrain::Shutdown, PATCH_JUMP);
-	InjectHook(0x54EAB0, CTrain::ReadAndInterpretTrackFile, PATCH_JUMP);
-	InjectHook(0x54F3A0, CTrain::UpdateTrains, PATCH_JUMP);
-ENDPATCHES
diff --git a/src/vehicles/Transmission.cpp b/src/vehicles/Transmission.cpp
index d500d004..5287055d 100644
--- a/src/vehicles/Transmission.cpp
+++ b/src/vehicles/Transmission.cpp
@@ -1,5 +1,5 @@
 #include "common.h"
-#include "patcher.h"
+
 #include "Timer.h"
 #include "HandlingMgr.h"
 #include "Transmission.h"
@@ -136,8 +136,3 @@ cTransmission::CalculateDriveAcceleration(const float &gasPedal, uint8 &gear, fl
 	}
 	return fAcceleration;
 }
-
-STARTPATCHES
-	InjectHook(0x550A00, &cTransmission::CalculateGearForSimpleCar, PATCH_JUMP);
-	InjectHook(0x5506B0, &cTransmission::CalculateDriveAcceleration, PATCH_JUMP);
-ENDPATCHES
diff --git a/src/vehicles/Vehicle.cpp b/src/vehicles/Vehicle.cpp
index ed8f4221..48c836f8 100644
--- a/src/vehicles/Vehicle.cpp
+++ b/src/vehicles/Vehicle.cpp
@@ -1,6 +1,6 @@
 #include "common.h"
 #include "main.h"
-#include "patcher.h"
+
 #include "General.h"
 #include "Timer.h"
 #include "Pad.h"
@@ -1015,49 +1015,4 @@ DestroyVehicleAndDriverAndPassengers(CVehicle* pVehicle)
 	}
 	CWorld::Remove(pVehicle);
 	delete pVehicle;
-}
-
-
-class CVehicle_ : public CVehicle
-{
-public:
-	void dtor(void) { CVehicle::~CVehicle(); }
-	void SetModelIndex_(uint32 id) { CVehicle::SetModelIndex(id); }
-	bool SetupLighting_(void) { return CVehicle::SetupLighting(); }
-	void RemoveLighting_(bool reset) { CVehicle::RemoveLighting(reset); }
-	float GetHeightAboveRoad_(void) { return CVehicle::GetHeightAboveRoad(); }
-};
-
-STARTPATCHES
-	InjectHook(0x551170, &CVehicle_::SetModelIndex_, PATCH_JUMP);
-	InjectHook(0x4A7DD0, &CVehicle_::SetupLighting_, PATCH_JUMP);
-	InjectHook(0x4A7E60, &CVehicle_::RemoveLighting_, PATCH_JUMP);
-	InjectHook(0x417E60, &CVehicle_::GetHeightAboveRoad_, PATCH_JUMP);
-
-	InjectHook(0x552BB0, &CVehicle::FlyingControl, PATCH_JUMP);
-	InjectHook(0x5512E0, &CVehicle::ProcessWheel, PATCH_JUMP);
-	InjectHook(0x551280, &CVehicle::ProcessWheelRotation, PATCH_JUMP);
-	InjectHook(0x552AF0, &CVehicle::ExtinguishCarFire, PATCH_JUMP);
-	InjectHook(0x551C90, &CVehicle::ProcessDelayedExplosion, PATCH_JUMP);
-	InjectHook(0x552880, &CVehicle::IsLawEnforcementVehicle, PATCH_JUMP);
-	InjectHook(0x552820, &CVehicle::ChangeLawEnforcerState, PATCH_JUMP);
-	InjectHook(0x552200, &CVehicle::UsesSiren, PATCH_JUMP);
-	InjectHook(0x5527E0, &CVehicle::IsVehicleNormal, PATCH_JUMP);
-	InjectHook(0x552B70, &CVehicle::CarHasRoof, PATCH_JUMP);
-	InjectHook(0x552230, &CVehicle::IsUpsideDown, PATCH_JUMP);
-	InjectHook(0x552260, &CVehicle::IsOnItsSide, PATCH_JUMP);
-	InjectHook(0x5511B0, &CVehicle::CanBeDeleted, PATCH_JUMP);
-	InjectHook(0x5522A0, &CVehicle::CanPedOpenLocks, PATCH_JUMP);
-	InjectHook(0x5522F0, &CVehicle::CanPedEnterCar, PATCH_JUMP);
-	InjectHook(0x5523C0, &CVehicle::CanPedExitCar, PATCH_JUMP);
-	InjectHook(0x5520C0, &CVehicle::SetUpDriver, PATCH_JUMP);
-	InjectHook(0x552160, &CVehicle::SetupPassenger, PATCH_JUMP);
-	InjectHook(0x551F20, &CVehicle::SetDriver, PATCH_JUMP);
-	InjectHook(0x551D90, (bool (CVehicle::*)(CPed*))&CVehicle::AddPassenger, PATCH_JUMP);
-	InjectHook(0x551E10, (bool (CVehicle::*)(CPed*,uint8))&CVehicle::AddPassenger, PATCH_JUMP);
-	InjectHook(0x5520A0, &CVehicle::RemoveDriver, PATCH_JUMP);
-	InjectHook(0x551EB0, &CVehicle::RemovePassenger, PATCH_JUMP);
-	InjectHook(0x5525A0, &CVehicle::ProcessCarAlarm, PATCH_JUMP);
-	InjectHook(0x552620, &CVehicle::IsSphereTouchingVehicle, PATCH_JUMP);
-	InjectHook(0x551950, &CVehicle::InflictDamage, PATCH_JUMP);
-ENDPATCHES
+}
\ No newline at end of file