14 files changed, 5 insertions, 423 deletions

diff --git a/src/control/AutoPilot.cpp b/src/control/AutoPilot.cpp
index e3d5c9e9..70099291 100644
--- a/src/control/AutoPilot.cpp
+++ b/src/control/AutoPilot.cpp
@@ -6,9 +6,6 @@
 #include "Curves.h"
 #include "PathFind.h"
 
-#if 0
-WRAPPER void CAutoPilot::ModifySpeed(float) { EAXJMP(0x4137B0); }
-#else
 void CAutoPilot::ModifySpeed(float speed)
 {
 	m_fMaxTrafficSpeed = max(0.01f, speed);
@@ -41,7 +38,6 @@ void CAutoPilot::ModifySpeed(float speed)
 	m_nTimeEnteredCurve = CTimer::GetTimeInMilliseconds() - positionBetweenNodes * m_nSpeedScaleFactor;
 #endif
 }
-#endif
 
 void CAutoPilot::RemoveOnePathNode()
 {
diff --git a/src/control/CarCtrl.cpp b/src/control/CarCtrl.cpp
index 07ba2e3c..3174a253 100644
--- a/src/control/CarCtrl.cpp
+++ b/src/control/CarCtrl.cpp
@@ -881,9 +881,7 @@ CCarCtrl::SlowCarOnRailsDownForTrafficAndLights(CVehicle* pVehicle)
 			pVehicle->AutoPilot.ModifySpeed(max(maxSpeed, curSpeed - 0.5f * CTimer::GetTimeStep()));
 	}
 }
-#if 0
-WRAPPER void CCarCtrl::SlowCarDownForPedsSectorList(CPtrList&, CVehicle*, float, float, float, float, float*, float) { EAXJMP(0x419300); }
-#else
+
 void CCarCtrl::SlowCarDownForPedsSectorList(CPtrList& lst, CVehicle* pVehicle, float x_inf, float y_inf, float x_sup, float y_sup, float* pSpeed, float curSpeed)
 {
 	float frontOffset = pVehicle->GetModelInfo()->GetColModel()->boundingBox.max.y;
@@ -991,7 +989,6 @@ void CCarCtrl::SlowCarDownForPedsSectorList(CPtrList& lst, CVehicle* pVehicle, f
 		}
 	}
 }
-#endif
 
 void CCarCtrl::SlowCarDownForCarsSectorList(CPtrList& lst, CVehicle* pVehicle, float x_inf, float y_inf, float x_sup, float y_sup, float* pSpeed, float curSpeed)
 {
@@ -1055,9 +1052,6 @@ void CCarCtrl::SlowCarDownForOtherCar(CEntity* pOtherEntity, CVehicle* pVehicle,
 	}
 }
 
-#if 0
-WRAPPER float CCarCtrl::TestCollisionBetween2MovingRects(CVehicle* pVehicleA, CVehicle* pVehicleB, float projectionX, float projectionY, CVector* pForwardA, CVector* pForwardB, uint8 id) { EAXJMP(0x41A020); }
-#else
 float CCarCtrl::TestCollisionBetween2MovingRects(CVehicle* pVehicleA, CVehicle* pVehicleB, float projectionX, float projectionY, CVector* pForwardA, CVector* pForwardB, uint8 id)
 {
 	CVector2D vecBToA = pVehicleA->GetPosition() - pVehicleB->GetPosition();
@@ -1180,7 +1174,6 @@ float CCarCtrl::TestCollisionBetween2MovingRects(CVehicle* pVehicleA, CVehicle*
 	}
 	return proximity;
 }
-#endif
 
 float CCarCtrl::FindAngleToWeaveThroughTraffic(CVehicle* pVehicle, CPhysical* pTarget, float angleToTarget, float angleForward)
 {
diff --git a/src/control/Curves.cpp b/src/control/Curves.cpp
index c5f64bf7..5c6ef06d 100644
--- a/src/control/Curves.cpp
+++ b/src/control/Curves.cpp
@@ -2,9 +2,6 @@
 #include "patcher.h"
 #include "Curves.h"
 
-#if 0
-WRAPPER float CCurves::CalcSpeedScaleFactor(CVector*, CVector*, float, float, float, float) { EAXJMP(0x420410); }
-#else
 float CCurves::CalcSpeedScaleFactor(CVector* pPoint1, CVector* pPoint2, float dir1X, float dir1Y, float dir2X, float dir2Y)
 {
 	CVector2D dir1(dir1X, dir1Y);
@@ -16,11 +13,7 @@ float CCurves::CalcSpeedScaleFactor(CVector* pPoint1, CVector* pPoint2, float di
 	else
 		return ((1.0f - dp) * 0.2f + 1.0f) * distance;
 }
-#endif
 
-#if 0
-WRAPPER void CCurves::CalcCurvePoint(CVector*, CVector*, CVector*, CVector*, float, int32, CVector*, CVector*) { EAXJMP(0x4204D0); }
-#else
 void CCurves::CalcCurvePoint(CVector* pPos1, CVector* pPos2, CVector* pDir1, CVector* pDir2, float between, int32 timeOnCurve, CVector* pOutPos, CVector* pOutDir)
 {
 	float actualFactor = CalcSpeedScaleFactor(pPos1, pPos2, pDir1->x, pDir1->y, pDir2->x, pDir2->y);
@@ -35,5 +28,4 @@ void CCurves::CalcCurvePoint(CVector* pPos1, CVector* pPos2, CVector* pDir1, CVe
 		(dir1.x * (1.0f - curveCoef) + dir2.x * curveCoef) / (timeOnCurve * 0.001f),
 		(dir1.y * (1.0f - curveCoef) + dir2.y * curveCoef) / (timeOnCurve * 0.001f),
 		0.0f);
-}
-#endif
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/control/Darkel.cpp b/src/control/Darkel.cpp
index ec1b887e..b4d15abf 100644
--- a/src/control/Darkel.cpp
+++ b/src/control/Darkel.cpp
@@ -162,9 +162,6 @@ CDarkel::ReadStatus()
 	return Status;
 }
 
-#if 0
-WRAPPER void CDarkel::RegisterCarBlownUpByPlayer(CVehicle *vehicle) { EAXJMP(0x421070); }
-#else
 void
 CDarkel::RegisterCarBlownUpByPlayer(CVehicle *vehicle)
 {
@@ -178,11 +175,7 @@ CDarkel::RegisterCarBlownUpByPlayer(CVehicle *vehicle)
 	RegisteredKills[vehicle->GetModelIndex()]++;
 	CStats::CarsExploded++;
 }
-#endif
 
-#if 0
-WRAPPER void CDarkel::RegisterKillByPlayer(CPed *victim, eWeaponType weapontype, bool headshot) { EAXJMP(0x420F60); }
-#else
 void
 CDarkel::RegisterKillByPlayer(CPed *victim, eWeaponType weapon, bool headshot)
 {
@@ -207,7 +200,6 @@ CDarkel::RegisterKillByPlayer(CPed *victim, eWeaponType weapon, bool headshot)
 		CStats::HeadsPopped++;
 	CStats::KillsSinceLastCheckpoint++;
 }
-#endif
 
 void
 CDarkel::RegisterKillNotByPlayer(CPed* victim, eWeaponType weapontype)
@@ -222,9 +214,6 @@ CDarkel::ResetModelsKilledByPlayer()
 		RegisteredKills[i] = 0;
 }
 
-#if 0
-WRAPPER void CDarkel::ResetOnPlayerDeath() { EAXJMP(0x420E70); }
-#else
 void
 CDarkel::ResetOnPlayerDeath()
 {
@@ -253,11 +242,7 @@ CDarkel::ResetOnPlayerDeath()
 		player->MakeChangesForNewWeapon(player->m_currentWeapon);
 	}
 }
-#endif
 
-#if 0
-WRAPPER void CDarkel::StartFrenzy(eWeaponType weaponType, int32 time, uint16 kill, int32 modelId0, wchar *text, int32 modelId2, int32 modelId3, int32 modelId4, bool standardSound, bool needHeadShot) { EAXJMP(0x4210E0); }
-#else
 void
 CDarkel::StartFrenzy(eWeaponType weaponType, int32 time, uint16 kill, int32 modelId0, wchar *text, int32 modelId2, int32 modelId3, int32 modelId4, bool standardSound, bool needHeadShot)
 {
@@ -306,7 +291,6 @@ CDarkel::StartFrenzy(eWeaponType weaponType, int32 time, uint16 kill, int32 mode
 	if (CDarkel::bStandardSoundAndMessages)
 		DMAudio.PlayFrontEndSound(SOUND_RAMPAGE_START, 0);
 }
-#endif
 
 void
 CDarkel::Update()
diff --git a/src/control/Replay.cpp b/src/control/Replay.cpp
index 3c0393aa..2e325249 100644
--- a/src/control/Replay.cpp
+++ b/src/control/Replay.cpp
@@ -113,9 +113,6 @@ static void(*CBArray_RE3[])(CAnimBlendAssociation*, void*) =
 	&CPed::PedLandCB, &FinishFuckUCB, &CPed::RestoreHeadingRateCB, &CPed::PedSetQuickDraggedOutCarPositionCB, &CPed::PedSetDraggedOutCarPositionCB
 };
 
-#if 0
-WRAPPER uint8 FindCBFunctionID(void(*f)(CAnimBlendAssociation*, void*)) { EAXJMP(0x584E70); }
-#else
 static uint8 FindCBFunctionID(void(*f)(CAnimBlendAssociation*, void*))
 {
 	for (int i = 0; i < sizeof(CBArray) / sizeof(*CBArray); i++){
@@ -128,16 +125,12 @@ static uint8 FindCBFunctionID(void(*f)(CAnimBlendAssociation*, void*))
 	}
 	return 0;
 }
-#endif
 
 static void(*FindCBFunction(uint8 id))(CAnimBlendAssociation*, void*)
 {
 	return CBArray_RE3[id];
 }
 
-#if 0
-WRAPPER static void ApplyPanelDamageToCar(uint32, CAutomobile*, bool) { EAXJMP(0x584EA0); }
-#else
 static void ApplyPanelDamageToCar(uint32 panels, CAutomobile* vehicle, bool flying)
 {
 	if(vehicle->Damage.GetPanelStatus(VEHPANEL_FRONT_LEFT) != CDamageManager::GetPanelStatus(panels, VEHPANEL_FRONT_LEFT)){
@@ -169,7 +162,6 @@ static void ApplyPanelDamageToCar(uint32 panels, CAutomobile* vehicle, bool flyi
 		vehicle->SetPanelDamage(CAR_BUMP_REAR, VEHBUMPER_REAR, flying);
 	}
 }
-#endif
 
 void PrintElementsInPtrList(void) 
 {
@@ -262,9 +254,6 @@ void CReplay::Update(void)
 	}
 }
 
-#if 0
-WRAPPER void CReplay::RecordThisFrame(void) { EAXJMP(0x5932B0); }
-#else
 void CReplay::RecordThisFrame(void)
 {
 #ifdef FIX_REPLAY_BUGS
@@ -377,11 +366,7 @@ void CReplay::RecordThisFrame(void)
 	MarkEverythingAsNew();
 #endif
 }
-#endif
 
-#if 0
-WRAPPER void CReplay::StorePedUpdate(CPed *ped, int id) { EAXJMP(0x5935B0); }
-#else
 void CReplay::StorePedUpdate(CPed *ped, int id)
 {
 	tPedUpdatePacket* pp = (tPedUpdatePacket*)&Record.m_pBase[Record.m_nOffset];
@@ -399,11 +384,7 @@ void CReplay::StorePedUpdate(CPed *ped, int id)
 	StorePedAnimation(ped, &pp->anim_state);
 	Record.m_nOffset += sizeof(tPedUpdatePacket);
 }
-#endif
 
-#if 0
-WRAPPER void CReplay::StorePedAnimation(CPed *ped, CStoredAnimationState *state) { EAXJMP(0x593670); }
-#else
 void CReplay::StorePedAnimation(CPed *ped, CStoredAnimationState *state)
 {
 	CAnimBlendAssociation* second;
@@ -442,11 +423,7 @@ void CReplay::StorePedAnimation(CPed *ped, CStoredAnimationState *state)
 		state->partBlendAmount = 0;
 	}
 }
-#endif
 
-#if 0
-WRAPPER void CReplay::StoreDetailedPedAnimation(CPed *ped, CStoredDetailedAnimationState *state) { EAXJMP(0x593BB0); }
-#else
 void CReplay::StoreDetailedPedAnimation(CPed *ped, CStoredDetailedAnimationState *state)
 {
 	for (int i = 0; i < NUM_MAIN_ANIMS_IN_REPLAY; i++){
@@ -503,10 +480,7 @@ void CReplay::StoreDetailedPedAnimation(CPed *ped, CStoredDetailedAnimationState
 		}
 	}
 }
-#endif
-#if 0
-WRAPPER void CReplay::ProcessPedUpdate(CPed *ped, float interpolation, CAddressInReplayBuffer *buffer) { EAXJMP(0x594050); }
-#else
+
 void CReplay::ProcessPedUpdate(CPed *ped, float interpolation, CAddressInReplayBuffer *buffer)
 {
 	tPedUpdatePacket *pp = (tPedUpdatePacket*)&buffer->m_pBase[buffer->m_nOffset];
@@ -543,11 +517,7 @@ void CReplay::ProcessPedUpdate(CPed *ped, float interpolation, CAddressInReplayB
 	CWorld::Add(ped);
 	buffer->m_nOffset += sizeof(tPedUpdatePacket);
 }
-#endif
 
-#if 0
-WRAPPER void CReplay::RetrievePedAnimation(CPed *ped, CStoredAnimationState *state) { EAXJMP(0x5942A0); }
-#else
 void CReplay::RetrievePedAnimation(CPed *ped, CStoredAnimationState *state)
 {
 	CAnimBlendAssociation* anim1 = CAnimManager::BlendAnimation(
@@ -585,11 +555,7 @@ void CReplay::RetrievePedAnimation(CPed *ped, CStoredAnimationState *state)
 		}
 	}
 }
-#endif
 
-#if 0
-WRAPPER void CReplay::RetrieveDetailedPedAnimation(CPed *ped, CStoredDetailedAnimationState *state) { EAXJMP(0x5944B0); }
-#else
 void CReplay::RetrieveDetailedPedAnimation(CPed *ped, CStoredDetailedAnimationState *state)
 {
 #ifdef FIX_REPLAY_BUGS
@@ -658,11 +624,7 @@ void CReplay::RetrieveDetailedPedAnimation(CPed *ped, CStoredDetailedAnimationSt
 			anim->SetDeleteCallback(FindCBFunction(callback & 0x7F), ped);
 	}
 }
-#endif
 
-#if 0
-WRAPPER void CReplay::PlaybackThisFrame(void) { EAXJMP(0x5946B0); }
-#else
 void CReplay::PlaybackThisFrame(void)
 {
 	static int FrameSloMo = 0;
@@ -687,7 +649,6 @@ void CReplay::PlaybackThisFrame(void)
 	DMAudio.SetEffectsFadeVol(0);
 	DMAudio.SetMusicFadeVol(0);
 }
-#endif
 
 // next two functions are only found in mobile version
 // most likely they were optimized out for being unused
@@ -712,9 +673,6 @@ bool CReplay::FastForwardToTime(uint32 start)
 	return true;
 }
 
-#if 0
-WRAPPER void CReplay::StoreCarUpdate(CVehicle *vehicle, int id) { EAXJMP(0x5947F0); }
-#else
 void CReplay::StoreCarUpdate(CVehicle *vehicle, int id)
 {
 	tVehicleUpdatePacket* vp = (tVehicleUpdatePacket*)&Record.m_pBase[Record.m_nOffset];
@@ -750,11 +708,7 @@ void CReplay::StoreCarUpdate(CVehicle *vehicle, int id)
 	}
 	Record.m_nOffset += sizeof(tVehicleUpdatePacket);
 }
-#endif
 
-#if 0
-WRAPPER void CReplay::ProcessCarUpdate(CVehicle *vehicle, float interpolation, CAddressInReplayBuffer *buffer) { EAXJMP(0x594D10); }
-#else
 void CReplay::ProcessCarUpdate(CVehicle *vehicle, float interpolation, CAddressInReplayBuffer *buffer)
 {
 	tVehicleUpdatePacket* vp = (tVehicleUpdatePacket*)&buffer->m_pBase[buffer->m_nOffset];
@@ -824,11 +778,7 @@ void CReplay::ProcessCarUpdate(CVehicle *vehicle, float interpolation, CAddressI
 			((CBoat*)vehicle)->m_bIsAnchored = false;
 	}
 }
-#endif
 
-#if 0
-WRAPPER bool CReplay::PlayBackThisFrameInterpolation(CAddressInReplayBuffer *buffer, float interpolation, uint32 *pTimer) { EAXJMP(0x595240); }
-#else
 bool CReplay::PlayBackThisFrameInterpolation(CAddressInReplayBuffer *buffer, float interpolation, uint32 *pTimer){
 	/* Mistake. Not even sure what this is even doing here...
 	 * PlayerWanted is a backup to restore at the end of replay.
@@ -1028,10 +978,7 @@ bool CReplay::PlayBackThisFrameInterpolation(CAddressInReplayBuffer *buffer, flo
 	ProcessReplayCamera();
 	return false;
 }
-#endif
-#if 0
-WRAPPER void CReplay::FinishPlayback(void) { EAXJMP(0x595B20); }
-#else
+
 void CReplay::FinishPlayback(void)
 {
 	if (Mode != MODE_PLAYBACK)
@@ -1053,11 +1000,7 @@ void CReplay::FinishPlayback(void)
 	DMAudio.SetEffectsFadeVol(127);
 	DMAudio.SetMusicFadeVol(127);
 }
-#endif
 
-#if 0
-WRAPPER void CReplay::EmptyReplayBuffer(void) { EAXJMP(0x595BD0); }
-#else
 void CReplay::EmptyReplayBuffer(void)
 {
 	if (Mode == MODE_PLAYBACK)
@@ -1072,11 +1015,7 @@ void CReplay::EmptyReplayBuffer(void)
 	Record.m_pBase[Record.m_nOffset] = 0;
 	MarkEverythingAsNew();
 }
-#endif
 
-#if 0
-WRAPPER void CReplay::ProcessReplayCamera(void) { EAXJMP(0x595C40); }
-#else
 void CReplay::ProcessReplayCamera(void)
 {
 	switch (CameraMode) {
@@ -1120,11 +1059,7 @@ void CReplay::ProcessReplayCamera(void)
 	RwMatrixUpdate(RwFrameGetMatrix(RwCameraGetFrame(TheCamera.m_pRwCamera)));
 	RwFrameUpdateObjects(RwCameraGetFrame(TheCamera.m_pRwCamera));
 }
-#endif
 
-#if 0
-WRAPPER void CReplay::TriggerPlayback(uint8 cam_mode, float cam_x, float cam_y, float cam_z, bool load_scene) { EAXJMP(0x596030); }
-#else
 void CReplay::TriggerPlayback(uint8 cam_mode, float cam_x, float cam_y, float cam_z, bool load_scene)
 {
 	if (Mode != MODE_RECORD)
@@ -1174,11 +1109,7 @@ void CReplay::TriggerPlayback(uint8 cam_mode, float cam_x, float cam_y, float ca
 	if (cam_mode == REPLAYCAMMODE_ASSTORED)
 		TheCamera.CarZoomIndicator = 5.0f;
 }
-#endif
 
-#if 0
-WRAPPER void CReplay::StoreStuffInMem(void) { EAXJMP(0x5961F0); }
-#else
 void CReplay::StoreStuffInMem(void)
 {
 	CPools::GetVehiclePool()->Store(pBuf0, pBuf1);
@@ -1223,11 +1154,7 @@ void CReplay::StoreStuffInMem(void)
 			StoreDetailedPedAnimation(ped, &pPedAnims[i]);
 	}
 }
-#endif
 
-#if 0
-WRAPPER void CReplay::RestoreStuffFromMem(void) { EAXJMP(0x5966E0); }
-#else
 void CReplay::RestoreStuffFromMem(void)
 {
 	CPools::GetVehiclePool()->CopyBack(pBuf0, pBuf1);
@@ -1388,11 +1315,7 @@ void CReplay::RestoreStuffFromMem(void)
 	DMAudio.SetRadioInCar(OldRadioStation);
 	DMAudio.ChangeMusicMode(MUSICMODE_GAME);
 }
-#endif
 
-#if 0
-WRAPPER void CReplay::EmptyPedsAndVehiclePools(void) { EAXJMP(0x5970E0); }
-#else
 void CReplay::EmptyPedsAndVehiclePools(void)
 {
 	int i = CPools::GetVehiclePool()->GetSize();
@@ -1412,11 +1335,7 @@ void CReplay::EmptyPedsAndVehiclePools(void)
 		delete p;
 	}
 }
-#endif
 
-#if 0
-WRAPPER void CReplay::EmptyAllPools(void) { EAXJMP(0x5971B0); }
-#else
 void CReplay::EmptyAllPools(void)
 {
 	EmptyPedsAndVehiclePools();
@@ -1437,11 +1356,7 @@ void CReplay::EmptyAllPools(void)
 		delete d;
 	}
 }
-#endif
 
-#if 0
-WRAPPER void CReplay::MarkEverythingAsNew(void) { EAXJMP(0x597280); }
-#else
 void CReplay::MarkEverythingAsNew(void)
 {
 	int i = CPools::GetVehiclePool()->GetSize();
@@ -1459,11 +1374,7 @@ void CReplay::MarkEverythingAsNew(void)
 		p->bHasAlreadyBeenRecorded = false;
 	}
 }
-#endif
 
-#if 0
-WRAPPER void CReplay::SaveReplayToHD(void) { EAXJMP(0x597330); }
-#else
 void CReplay::SaveReplayToHD(void)
 {
 	CFileMgr::SetDirMyDocuments();
@@ -1494,11 +1405,7 @@ void CReplay::SaveReplayToHD(void)
 	CFileMgr::CloseFile(fw);
 	CFileMgr::SetDir("");
 }
-#endif
 
-#if 0
-WRAPPER void PlayReplayFromHD(void) { EAXJMP(0x597420); }
-#else
 void PlayReplayFromHD(void)
 {
 	CFileMgr::SetDirMyDocuments();
@@ -1530,11 +1437,7 @@ void PlayReplayFromHD(void)
 	CReplay::bAllowLookAroundCam = true;
 	CReplay::StreamAllNecessaryCarsAndPeds();
 }
-#endif
 
-#if 0
-WRAPPER void CReplay::StreamAllNecessaryCarsAndPeds(void) { EAXJMP(0x597560); }
-#else
 void CReplay::StreamAllNecessaryCarsAndPeds(void)
 {
 	for (int slot = 0; slot < NUM_REPLAYBUFFERS; slot++) {
@@ -1555,11 +1458,7 @@ void CReplay::StreamAllNecessaryCarsAndPeds(void)
 	}
 	CStreaming::LoadAllRequestedModels(false);
 }
-#endif
 
-#if 0
-WRAPPER void CReplay::FindFirstFocusCoordinate(CVector *coord) { EAXJMP(0x5975E0); }
-#else
 void CReplay::FindFirstFocusCoordinate(CVector *coord)
 {
 	*coord = CVector(0.0f, 0.0f, 0.0f);
@@ -1574,11 +1473,7 @@ void CReplay::FindFirstFocusCoordinate(CVector *coord)
 		}
 	}
 }
-#endif
 
-#if 0
-WRAPPER bool CReplay::ShouldStandardCameraBeProcessed(void) { EAXJMP(0x597680); }
-#else
 bool CReplay::ShouldStandardCameraBeProcessed(void)
 {
 	if (Mode != MODE_PLAYBACK)
@@ -1587,11 +1482,7 @@ bool CReplay::ShouldStandardCameraBeProcessed(void)
 		return false;
 	return FindPlayerVehicle() != nil;
 }
-#endif
 
-#if 0
-WRAPPER void CReplay::ProcessLookAroundCam(void) { EAXJMP(0x5976C0); }
-#else
 void CReplay::ProcessLookAroundCam(void)
 {
 	if (!bAllowLookAroundCam)
@@ -1647,11 +1538,7 @@ void CReplay::ProcessLookAroundCam(void)
 	RwMatrixUpdate(RwFrameGetMatrix(RwCameraGetFrame(TheCamera.m_pRwCamera)));
 	RwFrameUpdateObjects(RwCameraGetFrame(TheCamera.m_pRwCamera));
 }
-#endif
 
-#if 0
-WRAPPER size_t CReplay::FindSizeOfPacket(uint8 type) { EAXJMP(0x597CC0); }
-#else
 size_t CReplay::FindSizeOfPacket(uint8 type)
 {
 	switch (type) {
@@ -1669,11 +1556,7 @@ size_t CReplay::FindSizeOfPacket(uint8 type)
 	}
 	return 0;
 }
-#endif
 
-#if 0
-WRAPPER void CReplay::Display(void) { EAXJMP(0x595EE0); }
-#else
 void CReplay::Display()
 {
 	static int TimeCount = 0;
@@ -1691,7 +1574,6 @@ void CReplay::Display()
 	if (Mode == MODE_PLAYBACK)
 		CFont::PrintString(SCREEN_SCALE_X(63.5f), SCREEN_SCALE_Y(30.0f), TheText.Get("REPLAY"));
 }
-#endif
 
 STARTPATCHES
 InjectHook(0x592FE0, &CReplay::Init, PATCH_JUMP);
diff --git a/src/control/Script.cpp b/src/control/Script.cpp
index 14f55734..5e83ce21 100644
--- a/src/control/Script.cpp
+++ b/src/control/Script.cpp
@@ -2842,9 +2842,6 @@ int8 CRunningScript::ProcessCommands200To299(int32 command)
 	return -1;
 }
 
-#if 0
-WRAPPER int8 CRunningScript::ProcessCommand300To399(int32 command) { EAXJMP(0x43ED30); }
-#else
 int8 CRunningScript::ProcessCommands300To399(int32 command)
 {
 	switch (command) {
@@ -3576,11 +3573,7 @@ int8 CRunningScript::ProcessCommands300To399(int32 command)
 	}
 	return -1;
 }
-#endif
 
-#if 0
-WRAPPER int8 CRunningScript::ProcessCommands400To499(int32 command) { EAXJMP(0x440CB0); }
-#else
 int8 CRunningScript::ProcessCommands400To499(int32 command)
 {
 	switch (command) {
@@ -4370,11 +4363,7 @@ int8 CRunningScript::ProcessCommands400To499(int32 command)
 	}
 	return -1;
 }
-#endif
 
-#if 0
-WRAPPER int8 CRunningScript::ProcessCommands500To599(int32 command) { EAXJMP(0x4429C0); }
-#else
 int8 CRunningScript::ProcessCommands500To599(int32 command)
 {
 	switch (command) {
@@ -5201,11 +5190,7 @@ int8 CRunningScript::ProcessCommands500To599(int32 command)
 	}
 	return -1;
 }
-#endif
 
-#if 0
-WRAPPER int8 CRunningScript::ProcessCommands600To699(int32 command) { EAXJMP(0x444B20); }
-#else
 int8 CRunningScript::ProcessCommands600To699(int32 command)
 {
 	switch (command){
@@ -5559,11 +5544,7 @@ int8 CRunningScript::ProcessCommands600To699(int32 command)
 	}
 	return -1;
 }
-#endif
 
-#if 0
-WRAPPER int8 CRunningScript::ProcessCommands700To799(int32 command) { EAXJMP(0x4458A0); }
-#else
 int8 CRunningScript::ProcessCommands700To799(int32 command)
 {
 	switch (command){
@@ -6429,11 +6410,6 @@ int8 CRunningScript::ProcessCommands700To799(int32 command)
 	}
 	return -1;
 }
-#endif
-
-#if 0
-WRAPPER int8 CRunningScript::ProcessCommands800To899(int32 command) { EAXJMP(0x448240); }
-#else
 int8 CRunningScript::ProcessCommands800To899(int32 command)
 {
 	CMatrix tmp_matrix;
@@ -7515,11 +7491,7 @@ int8 CRunningScript::ProcessCommands800To899(int32 command)
 	}
 	return -1;
 }
-#endif
 
-#if 0
-WRAPPER int8 CRunningScript::ProcessCommands900To999(int32 command) { EAXJMP(0x44CB80); }
-#else
 int8 CRunningScript::ProcessCommands900To999(int32 command)
 {
 	char str[52];
@@ -8420,7 +8392,6 @@ int8 CRunningScript::ProcessCommands900To999(int32 command)
 	}
 	return -1;
 }
-#endif
 
 int8 CRunningScript::ProcessCommands1000To1099(int32 command)
 {
diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp
index 0bade6c7..7f67d609 100644
--- a/src/core/Frontend.cpp
+++ b/src/core/Frontend.cpp
@@ -1694,9 +1694,6 @@ int CMenuManager::GetStartOptionsCntrlConfigScreens()
 }
 #endif
 
-#if DONT_USE_SUSPICIOUS_FUNCS
-WRAPPER void CMenuManager::InitialiseChangedLanguageSettings() { EAXJMP(0x47A4D0); }
-#else
 void CMenuManager::InitialiseChangedLanguageSettings()
 {
 	if (m_bFrontEnd_ReloadObrTxtGxt) {
@@ -1719,7 +1716,6 @@ void CMenuManager::InitialiseChangedLanguageSettings()
 		}
 	}
 }
-#endif
 
 void CMenuManager::LoadAllTextures()
 {
diff --git a/src/core/Game.cpp b/src/core/Game.cpp
index fce0c67f..feabdb72 100644
--- a/src/core/Game.cpp
+++ b/src/core/Game.cpp
@@ -234,9 +234,6 @@ bool CGame::Initialise(const char* datFile)
 	return true;
 }
 
-#if 0
-WRAPPER void CGame::Process(void) { EAXJMP(0x48C850); }
-#else
 extern void (*DebugMenuProcess)(void);
 void CGame::Process(void) 
 {
@@ -312,7 +309,6 @@ void CGame::Process(void)
 		}
 	}
 }
-#endif
 
 void CGame::ReloadIPLs(void)
 {
@@ -336,9 +332,6 @@ void CGame::ReloadIPLs(void)
 	CTimer::Update();
 }
 
-#if 0
-WRAPPER void CGame::FinalShutdown(void) { EAXJMP(0x48BEC0); }
-#else
 void
 CGame::FinalShutdown(void)
 {
@@ -346,7 +339,6 @@ CGame::FinalShutdown(void)
 	CPedStats::Shutdown();
 	CdStreamShutdown();
 }
-#endif
 
 WRAPPER bool CGame::InitialiseRenderWare(void) { EAXJMP(0x48BBA0); }
 WRAPPER void CGame::ShutdownRenderWare(void) { EAXJMP(0x48BCB0); }
diff --git a/src/core/Radar.cpp b/src/core/Radar.cpp
index 6421520b..1c634760 100644
--- a/src/core/Radar.cpp
+++ b/src/core/Radar.cpp
@@ -75,9 +75,6 @@ static_assert(RADAR_TILE_SIZE == (WORLD_SIZE_Y / RADAR_NUM_TILES), "CRadar: not
 #define RADAR_MIN_SPEED (0.3f)

 #define RADAR_MAX_SPEED (0.9f)

 

-#if 0

-WRAPPER void CRadar::CalculateBlipAlpha(float) { EAXJMP(0x4A4F90); }

-#else

 uint8 CRadar::CalculateBlipAlpha(float dist)

 {

 	if (dist <= 1.0f)

@@ -88,55 +85,35 @@ uint8 CRadar::CalculateBlipAlpha(float dist)
 

 	return 128;

 }

-#endif

 

-#if 0

-WRAPPER void CRadar::ChangeBlipBrightness(int32, int32) { EAXJMP(0x4A57A0); }

-#else

 void CRadar::ChangeBlipBrightness(int32 i, int32 bright)

 {

 	int index = GetActualBlipArrayIndex(i);

 	if (index != -1)

 		ms_RadarTrace[index].m_bDim = bright != 1;

 }

-#endif

 

-#if 0

-WRAPPER void CRadar::ChangeBlipColour(int32, int32) { EAXJMP(0x4A5770); }

-#else

 void CRadar::ChangeBlipColour(int32 i, int32 color)

 {

 	int index = GetActualBlipArrayIndex(i);

 	if (index != -1)

 		ms_RadarTrace[index].m_nColor = color;

 }

-#endif

 

-#if 0

-WRAPPER void CRadar::ChangeBlipDisplay(int32, eBlipDisplay) { EAXJMP(0x4A5810); }

-#else

 void CRadar::ChangeBlipDisplay(int32 i, eBlipDisplay display)

 {

 	int index = GetActualBlipArrayIndex(i);

 	if (index != -1)

 		ms_RadarTrace[index].m_eBlipDisplay = display;

 }

-#endif

 

-#if 0

-WRAPPER void CRadar::ChangeBlipScale(int32, int32) { EAXJMP(0x4A57E0); }

-#else

 void CRadar::ChangeBlipScale(int32 i, int32 scale)

 {

 	int index = GetActualBlipArrayIndex(i);

 	if (index != -1)

 		ms_RadarTrace[index].m_wScale = scale;

 }

-#endif

 

-#if 0

-WRAPPER void CRadar::ClearBlip(int32) { EAXJMP(0x4A5720); }

-#else

 void CRadar::ClearBlip(int32 i)

 {

 	int index = GetActualBlipArrayIndex(i);

@@ -148,11 +125,7 @@ void CRadar::ClearBlip(int32 i)
 		ms_RadarTrace[index].m_IconID = RADAR_SPRITE_NONE;

 	}

 }

-#endif

 

-#if 0

-WRAPPER void CRadar::ClearBlipForEntity(eBlipType, int32) { EAXJMP(0x4A56C0); }

-#else

 void CRadar::ClearBlipForEntity(eBlipType type, int32 id)

 {

 	for (int i = 0; i < NUMRADARBLIPS; i++) {

@@ -165,11 +138,7 @@ void CRadar::ClearBlipForEntity(eBlipType type, int32 id)
 		}

 	};

 }

-#endif

 

-#if 0

-WRAPPER int CRadar::ClipRadarPoly(CVector2D *poly, const CVector2D *in) { EAXJMP(0x4A64A0); }

-#else

 // Why not a proper clipping algorithm?

 int CRadar::ClipRadarPoly(CVector2D *poly, const CVector2D *rect)

 {

@@ -249,7 +218,6 @@ int CRadar::ClipRadarPoly(CVector2D *poly, const CVector2D *rect)
 

 	return n;

 }

-#endif

 

 bool CRadar::DisplayThisBlip(int32 counter)

 {

@@ -263,9 +231,6 @@ bool CRadar::DisplayThisBlip(int32 counter)
 	}

 }

 

-#if 0

-WRAPPER void CRadar::Draw3dMarkers() { EAXJMP(0x4A4C70); }

-#else

 void CRadar::Draw3dMarkers()

 {

 	for (int i = 0; i < NUMRADARBLIPS; i++) {

@@ -317,12 +282,7 @@ void CRadar::Draw3dMarkers()
 		}

 	}

 }

-#endif

-

 

-#if 0

-WRAPPER void CRadar::DrawBlips() { EAXJMP(0x4A42F0); }

-#else

 void CRadar::DrawBlips()

 {

 	if (!TheCamera.m_WideScreenOn && CHud::m_Wants_To_Draw_Hud) {

@@ -580,12 +540,7 @@ void CRadar::DrawBlips()
 		}

 	}

 }

-#endif

-

 

-#if 0

-WRAPPER void CRadar::DrawMap () { EAXJMP(0x4A4200); }

-#else

 void CRadar::DrawMap()

 {

 	if (!TheCamera.m_WideScreenOn && CHud::m_Wants_To_Draw_Hud) {

@@ -605,11 +560,7 @@ void CRadar::DrawMap()
 		DrawRadarMap();

 	}

 }

-#endif 

 

-#if 0

-WRAPPER void CRadar::DrawRadarMap() { EAXJMP(0x4A6C20); }

-#else

 void CRadar::DrawRadarMap()

 {

 	// Game calculates an unused CRect here

@@ -642,11 +593,7 @@ void CRadar::DrawRadarMap()
 	DrawRadarSection(x, y + 1);

 	DrawRadarSection(x + 1, y + 1);

 }

-#endif

 

-#if 0

-WRAPPER void CRadar::DrawRadarMask() { EAXJMP(0x4A69C0); }

-#else

 void CRadar::DrawRadarMask() 

 { 

 	CVector2D corners[4] = {

@@ -690,11 +637,7 @@ void CRadar::DrawRadarMask()
 

 	RwD3D8SetRenderState(rwRENDERSTATESTENCILFUNCTION, rwSTENCILFUNCTIONGREATER);

 }

-#endif

 

-#if 0

-WRAPPER void CRadar::DrawRadarSection(int32, int32) { EAXJMP(0x4A67E0); }

-#else

 void CRadar::DrawRadarSection(int32 x, int32 y)

 {

 	int i;

@@ -738,20 +681,12 @@ void CRadar::DrawRadarSection(int32 x, int32 y)
 //	if(numVertices > 2)

 	RwIm2DRenderPrimitive(rwPRIMTYPETRIFAN, CSprite2d::GetVertices(), numVertices);

 }

-#endif

 

-#if 0

-WRAPPER void CRadar::DrawRadarSprite(uint16 sprite, float x, float y, uint8 alpha) { EAXJMP(0x4A5EF0); }

-#else

 void CRadar::DrawRadarSprite(uint16 sprite, float x, float y, uint8 alpha)

 {

 	RadarSprites[sprite]->Draw(CRect(x - SCREEN_SCALE_X(8.0f), y - SCREEN_SCALE_Y(8.0f), x + SCREEN_SCALE_X(8.0f), y + SCREEN_SCALE_Y(8.0f)), CRGBA(255, 255, 255, alpha));

 }

-#endif

 

-#if 0

-WRAPPER void CRadar::DrawRotatingRadarSprite(CSprite2d* sprite, float x, float y, float angle, int32 alpha) { EAXJMP(0x4A5D10); }

-#else

 void CRadar::DrawRotatingRadarSprite(CSprite2d* sprite, float x, float y, float angle, int32 alpha)

 {

 	CVector curPosn[4];

@@ -778,11 +713,7 @@ void CRadar::DrawRotatingRadarSprite(CSprite2d* sprite, float x, float y, float
 

 	sprite->Draw(curPosn[2].x, curPosn[2].y, curPosn[3].x, curPosn[3].y, curPosn[0].x, curPosn[0].y, curPosn[1].x, curPosn[1].y, CRGBA(255, 255, 255, alpha));

 }

-#endif 

 

-#if 0

-WRAPPER int32 CRadar::GetActualBlipArrayIndex(int32) { EAXJMP(0x4A41C0); }

-#else

 int32 CRadar::GetActualBlipArrayIndex(int32 i)

 {

 	if (i == -1)

@@ -792,11 +723,7 @@ int32 CRadar::GetActualBlipArrayIndex(int32 i)
 	else

 		return (uint16)i;

 }

-#endif

 

-#if 0

-WRAPPER int32 CRadar::GetNewUniqueBlipIndex(int32) { EAXJMP(0x4A4180); }

-#else

 int32 CRadar::GetNewUniqueBlipIndex(int32 i)

 {

 	if (ms_RadarTrace[i].m_BlipIndex >= UINT16_MAX - 1)

@@ -805,11 +732,7 @@ int32 CRadar::GetNewUniqueBlipIndex(int32 i)
 		ms_RadarTrace[i].m_BlipIndex++;

 	return i | (ms_RadarTrace[i].m_BlipIndex << 16);

 }

-#endif

 

-#if 0

-WRAPPER uint32 CRadar::GetRadarTraceColour(uint32 color, bool bright) { EAXJMP(0x4A5BB0); }

-#else

 uint32 CRadar::GetRadarTraceColour(uint32 color, bool bright)

 {

 	int32 c;

@@ -862,7 +785,6 @@ uint32 CRadar::GetRadarTraceColour(uint32 color, bool bright)
 	};

 	return c;

 }

-#endif

 

 const char* gRadarTexNames[] = {

 	"radar00", "radar01", "radar02", "radar03", "radar04", "radar05", "radar06", "radar07",

@@ -875,9 +797,6 @@ const char* gRadarTexNames[] = {
 	"radar56", "radar57", "radar58", "radar59", "radar60", "radar61", "radar62", "radar63",

 };

 

-#if 0

-WRAPPER void CRadar::Initialise() { EAXJMP(0x4A3EF0); }

-#else

 void

 CRadar::Initialise()

 {

@@ -894,11 +813,7 @@ CRadar::Initialise()
 	for (int i = 0; i < 64; i++) 

 		gRadarTxdIds[i] = CTxdStore::FindTxdSlot(gRadarTexNames[i]);

 }

-#endif

 

-#if 0

-WRAPPER float CRadar::LimitRadarPoint(CVector2D &point) { EAXJMP(0x4A4F30); }

-#else

 float CRadar::LimitRadarPoint(CVector2D &point)

 {

 	float dist, invdist;

@@ -911,11 +826,7 @@ float CRadar::LimitRadarPoint(CVector2D &point)
 	}

 	return dist;

 }

-#endif

 

-#if 0

-WRAPPER void CRadar::LoadAllRadarBlips(int32) { EAXJMP(0x4A6F30); }

-#else

 void CRadar::LoadAllRadarBlips(uint8 *buf, uint32 size)

 {

 	Initialise();

@@ -927,11 +838,7 @@ INITSAVEBUF
 

 VALIDATESAVEBUF(size);

 }

-#endif

 

-#if 0

-WRAPPER void CRadar::LoadTextures() { EAXJMP(0x4A4030); }

-#else

 void

 CRadar::LoadTextures()

 {

@@ -959,42 +866,26 @@ CRadar::LoadTextures()
 	WeaponSprite.SetTexture("radar_weapon");

 	CTxdStore::PopCurrentTxd();

 }

-#endif

 

-#if 0

-WRAPPER void RemoveMapSection(int32, int32) { EAXJMP(0x00); }

-#else

 void RemoveMapSection(int32 x, int32 y)

 {

 	if (x >= 0 && x <= 7 && y >= 0 && y <= 7)

 		CStreaming::RemoveTxd(gRadarTxdIds[x + RADAR_NUM_TILES * y]);

 }

-#endif

 

-#if 0

-WRAPPER void CRadar::RemoveRadarSections() { EAXJMP(0x4A60E0); }

-#else

 void CRadar::RemoveRadarSections()

 {

 	for (int i = 0; i < 8; i++)

 		for (int j = 0; j < 8; j++)

 			RemoveMapSection(i, j);

 }

-#endif

 

-#if 0

-WRAPPER void CRadar::RequestMapSection(int32, int32) { EAXJMP(0x00); }

-#else

 void CRadar::RequestMapSection(int32 x, int32 y)

 {

 	ClipRadarTileCoords(x, y);

 	CStreaming::RequestTxd(gRadarTxdIds[x + RADAR_NUM_TILES * y], STREAMFLAGS_DONT_REMOVE | STREAMFLAGS_DEPENDENCY);

 }

-#endif

 

-#if 0

-WRAPPER void CRadar::SaveAllRadarBlips(uint8 *buf, uint32 *size) { EAXJMP(0x4A6E30); }

-#else

 void CRadar::SaveAllRadarBlips(uint8 *buf, uint32 *size)

 {

 	*size = SAVE_HEADER_SIZE + sizeof(ms_RadarTrace);

@@ -1006,11 +897,7 @@ INITSAVEBUF
 

 VALIDATESAVEBUF(*size);

 }

-#endif

 

-#if 0

-WRAPPER void CRadar::SetBlipSprite(int32, int32) { EAXJMP(0x4A5840); }

-#else

 void CRadar::SetBlipSprite(int32 i, int32 icon)

 {

 	int index = CRadar::GetActualBlipArrayIndex(i);

@@ -1018,11 +905,7 @@ void CRadar::SetBlipSprite(int32 i, int32 icon)
 		ms_RadarTrace[index].m_IconID = icon;

 	}

 }

-#endif

 

-#if 0

-WRAPPER int32 CRadar::SetCoordBlip(eBlipType, CVector, int32, eBlipDisplay display) { EAXJMP(0x4A5590); }

-#else

 int CRadar::SetCoordBlip(eBlipType type, CVector pos, int32 color, eBlipDisplay display)

 {

 	int nextBlip;

@@ -1043,11 +926,7 @@ int CRadar::SetCoordBlip(eBlipType type, CVector pos, int32 color, eBlipDisplay
 	ms_RadarTrace[nextBlip].m_IconID = RADAR_SPRITE_NONE;

 	return CRadar::GetNewUniqueBlipIndex(nextBlip);

 }

-#endif

 

-#if 0

-WRAPPER int CRadar::SetEntityBlip(eBlipType type, int32, int32, eBlipDisplay) { EAXJMP(0x4A5640); }

-#else

 int CRadar::SetEntityBlip(eBlipType type, int32 handle, int32 color, eBlipDisplay display)

 {

 	int nextBlip;

@@ -1066,11 +945,7 @@ int CRadar::SetEntityBlip(eBlipType type, int32 handle, int32 color, eBlipDispla
 	ms_RadarTrace[nextBlip].m_IconID = RADAR_SPRITE_NONE;

 	return GetNewUniqueBlipIndex(nextBlip);

 }

-#endif

 

-#if 0

-WRAPPER void CRadar::SetRadarMarkerState(int32, bool) { EAXJMP(0x4A5C60); }

-#else

 void CRadar::SetRadarMarkerState(int32 counter, bool flag)

 {

 	CEntity *e;

@@ -1091,11 +966,7 @@ void CRadar::SetRadarMarkerState(int32 counter, bool flag)
 	if (e)

 		e->bHasBlip = flag;

 }

-#endif

 

-#if 0

-WRAPPER void CRadar::ShowRadarMarker(CVector pos, uint32 color, float radius) { EAXJMP(0x4A59C0); }

-#else

 void CRadar::ShowRadarMarker(CVector pos, uint32 color, float radius) {

 	float f1 = radius * 1.4f;

 	float f2 = radius * 0.5f;

@@ -1117,11 +988,7 @@ void CRadar::ShowRadarMarker(CVector pos, uint32 color, float radius) {
 	p2 = pos - TheCamera.GetRight()*f2;

 	CTheScripts::ScriptDebugLine3D(p1.x, p1.y, p1.z, p2.x, p2.y, p2.z, color, color);

 }

-#endif

 

-#if 0

-WRAPPER void CRadar::ShowRadarTrace(float x, float y, uint32 size, uint8 red, uint8 green, uint8 blue, uint8 alpha) { EAXJMP(0x4A5870); }

-#else

 void CRadar::ShowRadarTrace(float x, float y, uint32 size, uint8 red, uint8 green, uint8 blue, uint8 alpha)

 {

 	if (!CHud::m_Wants_To_Draw_Hud || TheCamera.m_WideScreenOn)

@@ -1130,7 +997,6 @@ void CRadar::ShowRadarTrace(float x, float y, uint32 size, uint8 red, uint8 gree
 	CSprite2d::DrawRect(CRect(x - SCREEN_SCALE_X(size + 1.0f), y - SCREEN_SCALE_Y(size + 1.0f), SCREEN_SCALE_X(size + 1.0f) + x, SCREEN_SCALE_Y(size + 1.0f) + y), CRGBA(0, 0, 0, alpha));

 	CSprite2d::DrawRect(CRect(x - SCREEN_SCALE_X(size), y - SCREEN_SCALE_Y(size), SCREEN_SCALE_X(size) + x, SCREEN_SCALE_Y(size) + y), CRGBA(red, green, blue, alpha));

 }

-#endif

 

 void CRadar::ShowRadarTraceWithHeight(float x, float y, uint32 size, uint8 red, uint8 green, uint8 blue, uint8 alpha, uint8 mode)

 {

@@ -1156,9 +1022,6 @@ void CRadar::ShowRadarTraceWithHeight(float x, float y, uint32 size, uint8 red,
 	}

 }

 

-#if 0

-WRAPPER void CRadar::Shutdown() { EAXJMP(0x4A3F60); }

-#else

 void CRadar::Shutdown()

 {

 	AsukaSprite.Delete();

@@ -1183,20 +1046,12 @@ void CRadar::Shutdown()
 	WeaponSprite.Delete();

 	RemoveRadarSections();

 }

-#endif

 

-#if 0

-WRAPPER void CRadar::StreamRadarSections(const CVector &posn) { EAXJMP(0x4A6B60); }

-#else

 void CRadar::StreamRadarSections(const CVector &posn)

 {

 	StreamRadarSections(floorf((2000.0f + posn.x) / 500.0f), ceilf(7.0f - (2000.0f + posn.y) / 500.0f));

 }

-#endif

 

-#if 0

-WRAPPER void CRadar::StreamRadarSections(int32 x, int32 y) { EAXJMP(0x4A6100); }

-#else

 void CRadar::StreamRadarSections(int32 x, int32 y)

 {

 	for (int i = 0; i < RADAR_NUM_TILES; ++i) {

@@ -1208,11 +1063,7 @@ void CRadar::StreamRadarSections(int32 x, int32 y)
 		};

 	};

 }

-#endif

 

-#if 0

-WRAPPER void CRadar::TransformRealWorldToTexCoordSpace(CVector2D &out, const CVector2D &in, int32 x, int32 y) { EAXJMP(0x4A5530); }

-#else

 void CRadar::TransformRealWorldToTexCoordSpace(CVector2D &out, const CVector2D &in, int32 x, int32 y)

 {

 	out.x = in.x - (x * RADAR_TILE_SIZE + WORLD_MIN_X);

@@ -1220,11 +1071,7 @@ void CRadar::TransformRealWorldToTexCoordSpace(CVector2D &out, const CVector2D &
 	out.x /= RADAR_TILE_SIZE;

 	out.y /= RADAR_TILE_SIZE;

 }

-#endif

 

-#if 0

-WRAPPER void CRadar::TransformRadarPointToRealWorldSpace(CVector2D &out, const CVector2D &in) { EAXJMP(0x4A5300); }

-#else

 void CRadar::TransformRadarPointToRealWorldSpace(CVector2D &out, const CVector2D &in)

 {

 	float s, c;

@@ -1255,7 +1102,6 @@ void CRadar::TransformRadarPointToRealWorldSpace(CVector2D &out, const CVector2D
 

 	out = out * m_radarRange + vec2DRadarOrigin;

 }

-#endif

 

 // Radar space goes from -1.0 to 1.0 in x and y, top right is (1.0, 1.0)

 void CRadar::TransformRadarPointToScreenSpace(CVector2D &out, const CVector2D &in)

@@ -1265,9 +1111,6 @@ void CRadar::TransformRadarPointToScreenSpace(CVector2D &out, const CVector2D &i
 	out.y = (1.0f - in.y)*0.5f*SCREEN_SCALE_Y(RADAR_HEIGHT) + SCREEN_SCALE_FROM_BOTTOM(RADAR_BOTTOM + RADAR_HEIGHT);

 }

 

-#if 0

-WRAPPER void CRadar::TransformRealWorldPointToRadarSpace(CVector2D &out, const CVector2D &in) { EAXJMP(0x4A50D0); }

-#else

 void CRadar::TransformRealWorldPointToRadarSpace(CVector2D &out, const CVector2D &in)

 {

 	float s, c;

@@ -1299,11 +1142,7 @@ void CRadar::TransformRealWorldPointToRadarSpace(CVector2D &out, const CVector2D
 	out.x = s * y + c * x;

 	out.y = c * y - s * x;

 }

-#endif

 

-#if 0

-WRAPPER void CRadar::GetTextureCorners(int32 x, int32 y, CVector2D *out) { EAXJMP(0x4A61C0); };

-#else

 // Transform from section indices to world coordinates

 void CRadar::GetTextureCorners(int32 x, int32 y, CVector2D *out)

 {

@@ -1326,11 +1165,7 @@ void CRadar::GetTextureCorners(int32 x, int32 y, CVector2D *out)
 	out[3].x = RADAR_TILE_SIZE * (x);

 	out[3].y = RADAR_TILE_SIZE * (y);

 }

-#endif

 

-#if 0

-WRAPPER void CRadar::ClipRadarTileCoords(int32 &, int32 &) { EAXJMP(0x00); };

-#else

 void CRadar::ClipRadarTileCoords(int32 &x, int32 &y)

 {

 	if (x < 0)

@@ -1342,24 +1177,16 @@ void CRadar::ClipRadarTileCoords(int32 &x, int32 &y)
 	if (y > RADAR_NUM_TILES-1)

 		y = RADAR_NUM_TILES-1;

 }

-#endif

 

 

-#if 0

-WRAPPER bool CRadar::IsPointInsideRadar(const CVector2D &) { EAXJMP(0x4A6160); }

-#else

 bool CRadar::IsPointInsideRadar(const CVector2D &point)

 {

 	if (point.x < -1.0f || point.x > 1.0f) return false;

 	if (point.y < -1.0f || point.y > 1.0f) return false;

 	return true;

 }

-#endif

 

 // clip line p1,p2 against (-1.0, 1.0) in x and y, set out to clipped point closest to p1

-#if 0

-WRAPPER int CRadar::LineRadarBoxCollision(CVector2D &, const CVector2D &, const CVector2D &) { EAXJMP(0x4A6250); }

-#else

 int CRadar::LineRadarBoxCollision(CVector2D &out, const CVector2D &p1, const CVector2D &p2)

 {

 	float d1, d2;

@@ -1430,7 +1257,6 @@ int CRadar::LineRadarBoxCollision(CVector2D &out, const CVector2D &p1, const CVe
 

 	return edge;

 }

-#endif

 

 STARTPATCHES

 	InjectHook(0x4A3EF0, CRadar::Initialise, PATCH_JUMP);

diff --git a/src/core/Timer.cpp b/src/core/Timer.cpp
index bcf84560..a46e1d8b 100644
--- a/src/core/Timer.cpp
+++ b/src/core/Timer.cpp
@@ -75,9 +75,6 @@ void CTimer::Shutdown(void)
 	;
 }
 
-#if 0
-WRAPPER void CTimer::Update(void) { EAXJMP(0x4ACF70); }
-#else
 void CTimer::Update(void)
 {
 	m_snPreviousTimeInMilliseconds = m_snTimeInMilliseconds;
@@ -149,7 +146,6 @@ void CTimer::Update(void)
   
 	m_FrameCounter++;
 }
-#endif
 
 void CTimer::Suspend(void)
 {
diff --git a/src/render/Coronas.cpp b/src/render/Coronas.cpp
index b0868d0a..c934540b 100644
--- a/src/render/Coronas.cpp
+++ b/src/render/Coronas.cpp
@@ -59,9 +59,6 @@ int &CCoronas::bChangeBrightnessImmediately = *(int*)0x8E2C30;
 
 CRegisteredCorona *CCoronas::aCoronas = (CRegisteredCorona*)0x72E518;
 
-//WRAPPER void CCoronas::Render(void) { EAXJMP(0x4F8FB0); }
-//WRAPPER void CCoronas::RenderReflections(void) { EAXJMP(0x4F9B40); }
-
 const char aCoronaSpriteNames[][32] = {
 	"coronastar",
 	"corona",
diff --git a/src/render/Hud.cpp b/src/render/Hud.cpp
index 51aa390f..2f523e17 100644
--- a/src/render/Hud.cpp
+++ b/src/render/Hud.cpp
@@ -103,9 +103,6 @@ struct
 RwTexture *&gpSniperSightTex = *(RwTexture**)0x8F5834;
 RwTexture *&gpRocketSightTex = *(RwTexture**)0x8E2C20;
 
-#if 0
-WRAPPER void CHud::Draw(void) { EAXJMP(0x5052A0); }
-#else
 void CHud::Draw()
 {
 	// disable hud via second controller
@@ -1004,12 +1001,7 @@ void CHud::Draw()
 		}
 	}
 }
-#endif
-
 
-#if 0
-WRAPPER void CHud::DrawAfterFade(void) { EAXJMP(0x509030); }
-#else
 void CHud::DrawAfterFade()
 {
 	if (CTimer::GetIsUserPaused() || CReplay::IsPlayingBack())
@@ -1261,11 +1253,7 @@ void CHud::DrawAfterFade()
 		BigMessageInUse[1] = 0.0f;
 	}
 }
-#endif
 
-#if 0
-WRAPPER void CHud::GetRidOfAllHudMessages(void) { EAXJMP(0x504F90); }
-#else
 void CHud::GetRidOfAllHudMessages()
 {
 	m_ZoneState = 0;
@@ -1301,7 +1289,6 @@ void CHud::GetRidOfAllHudMessages()
 			m_BigMessage[i][j] = 0;
 	}
 }
-#endif
 
 void CHud::Initialise()
 {
@@ -1343,9 +1330,6 @@ void CHud::Initialise()
 	CTxdStore::PopCurrentTxd();
 }
 
-#if 0
-WRAPPER void CHud::ReInitialise(void) { EAXJMP(0x504CC0); }
-#else
 void CHud::ReInitialise() {
 	m_Wants_To_Draw_Hud = true;
 	m_Wants_To_Draw_3dMarkers = true;
@@ -1367,12 +1351,9 @@ void CHud::ReInitialise() {
 	PagerSoundPlayed = 0;
 	PagerXOffset = 150.0f;
 }
-#endif
 
 wchar LastBigMessage[6][128];
-#if 0
-WRAPPER void CHud::SetBigMessage(wchar *message, int16 style) { EAXJMP(0x50A250); }
-#else
+
 void CHud::SetBigMessage(wchar *message, int16 style)
 {
 	int i = 0;
@@ -1400,11 +1381,7 @@ void CHud::SetBigMessage(wchar *message, int16 style)
 	LastBigMessage[style][i] = 0;
 	m_BigMessage[style][i] = 0;
 }
-#endif
 
-#if 0
-WRAPPER void CHud::SetHelpMessage(wchar *message, bool quick) { EAXJMP(0x5051E0); }
-#else
 void CHud::SetHelpMessage(wchar *message, bool quick)
 {
 	if (!CReplay::IsPlayingBack()) {
@@ -1419,11 +1396,7 @@ void CHud::SetHelpMessage(wchar *message, bool quick)
 		m_HelpMessageQuick = quick;
 	}
 }
-#endif
 
-#if 0
-WRAPPER void CHud::SetMessage(wchar *message) { EAXJMP(0x50A210); }
-#else
 void CHud::SetMessage(wchar *message)
 {
 	int i = 0;
@@ -1435,11 +1408,7 @@ void CHud::SetMessage(wchar *message)
 	}
 	m_Message[i] = 0;
 }
-#endif
 
-#if 0
-WRAPPER void CHud::SetPagerMessage(wchar *message) { EAXJMP(0x50A320); }
-#else
 void CHud::SetPagerMessage(wchar *message)
 {
 	int i = 0;
@@ -1451,25 +1420,16 @@ void CHud::SetPagerMessage(wchar *message)
 	}
 	m_PagerMessage[i] = 0;
 }
-#endif
 
-#if 0
-WRAPPER void CHud::SetVehicleName(wchar *name) { EAXJMP(0x505290); }
-#else
 void CHud::SetVehicleName(wchar *name)
 {
 	m_VehicleName = name;
 }
-#endif
 
-#if 0
-WRAPPER void CHud::SetZoneName(wchar *name) { EAXJMP(0x5051D0); }
-#else
 void CHud::SetZoneName(wchar *name)
 {
 	m_pZoneName = name;
 }
-#endif
 
 void CHud::Shutdown()
 {
diff --git a/src/save/GenericGameStorage.cpp b/src/save/GenericGameStorage.cpp
index 2d5cfae2..d71b0c22 100644
--- a/src/save/GenericGameStorage.cpp
+++ b/src/save/GenericGameStorage.cpp
@@ -51,7 +51,6 @@ CDate &CompileDateAndTime = *(CDate*)0x72BCB8;
 #define ReadDataFromBufferPointer(buf, to) memcpy(&to, buf, sizeof(to)); buf += align4bytes(sizeof(to));
 #define WriteDataToBufferPointer(buf, from) memcpy(buf, &from, sizeof(from)); buf += align4bytes(sizeof(from));
 
-//WRAPPER bool GenericSave(int file) { EAXJMP(0x58F8D0); }
 WRAPPER bool GenericLoad() { EAXJMP(0x590A00); }
 
 
diff --git a/src/weapons/Explosion.cpp b/src/weapons/Explosion.cpp
index 05087335..e99dc918 100644
--- a/src/weapons/Explosion.cpp
+++ b/src/weapons/Explosion.cpp
@@ -6,8 +6,6 @@
 CExplosion(&gaExplosion)[48] = *(CExplosion(*)[48])*(uintptr*)0x64E208;
 
 WRAPPER void CExplosion::AddExplosion(CEntity *explodingEntity, CEntity *culprit, eExplosionType type, const CVector &pos, uint32) { EAXJMP(0x5591C0); }
-//WRAPPER void CExplosion::RemoveAllExplosionsInArea(CVector, float) { EAXJMP(0x55AD40); }
-//WRAPPER bool CExplosion::TestForExplosionInArea(eExplosionType, float, float, float, float, float, float) { EAXJMP(0x55AC80); }
 
 int AudioHandle = AEHANDLE_NONE;