7 files changed, 12 insertions, 98 deletions

diff --git a/src/weapons/BulletInfo.cpp b/src/weapons/BulletInfo.cpp
index 9e83a4ec..abf5c061 100644
--- a/src/weapons/BulletInfo.cpp
+++ b/src/weapons/BulletInfo.cpp
@@ -1,5 +1,5 @@
 #include "common.h"
-#include "patcher.h"
+
 #include "BulletInfo.h"
 
 #include "AnimBlendAssociation.h"
diff --git a/src/weapons/Explosion.cpp b/src/weapons/Explosion.cpp
index 02243702..d0a68279 100644
--- a/src/weapons/Explosion.cpp
+++ b/src/weapons/Explosion.cpp
@@ -1,5 +1,5 @@
 #include "common.h"
-#include "patcher.h"
+
 #include "Automobile.h"
 #include "Bike.h"
 #include "Camera.h"
@@ -457,17 +457,4 @@ CExplosion::RemoveAllExplosionsInArea(CVector pos, float radius)
 				gaExplosion[i].m_nIteration = 0;
 		}
 	}
-}
-
-STARTPATCHES
-	InjectHook(0x559030, &CExplosion::Initialise, PATCH_JUMP);
-	InjectHook(0x559100, &CExplosion::Shutdown, PATCH_JUMP);
-	InjectHook(0x559140, &CExplosion::GetExplosionActiveCounter, PATCH_JUMP);
-	InjectHook(0x559160, &CExplosion::ResetExplosionActiveCounter, PATCH_JUMP);
-	InjectHook(0x559180, &CExplosion::GetExplosionType, PATCH_JUMP);
-	InjectHook(0x5591A0, &CExplosion::GetExplosionPosition, PATCH_JUMP);
-	InjectHook(0x5591C0, &CExplosion::AddExplosion, PATCH_JUMP);
-	InjectHook(0x55A0C0, &CExplosion::Update, PATCH_JUMP);
-	InjectHook(0x55AC80, &CExplosion::TestForExplosionInArea, PATCH_JUMP);
-	InjectHook(0x55AD40, &CExplosion::RemoveAllExplosionsInArea, PATCH_JUMP);
-ENDPATCHES
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/weapons/ProjectileInfo.cpp b/src/weapons/ProjectileInfo.cpp
index 8f04278c..c174305c 100644
--- a/src/weapons/ProjectileInfo.cpp
+++ b/src/weapons/ProjectileInfo.cpp
@@ -1,5 +1,5 @@
 #include "common.h"
-#include "patcher.h"
+
 #include "Camera.h"
 #include "General.h"
 #include "Heli.h"
@@ -287,16 +287,3 @@ CProjectileInfo::RemoveIfThisIsAProjectile(CObject *object)
 	ms_apProjectile[i] = nil;
 	return true;
 }
-
-STARTPATCHES
-	InjectHook(0x55ADF0, CProjectileInfo::Initialise, PATCH_JUMP);
-	InjectHook(0x55AFF0, CProjectileInfo::Shutdown, PATCH_JUMP);
-	InjectHook(0x55B010, CProjectileInfo::GetProjectileInfo, PATCH_JUMP);
-	InjectHook(0x55B030, CProjectileInfo::AddProjectile, PATCH_JUMP);
-	InjectHook(0x55B700, CProjectileInfo::RemoveProjectile, PATCH_JUMP);
-	InjectHook(0x55B770, CProjectileInfo::RemoveNotAdd, PATCH_JUMP);
-	InjectHook(0x55B7C0, CProjectileInfo::Update, PATCH_JUMP);
-	InjectHook(0x55BA50, CProjectileInfo::IsProjectileInRange, PATCH_JUMP);
-	InjectHook(0x55BB80, CProjectileInfo::RemoveAllProjectiles, PATCH_JUMP);
-	InjectHook(0x55BBD0, CProjectileInfo::RemoveIfThisIsAProjectile, PATCH_JUMP);
-ENDPATCHES
diff --git a/src/weapons/ShotInfo.cpp b/src/weapons/ShotInfo.cpp
index 1eae5e87..83ce2a02 100644
--- a/src/weapons/ShotInfo.cpp
+++ b/src/weapons/ShotInfo.cpp
@@ -1,5 +1,5 @@
 #include "common.h"
-#include "patcher.h"
+
 #include "ShotInfo.h"
 #include "Entity.h"
 #include "Weapon.h"
@@ -128,11 +128,4 @@ CShotInfo::Update()
 		if (!((CTimer::GetFrameCounter() + slot) & 3))
 			CWorld::SetCarsOnFire(shot.m_startPos.x, shot.m_startPos.y, shot.m_startPos.z, 4.0f, shot.m_sourceEntity);
 	}
-}
-
-STARTPATCHES
-	InjectHook(0x55BFF0, &CShotInfo::Update, PATCH_JUMP);
-	InjectHook(0x55BD70, &CShotInfo::AddShot, PATCH_JUMP);
-	InjectHook(0x55BC60, &CShotInfo::Initialise, PATCH_JUMP);
-	InjectHook(0x55BD50, &CShotInfo::Shutdown, PATCH_JUMP);
-ENDPATCHES
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/weapons/Weapon.cpp b/src/weapons/Weapon.cpp
index 98154e93..276693e8 100644
--- a/src/weapons/Weapon.cpp
+++ b/src/weapons/Weapon.cpp
@@ -1,5 +1,5 @@
 #include "common.h"
-#include "patcher.h"
+
 #include "Weapon.h"
 #include "AnimBlendAssociation.h"
 #include "AudioManager.h"
@@ -2255,38 +2255,4 @@ bool
 CWeapon::ProcessLineOfSight(CVector const &point1, CVector const &point2, CColPoint &point, CEntity *&entity, eWeaponType type, CEntity *shooter, bool checkBuildings, bool checkVehicles, bool checkPeds, bool checkObjects, bool checkDummies, bool ignoreSeeThrough, bool ignoreSomeObjects)
 {
 	return CWorld::ProcessLineOfSight(point1, point2, point, entity, checkBuildings, checkVehicles, checkPeds, checkObjects, checkDummies, ignoreSeeThrough, ignoreSomeObjects);
-}
-
-STARTPATCHES
-
-	InjectHook(0x55C2D0, CWeapon::InitialiseWeapons, PATCH_JUMP);
-	InjectHook(0x55C2F0, CWeapon::ShutdownWeapons, PATCH_JUMP);
-	InjectHook(0x55C310, CWeapon::UpdateWeapons, PATCH_JUMP);
-	InjectHook(0x55C330, &CWeapon::Initialise, PATCH_JUMP);
-	InjectHook(0x55C380, &CWeapon::Fire, PATCH_JUMP);
-	InjectHook(0x55C940, &CWeapon::FireFromCar, PATCH_JUMP);
-	InjectHook(0x55CA20, &CWeapon::FireMelee, PATCH_JUMP);
-	InjectHook(0x55D2E0, &CWeapon::FireInstantHit, PATCH_JUMP);
-	InjectHook(0x55F770, &CWeapon::AddGunshell, PATCH_JUMP);
-	InjectHook(0x55F950, &CWeapon::DoBulletImpact, PATCH_JUMP);
-	InjectHook(0x560620, &CWeapon::FireShotgun, PATCH_JUMP);
-	InjectHook(0x561900, &CWeapon::FireProjectile, PATCH_JUMP);
-	InjectHook(0x561C70, CWeapon::GenerateFlameThrowerParticles, PATCH_JUMP);
-	InjectHook(0x561E00, &CWeapon::FireAreaEffect, PATCH_JUMP);
-	InjectHook(0x561FE0, &CWeapon::FireSniper, PATCH_JUMP);
-	InjectHook(0x562180, &CWeapon::FireM16_1stPerson, PATCH_JUMP);
-	InjectHook(0x5624D0, &CWeapon::FireInstantHitFromCar, PATCH_JUMP);
-	InjectHook(0x562EB0, CWeapon::DoDoomAiming, PATCH_JUMP);
-	InjectHook(0x563200, CWeapon::DoTankDoomAiming, PATCH_JUMP);
-	InjectHook(0x563660, CWeapon::DoDriveByAutoAiming, PATCH_JUMP);
-	InjectHook(0x5639D0, &CWeapon::Reload, PATCH_JUMP);
-	InjectHook(0x563A10, &CWeapon::Update, PATCH_JUMP);
-	InjectHook(0x563FB0, &CWeapon::IsTypeMelee, PATCH_JUMP);
-	InjectHook(0x563FD0, &CWeapon::IsType2Handed, PATCH_JUMP);
-	InjectHook(0x564680, CWeapon::MakePedsJumpAtShot, PATCH_JUMP);
-	InjectHook(0x564890, &CWeapon::HitsGround, PATCH_JUMP);
-	InjectHook(0x564A60, CWeapon::BlowUpExplosiveThings, PATCH_JUMP);
-	InjectHook(0x564B80, &CWeapon::HasWeaponAmmoToBeUsed, PATCH_JUMP);
-	InjectHook(0x564C00, CWeapon::ProcessLineOfSight, PATCH_JUMP);
-
-ENDPATCHES
+}
\ No newline at end of file
diff --git a/src/weapons/WeaponEffects.cpp b/src/weapons/WeaponEffects.cpp
index 2ed9e662..f7e50f78 100644
--- a/src/weapons/WeaponEffects.cpp
+++ b/src/weapons/WeaponEffects.cpp
@@ -1,5 +1,5 @@
 #include "common.h"
-#include "patcher.h"
+
 #include "WeaponEffects.h"
 #include "TxdStore.h"
 #include "Sprite.h"
@@ -93,14 +93,4 @@ CWeaponEffects::Render(void)
 		RwRenderStateSet(rwRENDERSTATESRCBLEND,          (void *)rwBLENDSRCALPHA);
 		RwRenderStateSet(rwRENDERSTATEDESTBLEND,         (void *)rwBLENDINVSRCALPHA);
 	}
-}
-
-STARTPATCHES
-	//InjectHook(0x564C40, CWeaponEffects::CWeaponEffects, PATCH_JUMP);
-	//InjectHook(0x564C50, CWeaponEffects::~CWeaponEffects, PATCH_JUMP);
-	InjectHook(0x564C60, CWeaponEffects::Init, PATCH_JUMP);
-	InjectHook(0x564CF0, CWeaponEffects::Shutdown, PATCH_JUMP);
-	InjectHook(0x564D00, CWeaponEffects::MarkTarget, PATCH_JUMP);
-	InjectHook(0x564D60, CWeaponEffects::ClearCrossHair, PATCH_JUMP);
-	InjectHook(0x564D70, CWeaponEffects::Render, PATCH_JUMP);
-ENDPATCHES
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/weapons/WeaponInfo.cpp b/src/weapons/WeaponInfo.cpp
index dca120a3..aec9c69a 100644
--- a/src/weapons/WeaponInfo.cpp
+++ b/src/weapons/WeaponInfo.cpp
@@ -1,5 +1,5 @@
 #include "common.h"
-#include "patcher.h"
+
 #include "main.h"
 #include "FileMgr.h"
 #include "WeaponInfo.h"
@@ -201,13 +201,4 @@ CWeaponInfo::Shutdown(void)
 {
 	debug("Shutting down CWeaponInfo...\n");
 	debug("CWeaponInfo shut down\n");
-}
-
-STARTPATCHES
-	InjectHook(0x564EA0, &CWeaponInfo::Initialise, PATCH_JUMP);
-	InjectHook(0x564FD0, &CWeaponInfo::GetWeaponInfo, PATCH_JUMP);
-	InjectHook(0x5653E0, &CWeaponInfo::FindWeaponType, PATCH_JUMP);
-	InjectHook(0x5653B0, &CWeaponInfo::FindWeaponFireType, PATCH_JUMP);
-	InjectHook(0x564FE0, &CWeaponInfo::LoadWeaponData, PATCH_JUMP);
-	InjectHook(0x564FB0, &CWeaponInfo::Shutdown, PATCH_JUMP);
-ENDPATCHES
\ No newline at end of file
+}
\ No newline at end of file