7 files changed, 875 insertions, 875 deletions

diff --git a/src/core/Frontend.h b/src/core/Frontend.h
index c08bc1d9..20cf9e42 100644
--- a/src/core/Frontend.h
+++ b/src/core/Frontend.h
@@ -550,10 +550,10 @@ public:
 	static int32 &sthWithButtons;
 	static int32 &sthWithButtons2;
 
-#ifndef MASTER

-	static bool m_PrefsMarketing;

-	static bool m_PrefsDisableTutorials;

-#endif // !MASTER

+#ifndef MASTER
+	static bool m_PrefsMarketing;
+	static bool m_PrefsDisableTutorials;
+#endif // !MASTER
 
 #ifdef MENU_MAP
 	static bool bMenuMapActive;
diff --git a/src/core/PlayerInfo.cpp b/src/core/PlayerInfo.cpp
index ead32ee7..0043c2f4 100644
--- a/src/core/PlayerInfo.cpp
+++ b/src/core/PlayerInfo.cpp
@@ -48,45 +48,45 @@ CPlayerInfo::GetPos()
 
 void
 CPlayerInfo::LoadPlayerSkin()
-{

-	DeletePlayerSkin();

-

-	m_pSkinTexture = CPlayerSkin::GetSkinTexture(m_aSkinName);

-	if (!m_pSkinTexture)

+{
+	DeletePlayerSkin();
+
+	m_pSkinTexture = CPlayerSkin::GetSkinTexture(m_aSkinName);
+	if (!m_pSkinTexture)
 		m_pSkinTexture = CPlayerSkin::GetSkinTexture(DEFAULT_SKIN_NAME);
 }
 
 void
 CPlayerInfo::DeletePlayerSkin()
-{

-	if (m_pSkinTexture) {

-		RwTextureDestroy(m_pSkinTexture);

-		m_pSkinTexture = nil;

+{
+	if (m_pSkinTexture) {
+		RwTextureDestroy(m_pSkinTexture);
+		m_pSkinTexture = nil;
 	}
 }
 
-void

-CPlayerInfo::KillPlayer()

-{

-	if (m_WBState != WBSTATE_PLAYING) return;

-

-	m_WBState = WBSTATE_WASTED;

-	m_nWBTime = CTimer::GetTimeInMilliseconds();

-	CDarkel::ResetOnPlayerDeath();

-	CMessages::AddBigMessage(TheText.Get("DEAD"), 4000, 2);

-	CStats::TimesDied++;

+void
+CPlayerInfo::KillPlayer()
+{
+	if (m_WBState != WBSTATE_PLAYING) return;
+
+	m_WBState = WBSTATE_WASTED;
+	m_nWBTime = CTimer::GetTimeInMilliseconds();
+	CDarkel::ResetOnPlayerDeath();
+	CMessages::AddBigMessage(TheText.Get("DEAD"), 4000, 2);
+	CStats::TimesDied++;
 }
 
-void

-CPlayerInfo::ArrestPlayer()

-{

-	if (m_WBState != WBSTATE_PLAYING) return;

-

-	m_WBState = WBSTATE_BUSTED;

-	m_nWBTime = CTimer::GetTimeInMilliseconds();

-	CDarkel::ResetOnPlayerDeath();

-	CMessages::AddBigMessage(TheText.Get("BUSTED"), 5000, 2);

-	CStats::TimesArrested++;

+void
+CPlayerInfo::ArrestPlayer()
+{
+	if (m_WBState != WBSTATE_PLAYING) return;
+
+	m_WBState = WBSTATE_BUSTED;
+	m_nWBTime = CTimer::GetTimeInMilliseconds();
+	CDarkel::ResetOnPlayerDeath();
+	CMessages::AddBigMessage(TheText.Get("BUSTED"), 5000, 2);
+	CStats::TimesArrested++;
 }
 
 bool
@@ -105,102 +105,102 @@ CPlayerInfo::PlayerFailedCriticalMission()
 	CDarkel::ResetOnPlayerDeath();
 }
 
-void

-CPlayerInfo::Clear(void)

-{

-	m_pPed = nil;

-	m_pRemoteVehicle = nil;

-	if (m_pVehicleEx) {

-		m_pVehicleEx->bUsingSpecialColModel = false;

-		m_pVehicleEx = nil;

-	}

-	m_nVisibleMoney = 0;

-	m_nMoney = m_nVisibleMoney;

-	m_WBState = WBSTATE_PLAYING;

-	m_nWBTime = 0;

-	m_nTrafficMultiplier = 0;

-	m_fRoadDensity = 1.0f;

-	m_bInRemoteMode = false;

-	m_bUnusedTaxiThing = false;

-	m_nUnusedTaxiTimer = 0;

-	m_nCollectedPackages = 0;

-	m_nTotalPackages = 3;

-	m_nTimeLastHealthLoss = 0;

-	m_nTimeLastArmourLoss = 0;

-	m_nNextSexFrequencyUpdateTime = 0;

-	m_nNextSexMoneyUpdateTime = 0;

-	m_nSexFrequency = 0;

-	m_pHooker = nil;

-	m_nTimeTankShotGun = 0;

-	field_248 = 0;

-	m_nUpsideDownCounter = 0;

-	m_bInfiniteSprint = false;

-	m_bFastReload = false;

-	m_bGetOutOfJailFree = false;

-	m_bGetOutOfHospitalFree = false;

-	m_nPreviousTimeRewardedForExplosion = 0;

-	m_nExplosionsSinceLastReward = 0;

+void
+CPlayerInfo::Clear(void)
+{
+	m_pPed = nil;
+	m_pRemoteVehicle = nil;
+	if (m_pVehicleEx) {
+		m_pVehicleEx->bUsingSpecialColModel = false;
+		m_pVehicleEx = nil;
+	}
+	m_nVisibleMoney = 0;
+	m_nMoney = m_nVisibleMoney;
+	m_WBState = WBSTATE_PLAYING;
+	m_nWBTime = 0;
+	m_nTrafficMultiplier = 0;
+	m_fRoadDensity = 1.0f;
+	m_bInRemoteMode = false;
+	m_bUnusedTaxiThing = false;
+	m_nUnusedTaxiTimer = 0;
+	m_nCollectedPackages = 0;
+	m_nTotalPackages = 3;
+	m_nTimeLastHealthLoss = 0;
+	m_nTimeLastArmourLoss = 0;
+	m_nNextSexFrequencyUpdateTime = 0;
+	m_nNextSexMoneyUpdateTime = 0;
+	m_nSexFrequency = 0;
+	m_pHooker = nil;
+	m_nTimeTankShotGun = 0;
+	field_248 = 0;
+	m_nUpsideDownCounter = 0;
+	m_bInfiniteSprint = false;
+	m_bFastReload = false;
+	m_bGetOutOfJailFree = false;
+	m_bGetOutOfHospitalFree = false;
+	m_nPreviousTimeRewardedForExplosion = 0;
+	m_nExplosionsSinceLastReward = 0;
 }
 
-void

-CPlayerInfo::BlowUpRCBuggy(void)

-{

-	if (!m_pRemoteVehicle || m_pRemoteVehicle->bRemoveFromWorld)

-		return;

-

-	CRemote::TakeRemoteControlledCarFromPlayer();

-	m_pRemoteVehicle->BlowUpCar(FindPlayerPed());

+void
+CPlayerInfo::BlowUpRCBuggy(void)
+{
+	if (!m_pRemoteVehicle || m_pRemoteVehicle->bRemoveFromWorld)
+		return;
+
+	CRemote::TakeRemoteControlledCarFromPlayer();
+	m_pRemoteVehicle->BlowUpCar(FindPlayerPed());
 }
-

-void

-CPlayerInfo::CancelPlayerEnteringCars(CVehicle *car)

-{

-	if (!car || car == m_pPed->m_pMyVehicle) {

-		if (m_pPed->EnteringCar())

-			m_pPed->QuitEnteringCar();

-	}

-	if (m_pPed->m_objective == OBJECTIVE_ENTER_CAR_AS_PASSENGER || m_pPed->m_objective == OBJECTIVE_ENTER_CAR_AS_DRIVER)

-		m_pPed->ClearObjective();

+
+void
+CPlayerInfo::CancelPlayerEnteringCars(CVehicle *car)
+{
+	if (!car || car == m_pPed->m_pMyVehicle) {
+		if (m_pPed->EnteringCar())
+			m_pPed->QuitEnteringCar();
+	}
+	if (m_pPed->m_objective == OBJECTIVE_ENTER_CAR_AS_PASSENGER || m_pPed->m_objective == OBJECTIVE_ENTER_CAR_AS_DRIVER)
+		m_pPed->ClearObjective();
 }
 
-void

-CPlayerInfo::MakePlayerSafe(bool toggle)

-{

-	if (toggle) {

-		CTheScripts::ResetCountdownToMakePlayerUnsafe();

-		m_pPed->m_pWanted->m_bIgnoredByEveryone = true;

-		CWorld::StopAllLawEnforcersInTheirTracks();

-		CPad::GetPad(0)->DisablePlayerControls |= PLAYERCONTROL_DISABLED_20;

-		CPad::StopPadsShaking();

-		m_pPed->bBulletProof = true;

-		m_pPed->bFireProof = true;

-		m_pPed->bCollisionProof = true;

-		m_pPed->bMeleeProof = true;

-		m_pPed->bOnlyDamagedByPlayer = true;

-		m_pPed->bExplosionProof = true;

-		m_pPed->m_bCanBeDamaged = false;

-		((CPlayerPed*)m_pPed)->ClearAdrenaline();

-		CancelPlayerEnteringCars(false);

-		gFireManager.ExtinguishPoint(GetPos(), 4000.0f);

-		CExplosion::RemoveAllExplosionsInArea(GetPos(), 4000.0f);

-		CProjectileInfo::RemoveAllProjectiles();

-		CWorld::SetAllCarsCanBeDamaged(false);

-		CWorld::ExtinguishAllCarFiresInArea(GetPos(), 4000.0f);

-		CReplay::DisableReplays();

-

-	} else if (!CGame::playingIntro && !CTheScripts::IsCountdownToMakePlayerUnsafeOn()) {

-		m_pPed->m_pWanted->m_bIgnoredByEveryone = false;

-		CPad::GetPad(0)->DisablePlayerControls &= ~PLAYERCONTROL_DISABLED_20;

-		m_pPed->bBulletProof = false;

-		m_pPed->bFireProof = false;

-		m_pPed->bCollisionProof = false;

-		m_pPed->bMeleeProof = false;

-		m_pPed->bOnlyDamagedByPlayer = false;

-		m_pPed->bExplosionProof = false;

-		m_pPed->m_bCanBeDamaged = true;

-		CWorld::SetAllCarsCanBeDamaged(true);

-		CReplay::EnableReplays();

-	}

+void
+CPlayerInfo::MakePlayerSafe(bool toggle)
+{
+	if (toggle) {
+		CTheScripts::ResetCountdownToMakePlayerUnsafe();
+		m_pPed->m_pWanted->m_bIgnoredByEveryone = true;
+		CWorld::StopAllLawEnforcersInTheirTracks();
+		CPad::GetPad(0)->DisablePlayerControls |= PLAYERCONTROL_DISABLED_20;
+		CPad::StopPadsShaking();
+		m_pPed->bBulletProof = true;
+		m_pPed->bFireProof = true;
+		m_pPed->bCollisionProof = true;
+		m_pPed->bMeleeProof = true;
+		m_pPed->bOnlyDamagedByPlayer = true;
+		m_pPed->bExplosionProof = true;
+		m_pPed->m_bCanBeDamaged = false;
+		((CPlayerPed*)m_pPed)->ClearAdrenaline();
+		CancelPlayerEnteringCars(false);
+		gFireManager.ExtinguishPoint(GetPos(), 4000.0f);
+		CExplosion::RemoveAllExplosionsInArea(GetPos(), 4000.0f);
+		CProjectileInfo::RemoveAllProjectiles();
+		CWorld::SetAllCarsCanBeDamaged(false);
+		CWorld::ExtinguishAllCarFiresInArea(GetPos(), 4000.0f);
+		CReplay::DisableReplays();
+
+	} else if (!CGame::playingIntro && !CTheScripts::IsCountdownToMakePlayerUnsafeOn()) {
+		m_pPed->m_pWanted->m_bIgnoredByEveryone = false;
+		CPad::GetPad(0)->DisablePlayerControls &= ~PLAYERCONTROL_DISABLED_20;
+		m_pPed->bBulletProof = false;
+		m_pPed->bFireProof = false;
+		m_pPed->bCollisionProof = false;
+		m_pPed->bMeleeProof = false;
+		m_pPed->bOnlyDamagedByPlayer = false;
+		m_pPed->bExplosionProof = false;
+		m_pPed->m_bCanBeDamaged = true;
+		CWorld::SetAllCarsCanBeDamaged(true);
+		CReplay::EnableReplays();
+	}
 }
 
 bool
@@ -216,347 +216,347 @@ CPlayerInfo::IsRestartingAfterArrest()
 }
 
 // lastCloseness is passed to other calls of this function
-void

-CPlayerInfo::EvaluateCarPosition(CEntity *carToTest, CPed *player, float carBoundCentrePedDist, float *lastCloseness, CVehicle **closestCarOutput)

-{

-	// This dist used for determining the angle to face

-	CVector2D dist(carToTest->GetPosition() - player->GetPosition());

-	float neededTurn = CGeneral::GetATanOfXY(player->GetForward().x, player->GetForward().y) - CGeneral::GetATanOfXY(dist.x, dist.y);

-	while (neededTurn >= PI) {

-		neededTurn -= 2 * PI;

-	}

-

-	while (neededTurn < -PI) {

-		neededTurn += 2 * PI;

-	}

-

-	// This dist used for evaluating cars' distances, weird...

-	// Accounts inverted needed turn (or needed turn in long way) and car dist.

-	float closeness = (1.0f - Abs(neededTurn) / TWOPI) * (10.0f - carBoundCentrePedDist);

-	if (closeness > *lastCloseness) {

-		*lastCloseness = closeness;

-		*closestCarOutput = (CVehicle*)carToTest;

-	}

+void
+CPlayerInfo::EvaluateCarPosition(CEntity *carToTest, CPed *player, float carBoundCentrePedDist, float *lastCloseness, CVehicle **closestCarOutput)
+{
+	// This dist used for determining the angle to face
+	CVector2D dist(carToTest->GetPosition() - player->GetPosition());
+	float neededTurn = CGeneral::GetATanOfXY(player->GetForward().x, player->GetForward().y) - CGeneral::GetATanOfXY(dist.x, dist.y);
+	while (neededTurn >= PI) {
+		neededTurn -= 2 * PI;
+	}
+
+	while (neededTurn < -PI) {
+		neededTurn += 2 * PI;
+	}
+
+	// This dist used for evaluating cars' distances, weird...
+	// Accounts inverted needed turn (or needed turn in long way) and car dist.
+	float closeness = (1.0f - Abs(neededTurn) / TWOPI) * (10.0f - carBoundCentrePedDist);
+	if (closeness > *lastCloseness) {
+		*lastCloseness = closeness;
+		*closestCarOutput = (CVehicle*)carToTest;
+	}
 }
 
 // There is something unfinished in here... Sadly all IDBs we have have it unfinished.
-void

-CPlayerInfo::AwardMoneyForExplosion(CVehicle *wreckedCar)

-{

-	if (CTimer::GetTimeInMilliseconds() - m_nPreviousTimeRewardedForExplosion < 6000)

-		++m_nExplosionsSinceLastReward;

-	else

-		m_nExplosionsSinceLastReward = 1;

-

-	m_nPreviousTimeRewardedForExplosion = CTimer::GetTimeInMilliseconds();

-	int award = wreckedCar->pHandling->nMonetaryValue * 0.002f;

-	sprintf(gString, "$%d", award);

-#ifdef MONEY_MESSAGES

-	// This line is a leftover from PS2, I don't know what it was meant to be.

-	// CVector sth(TheCamera.GetPosition() * 4.0f);

-

-	CMoneyMessages::RegisterOne(wreckedCar->GetPosition() + CVector(0.0f, 0.0f, 2.0f), gString, 0, 255, 0, 2.0f, 0.5f);

-#endif

-	CWorld::Players[CWorld::PlayerInFocus].m_nMoney += award;

-

-	for (int i = m_nExplosionsSinceLastReward; i > 1; --i) {

-		CGeneral::GetRandomNumber();

-		CWorld::Players[CWorld::PlayerInFocus].m_nMoney += award;

-	}

+void
+CPlayerInfo::AwardMoneyForExplosion(CVehicle *wreckedCar)
+{
+	if (CTimer::GetTimeInMilliseconds() - m_nPreviousTimeRewardedForExplosion < 6000)
+		++m_nExplosionsSinceLastReward;
+	else
+		m_nExplosionsSinceLastReward = 1;
+
+	m_nPreviousTimeRewardedForExplosion = CTimer::GetTimeInMilliseconds();
+	int award = wreckedCar->pHandling->nMonetaryValue * 0.002f;
+	sprintf(gString, "$%d", award);
+#ifdef MONEY_MESSAGES
+	// This line is a leftover from PS2, I don't know what it was meant to be.
+	// CVector sth(TheCamera.GetPosition() * 4.0f);
+
+	CMoneyMessages::RegisterOne(wreckedCar->GetPosition() + CVector(0.0f, 0.0f, 2.0f), gString, 0, 255, 0, 2.0f, 0.5f);
+#endif
+	CWorld::Players[CWorld::PlayerInFocus].m_nMoney += award;
+
+	for (int i = m_nExplosionsSinceLastReward; i > 1; --i) {
+		CGeneral::GetRandomNumber();
+		CWorld::Players[CWorld::PlayerInFocus].m_nMoney += award;
+	}
 }
 
-void

-CPlayerInfo::SavePlayerInfo(uint8 *buf, uint32 *size)

-{

-	// Interesting

-	*size = sizeof(CPlayerInfo);

-

-INITSAVEBUF

-	WriteSaveBuf(buf, CWorld::Players[CWorld::PlayerInFocus].m_nMoney);

-	WriteSaveBuf(buf, CWorld::Players[CWorld::PlayerInFocus].m_WBState);

-	WriteSaveBuf(buf, CWorld::Players[CWorld::PlayerInFocus].m_nWBTime);

-	WriteSaveBuf(buf, CWorld::Players[CWorld::PlayerInFocus].m_nTrafficMultiplier);

-	WriteSaveBuf(buf, CWorld::Players[CWorld::PlayerInFocus].m_fRoadDensity);

-	WriteSaveBuf(buf, CWorld::Players[CWorld::PlayerInFocus].m_nVisibleMoney);

-	WriteSaveBuf(buf, CWorld::Players[CWorld::PlayerInFocus].m_nCollectedPackages);

-	WriteSaveBuf(buf, CWorld::Players[CWorld::PlayerInFocus].m_nTotalPackages);

-	WriteSaveBuf(buf, CWorld::Players[CWorld::PlayerInFocus].m_bInfiniteSprint);

-	WriteSaveBuf(buf, CWorld::Players[CWorld::PlayerInFocus].m_bFastReload);

-	WriteSaveBuf(buf, CWorld::Players[CWorld::PlayerInFocus].m_bGetOutOfJailFree);

-	WriteSaveBuf(buf, CWorld::Players[CWorld::PlayerInFocus].m_bGetOutOfHospitalFree);

-	for (int i = 0; i < sizeof(CWorld::Players[CWorld::PlayerInFocus].m_aPlayerName); i++) {

-		WriteSaveBuf(buf, CWorld::Players[CWorld::PlayerInFocus].m_aPlayerName[i]);

-	}

-// Save struct is different

-// VALIDATESAVEBUF(*size)

+void
+CPlayerInfo::SavePlayerInfo(uint8 *buf, uint32 *size)
+{
+	// Interesting
+	*size = sizeof(CPlayerInfo);
+
+INITSAVEBUF
+	WriteSaveBuf(buf, CWorld::Players[CWorld::PlayerInFocus].m_nMoney);
+	WriteSaveBuf(buf, CWorld::Players[CWorld::PlayerInFocus].m_WBState);
+	WriteSaveBuf(buf, CWorld::Players[CWorld::PlayerInFocus].m_nWBTime);
+	WriteSaveBuf(buf, CWorld::Players[CWorld::PlayerInFocus].m_nTrafficMultiplier);
+	WriteSaveBuf(buf, CWorld::Players[CWorld::PlayerInFocus].m_fRoadDensity);
+	WriteSaveBuf(buf, CWorld::Players[CWorld::PlayerInFocus].m_nVisibleMoney);
+	WriteSaveBuf(buf, CWorld::Players[CWorld::PlayerInFocus].m_nCollectedPackages);
+	WriteSaveBuf(buf, CWorld::Players[CWorld::PlayerInFocus].m_nTotalPackages);
+	WriteSaveBuf(buf, CWorld::Players[CWorld::PlayerInFocus].m_bInfiniteSprint);
+	WriteSaveBuf(buf, CWorld::Players[CWorld::PlayerInFocus].m_bFastReload);
+	WriteSaveBuf(buf, CWorld::Players[CWorld::PlayerInFocus].m_bGetOutOfJailFree);
+	WriteSaveBuf(buf, CWorld::Players[CWorld::PlayerInFocus].m_bGetOutOfHospitalFree);
+	for (int i = 0; i < sizeof(CWorld::Players[CWorld::PlayerInFocus].m_aPlayerName); i++) {
+		WriteSaveBuf(buf, CWorld::Players[CWorld::PlayerInFocus].m_aPlayerName[i]);
+	}
+// Save struct is different
+// VALIDATESAVEBUF(*size)
 }
 
-void

-CPlayerInfo::LoadPlayerInfo(uint8 *buf, uint32 size)

-{

-INITSAVEBUF

-	CWorld::Players[CWorld::PlayerInFocus].m_nMoney = ReadSaveBuf<uint32>(buf);

-	CWorld::Players[CWorld::PlayerInFocus].m_WBState = ReadSaveBuf<int8>(buf);

-	CWorld::Players[CWorld::PlayerInFocus].m_nWBTime = ReadSaveBuf<uint32>(buf);

-	CWorld::Players[CWorld::PlayerInFocus].m_nTrafficMultiplier = ReadSaveBuf<int16>(buf);

-	CWorld::Players[CWorld::PlayerInFocus].m_fRoadDensity = ReadSaveBuf<float>(buf);

-	CWorld::Players[CWorld::PlayerInFocus].m_nVisibleMoney = ReadSaveBuf<int32>(buf);

-	CWorld::Players[CWorld::PlayerInFocus].m_nCollectedPackages = ReadSaveBuf<int32>(buf);

-	CWorld::Players[CWorld::PlayerInFocus].m_nTotalPackages = ReadSaveBuf<int32>(buf);

-	CWorld::Players[CWorld::PlayerInFocus].m_bInfiniteSprint = ReadSaveBuf<bool>(buf);

-	CWorld::Players[CWorld::PlayerInFocus].m_bFastReload = ReadSaveBuf<bool>(buf);

-	CWorld::Players[CWorld::PlayerInFocus].m_bGetOutOfJailFree = ReadSaveBuf<bool>(buf);

-	CWorld::Players[CWorld::PlayerInFocus].m_bGetOutOfHospitalFree = ReadSaveBuf<bool>(buf);

-	for (int i = 0; i < sizeof(CWorld::Players[CWorld::PlayerInFocus].m_aPlayerName); i++) {

-		CWorld::Players[CWorld::PlayerInFocus].m_aPlayerName[i] = ReadSaveBuf<char>(buf);

-	}

-// Save struct is different

-// VALIDATESAVEBUF(size)

+void
+CPlayerInfo::LoadPlayerInfo(uint8 *buf, uint32 size)
+{
+INITSAVEBUF
+	CWorld::Players[CWorld::PlayerInFocus].m_nMoney = ReadSaveBuf<uint32>(buf);
+	CWorld::Players[CWorld::PlayerInFocus].m_WBState = ReadSaveBuf<int8>(buf);
+	CWorld::Players[CWorld::PlayerInFocus].m_nWBTime = ReadSaveBuf<uint32>(buf);
+	CWorld::Players[CWorld::PlayerInFocus].m_nTrafficMultiplier = ReadSaveBuf<int16>(buf);
+	CWorld::Players[CWorld::PlayerInFocus].m_fRoadDensity = ReadSaveBuf<float>(buf);
+	CWorld::Players[CWorld::PlayerInFocus].m_nVisibleMoney = ReadSaveBuf<int32>(buf);
+	CWorld::Players[CWorld::PlayerInFocus].m_nCollectedPackages = ReadSaveBuf<int32>(buf);
+	CWorld::Players[CWorld::PlayerInFocus].m_nTotalPackages = ReadSaveBuf<int32>(buf);
+	CWorld::Players[CWorld::PlayerInFocus].m_bInfiniteSprint = ReadSaveBuf<bool>(buf);
+	CWorld::Players[CWorld::PlayerInFocus].m_bFastReload = ReadSaveBuf<bool>(buf);
+	CWorld::Players[CWorld::PlayerInFocus].m_bGetOutOfJailFree = ReadSaveBuf<bool>(buf);
+	CWorld::Players[CWorld::PlayerInFocus].m_bGetOutOfHospitalFree = ReadSaveBuf<bool>(buf);
+	for (int i = 0; i < sizeof(CWorld::Players[CWorld::PlayerInFocus].m_aPlayerName); i++) {
+		CWorld::Players[CWorld::PlayerInFocus].m_aPlayerName[i] = ReadSaveBuf<char>(buf);
+	}
+// Save struct is different
+// VALIDATESAVEBUF(size)
 }
 
-void

-CPlayerInfo::FindClosestCarSectorList(CPtrList& carList, CPed* ped, float unk1, float unk2, float unk3, float unk4, float* lastCloseness, CVehicle** closestCarOutput)

-{

-	for (CPtrNode* node = carList.first; node; node = node->next) {

-		CVehicle *car = (CVehicle*)node->item;

-		if(car->m_scanCode != CWorld::GetCurrentScanCode()) {

-			if (!car->bUsesCollision || !car->IsVehicle())

-				continue;

-

-			car->m_scanCode = CWorld::GetCurrentScanCode();

-			if (car->m_status != STATUS_WRECKED && car->m_status != STATUS_TRAIN_MOVING

-				&& (car->GetUp().z > 0.3f || (car->IsVehicle() && ((CVehicle*)car)->m_vehType == VEHICLE_TYPE_BIKE))) {

-				CVector carCentre = car->GetBoundCentre();

-

-				if (Abs(ped->GetPosition().z - carCentre.z) < 2.0f) {

-					float dist = (ped->GetPosition() - carCentre).Magnitude2D();

-					if (dist <= 10.0f && !CCranes::IsThisCarBeingCarriedByAnyCrane(car)) {

-						EvaluateCarPosition(car, ped, dist, lastCloseness, closestCarOutput);

-					}

-				}

-			}

-		}

-	}

+void
+CPlayerInfo::FindClosestCarSectorList(CPtrList& carList, CPed* ped, float unk1, float unk2, float unk3, float unk4, float* lastCloseness, CVehicle** closestCarOutput)
+{
+	for (CPtrNode* node = carList.first; node; node = node->next) {
+		CVehicle *car = (CVehicle*)node->item;
+		if(car->m_scanCode != CWorld::GetCurrentScanCode()) {
+			if (!car->bUsesCollision || !car->IsVehicle())
+				continue;
+
+			car->m_scanCode = CWorld::GetCurrentScanCode();
+			if (car->m_status != STATUS_WRECKED && car->m_status != STATUS_TRAIN_MOVING
+				&& (car->GetUp().z > 0.3f || (car->IsVehicle() && ((CVehicle*)car)->m_vehType == VEHICLE_TYPE_BIKE))) {
+				CVector carCentre = car->GetBoundCentre();
+
+				if (Abs(ped->GetPosition().z - carCentre.z) < 2.0f) {
+					float dist = (ped->GetPosition() - carCentre).Magnitude2D();
+					if (dist <= 10.0f && !CCranes::IsThisCarBeingCarriedByAnyCrane(car)) {
+						EvaluateCarPosition(car, ped, dist, lastCloseness, closestCarOutput);
+					}
+				}
+			}
+		}
+	}
 }
 
-void

-CPlayerInfo::Process(void)

-{

-	// Unused taxi feature. Gives you a dollar for every second with a passenger. Can be toggled via 0x29A opcode.

-	bool startTaxiTimer = true;

-	if (m_bUnusedTaxiThing && m_pPed->bInVehicle) {

-		CVehicle *veh = m_pPed->m_pMyVehicle;

-		if ((veh->m_modelIndex == MI_TAXI || veh->m_modelIndex == MI_CABBIE || veh->m_modelIndex == MI_BORGNINE)

-			&& veh->pDriver == m_pPed && veh->m_nNumPassengers != 0) {

-			for (uint32 timePassed = CTimer::GetTimeInMilliseconds() - m_nUnusedTaxiTimer; timePassed >= 1000; m_nUnusedTaxiTimer += 1000) {

-				timePassed -= 1000;

-				++m_nMoney;

-			}

-			startTaxiTimer = false;

-		}

-	}

-	if (startTaxiTimer)

-		m_nUnusedTaxiTimer = CTimer::GetTimeInMilliseconds();

-

-	// The effect that makes money counter does while earning/losing money

-	if (m_nVisibleMoney != m_nMoney) {

-		int diff = m_nMoney - m_nVisibleMoney;

-		int diffAbs = Abs(diff);

-		int changeBy;

-

-		if (diffAbs > 100000)

-			changeBy = 12345;

-		else if (diffAbs > 10000)

-			changeBy = 1234;

-		else if (diffAbs > 1000)

-			changeBy = 123;

-		else if (diffAbs > 50)

-			changeBy = 42;

-		else

-			changeBy = 1;

-

-		if (diff < 0)

-			m_nVisibleMoney -= changeBy;

-		else

-			m_nVisibleMoney += changeBy;

-	}

-

-	if (!(CTimer::GetFrameCounter() & 15)) {

-		CVector2D playerPos = m_pPed->bInVehicle ? m_pPed->m_pMyVehicle->GetPosition() : m_pPed->GetPosition();

-		m_fRoadDensity = ThePaths.CalcRoadDensity(playerPos.x, playerPos.y);

-	}

-

-	m_fRoadDensity = clamp(m_fRoadDensity, 0.4f, 1.45f);

-

-	// Because vehicle enter/exit use same key binding.

-	bool enterOrExitVeh;

-	if (m_pPed->bVehExitWillBeInstant && m_pPed->bInVehicle)

-		enterOrExitVeh = CPad::GetPad(0)->ExitVehicleJustDown();

-	else

-		enterOrExitVeh = CPad::GetPad(0)->GetExitVehicle();

-

-	if (enterOrExitVeh && m_pPed->m_nPedState != PED_SNIPER_MODE && m_pPed->m_nPedState != PED_ROCKET_ODE) {

-		if (m_pPed->bInVehicle) {

-			if (!m_pRemoteVehicle) {

-				CEntity *surfaceBelowVeh = m_pPed->m_pMyVehicle->m_pCurGroundEntity;

-				if (!surfaceBelowVeh || !CBridge::ThisIsABridgeObjectMovingUp(surfaceBelowVeh->m_modelIndex)) {

-					CVehicle *veh = m_pPed->m_pMyVehicle;

-					if (!veh->IsBoat() || veh->m_nDoorLock == CARLOCK_LOCKED_PLAYER_INSIDE) {

-

-						// This condition will always return true, else block was probably WIP Miami code.

-						if (veh->m_vehType != VEHICLE_TYPE_BIKE || veh->m_nDoorLock == CARLOCK_LOCKED_PLAYER_INSIDE) {

-							if (veh->m_status != STATUS_WRECKED && veh->m_status != STATUS_TRAIN_MOVING && veh->m_nDoorLock != CARLOCK_LOCKED_PLAYER_INSIDE) {

-								if (veh->m_vecMoveSpeed.Magnitude() < 0.17f && CTimer::GetTimeScale() >= 0.5f && !veh->bIsInWater) {

-									m_pPed->SetObjective(OBJECTIVE_LEAVE_VEHICLE, veh);

-								}

-							}

-						} else {

-							CVector sth = 0.7f * veh->GetRight() + veh->GetPosition();

-							bool found = false;

-							float groundZ = CWorld::FindGroundZFor3DCoord(sth.x, sth.y, 2.0f + sth.z, &found);

-

-							if (found)

-								sth.z = 1.0f + groundZ;

-							m_pPed->m_nPedState = PED_IDLE;

-							m_pPed->SetMoveState(PEDMOVE_STILL);

-							CPed::PedSetOutCarCB(0, m_pPed);

-							CAnimManager::BlendAnimation(m_pPed->GetClump(), m_pPed->m_animGroup, ANIM_IDLE_STANCE, 100.0f);

-							CAnimManager::BlendAnimation(m_pPed->GetClump(), ASSOCGRP_STD, ANIM_FALL_LAND, 100.0f);

-							m_pPed->GetPosition() = sth;

-							m_pPed->SetMoveState(PEDMOVE_STILL);

-							m_pPed->m_vecMoveSpeed = veh->m_vecMoveSpeed;

-						}

-					} else {

-						// The code in here was under CPed::SetExitBoat in VC, did the same for here.

-						m_pPed->SetExitBoat(veh);

-						m_pPed->bTryingToReachDryLand = true;

-					}

-				}

-			}

-		} else {

-			// Enter vehicle

-			if (CPad::GetPad(0)->ExitVehicleJustDown()) {

-				bool weAreOnBoat = false;

-				float lastCloseness = 0.0f;

-				CVehicle *carBelow = nil;

-				CEntity *surfaceBelow = m_pPed->m_pCurrentPhysSurface;

-				if (surfaceBelow && surfaceBelow->IsVehicle()) {

-					carBelow = (CVehicle*)surfaceBelow;

-					if (carBelow->IsBoat()) {

-						weAreOnBoat = true;

-						m_pPed->bOnBoat = true;

-#ifdef VC_PED_PORTS

-						if (carBelow->m_status != STATUS_WRECKED && carBelow->GetUp().z > 0.3f)

-#else

-						if (carBelow->m_status != STATUS_WRECKED)

-#endif

-							m_pPed->SetSeekBoatPosition(carBelow);

-					}

-				}

-				// Find closest car

-				if (!weAreOnBoat) {

-					float minX = m_pPed->GetPosition().x - 10.0f;

-					float maxX = 10.0f + m_pPed->GetPosition().x;

-					float minY = m_pPed->GetPosition().y - 10.0f;

-					float maxY = 10.0f + m_pPed->GetPosition().y;

-

-					int minXSector = CWorld::GetSectorIndexX(minX);

-					if (minXSector < 0) minXSector = 0;

-					int minYSector = CWorld::GetSectorIndexY(minY);

-					if (minYSector < 0) minYSector = 0;

-					int maxXSector = CWorld::GetSectorIndexX(maxX);

-					if (maxXSector > NUMSECTORS_X - 1) maxXSector = NUMSECTORS_X - 1;

-					int maxYSector = CWorld::GetSectorIndexY(maxY);

-					if (maxYSector > NUMSECTORS_Y - 1) maxYSector = NUMSECTORS_Y - 1;

-

-					CWorld::AdvanceCurrentScanCode();

-

-					for (int curY = minYSector; curY <= maxYSector; curY++) {

-						for (int curX = minXSector; curX <= maxXSector; curX++) {

-							CSector *sector = CWorld::GetSector(curX, curY);

-							FindClosestCarSectorList(sector->m_lists[ENTITYLIST_VEHICLES], m_pPed,

-								minX, minY, maxX, maxY, &lastCloseness, &carBelow);

-							FindClosestCarSectorList(sector->m_lists[ENTITYLIST_VEHICLES_OVERLAP], m_pPed,

-								minX, minY, maxX, maxY, &lastCloseness, &carBelow);

-						}

-					}

-				}

-				// carBelow is now closest vehicle

-				if (carBelow && !weAreOnBoat) {

-					if (carBelow->m_status == STATUS_TRAIN_NOT_MOVING) {

-						m_pPed->SetObjective(OBJECTIVE_ENTER_CAR_AS_PASSENGER, carBelow);

-					} else if (carBelow->IsBoat()) {

-						if (!carBelow->pDriver) {

-							m_pPed->m_vehEnterType = 0;

-							m_pPed->SetEnterCar(carBelow, m_pPed->m_vehEnterType);

-						}

-					} else {

-						m_pPed->SetObjective(OBJECTIVE_ENTER_CAR_AS_DRIVER, carBelow);

-					}

-				}

-			}

-		}

-	}

-	if (m_bInRemoteMode) {

-		uint32 timeWithoutRemoteCar = CTimer::GetTimeInMilliseconds() - m_nTimeLostRemoteCar;

-		if (CTimer::GetPreviousTimeInMilliseconds() - m_nTimeLostRemoteCar < 1000 && timeWithoutRemoteCar >= 1000 && m_WBState == WBSTATE_PLAYING) {

-			TheCamera.SetFadeColour(0, 0, 0);

-			TheCamera.Fade(1.0f, 0);

-		}

-		if (timeWithoutRemoteCar > 2000) {

-			if (m_WBState == WBSTATE_PLAYING) {

-				TheCamera.RestoreWithJumpCut();

-				TheCamera.SetFadeColour(0, 0, 0);

-				TheCamera.Fade(1.0f, 1);

-				TheCamera.Process();

-				CTimer::Stop();

-				CCullZones::ForceCullZoneCoors(TheCamera.GetPosition());

-				CRenderer::RequestObjectsInFrustum();

-				CStreaming::LoadAllRequestedModels(false);

-				CTimer::Update();

-			}

-			m_bInRemoteMode = false;

-			CWorld::Players[CWorld::PlayerInFocus].m_pRemoteVehicle = nil;

-			if (FindPlayerVehicle()) {

-				FindPlayerVehicle()->m_status = STATUS_PLAYER;

-			}

-		}

-	}

-	if (!(CTimer::GetFrameCounter() & 31)) {

-		CVehicle *veh = FindPlayerVehicle();

-		if (veh && m_pPed->bInVehicle && veh->GetUp().z < 0.0f

-			&& veh->m_vecMoveSpeed.Magnitude() < 0.05f && veh->IsCar() && !veh->bIsInWater) {

-

-			if (veh->GetUp().z < -0.5f) {

-				m_nUpsideDownCounter += 2;

-			

-			} else {

-				m_nUpsideDownCounter++;

-			}

-		} else {

-			m_nUpsideDownCounter = 0;

-		}

-

-		if (m_nUpsideDownCounter > 6 && veh->bCanBeDamaged) {

-			veh->m_fHealth = 249.0f < veh->m_fHealth ? 249.0f : veh->m_fHealth;

-			if (veh->IsCar()) {

-				CAutomobile* car = (CAutomobile*)veh;

-				car->Damage.SetEngineStatus(225);

-				car->m_pSetOnFireEntity = nil;

-			}

-		}

-	}

-	if (FindPlayerVehicle()) {

-		CVehicle *veh = FindPlayerVehicle();

-		veh->m_nZoneLevel = -1;

-		for (int i = 0; i < ARRAY_SIZE(veh->pPassengers); i++) {

-			if (veh->pPassengers[i])

-				veh->pPassengers[i]->m_nZoneLevel = 0;

-		}

-		CStats::DistanceTravelledInVehicle += veh->m_fDistanceTravelled;

-	} else {

-		CStats::DistanceTravelledOnFoot += FindPlayerPed()->m_fDistanceTravelled;

-	}

+void
+CPlayerInfo::Process(void)
+{
+	// Unused taxi feature. Gives you a dollar for every second with a passenger. Can be toggled via 0x29A opcode.
+	bool startTaxiTimer = true;
+	if (m_bUnusedTaxiThing && m_pPed->bInVehicle) {
+		CVehicle *veh = m_pPed->m_pMyVehicle;
+		if ((veh->m_modelIndex == MI_TAXI || veh->m_modelIndex == MI_CABBIE || veh->m_modelIndex == MI_BORGNINE)
+			&& veh->pDriver == m_pPed && veh->m_nNumPassengers != 0) {
+			for (uint32 timePassed = CTimer::GetTimeInMilliseconds() - m_nUnusedTaxiTimer; timePassed >= 1000; m_nUnusedTaxiTimer += 1000) {
+				timePassed -= 1000;
+				++m_nMoney;
+			}
+			startTaxiTimer = false;
+		}
+	}
+	if (startTaxiTimer)
+		m_nUnusedTaxiTimer = CTimer::GetTimeInMilliseconds();
+
+	// The effect that makes money counter does while earning/losing money
+	if (m_nVisibleMoney != m_nMoney) {
+		int diff = m_nMoney - m_nVisibleMoney;
+		int diffAbs = Abs(diff);
+		int changeBy;
+
+		if (diffAbs > 100000)
+			changeBy = 12345;
+		else if (diffAbs > 10000)
+			changeBy = 1234;
+		else if (diffAbs > 1000)
+			changeBy = 123;
+		else if (diffAbs > 50)
+			changeBy = 42;
+		else
+			changeBy = 1;
+
+		if (diff < 0)
+			m_nVisibleMoney -= changeBy;
+		else
+			m_nVisibleMoney += changeBy;
+	}
+
+	if (!(CTimer::GetFrameCounter() & 15)) {
+		CVector2D playerPos = m_pPed->bInVehicle ? m_pPed->m_pMyVehicle->GetPosition() : m_pPed->GetPosition();
+		m_fRoadDensity = ThePaths.CalcRoadDensity(playerPos.x, playerPos.y);
+	}
+
+	m_fRoadDensity = clamp(m_fRoadDensity, 0.4f, 1.45f);
+
+	// Because vehicle enter/exit use same key binding.
+	bool enterOrExitVeh;
+	if (m_pPed->bVehExitWillBeInstant && m_pPed->bInVehicle)
+		enterOrExitVeh = CPad::GetPad(0)->ExitVehicleJustDown();
+	else
+		enterOrExitVeh = CPad::GetPad(0)->GetExitVehicle();
+
+	if (enterOrExitVeh && m_pPed->m_nPedState != PED_SNIPER_MODE && m_pPed->m_nPedState != PED_ROCKET_ODE) {
+		if (m_pPed->bInVehicle) {
+			if (!m_pRemoteVehicle) {
+				CEntity *surfaceBelowVeh = m_pPed->m_pMyVehicle->m_pCurGroundEntity;
+				if (!surfaceBelowVeh || !CBridge::ThisIsABridgeObjectMovingUp(surfaceBelowVeh->m_modelIndex)) {
+					CVehicle *veh = m_pPed->m_pMyVehicle;
+					if (!veh->IsBoat() || veh->m_nDoorLock == CARLOCK_LOCKED_PLAYER_INSIDE) {
+
+						// This condition will always return true, else block was probably WIP Miami code.
+						if (veh->m_vehType != VEHICLE_TYPE_BIKE || veh->m_nDoorLock == CARLOCK_LOCKED_PLAYER_INSIDE) {
+							if (veh->m_status != STATUS_WRECKED && veh->m_status != STATUS_TRAIN_MOVING && veh->m_nDoorLock != CARLOCK_LOCKED_PLAYER_INSIDE) {
+								if (veh->m_vecMoveSpeed.Magnitude() < 0.17f && CTimer::GetTimeScale() >= 0.5f && !veh->bIsInWater) {
+									m_pPed->SetObjective(OBJECTIVE_LEAVE_VEHICLE, veh);
+								}
+							}
+						} else {
+							CVector sth = 0.7f * veh->GetRight() + veh->GetPosition();
+							bool found = false;
+							float groundZ = CWorld::FindGroundZFor3DCoord(sth.x, sth.y, 2.0f + sth.z, &found);
+
+							if (found)
+								sth.z = 1.0f + groundZ;
+							m_pPed->m_nPedState = PED_IDLE;
+							m_pPed->SetMoveState(PEDMOVE_STILL);
+							CPed::PedSetOutCarCB(0, m_pPed);
+							CAnimManager::BlendAnimation(m_pPed->GetClump(), m_pPed->m_animGroup, ANIM_IDLE_STANCE, 100.0f);
+							CAnimManager::BlendAnimation(m_pPed->GetClump(), ASSOCGRP_STD, ANIM_FALL_LAND, 100.0f);
+							m_pPed->GetPosition() = sth;
+							m_pPed->SetMoveState(PEDMOVE_STILL);
+							m_pPed->m_vecMoveSpeed = veh->m_vecMoveSpeed;
+						}
+					} else {
+						// The code in here was under CPed::SetExitBoat in VC, did the same for here.
+						m_pPed->SetExitBoat(veh);
+						m_pPed->bTryingToReachDryLand = true;
+					}
+				}
+			}
+		} else {
+			// Enter vehicle
+			if (CPad::GetPad(0)->ExitVehicleJustDown()) {
+				bool weAreOnBoat = false;
+				float lastCloseness = 0.0f;
+				CVehicle *carBelow = nil;
+				CEntity *surfaceBelow = m_pPed->m_pCurrentPhysSurface;
+				if (surfaceBelow && surfaceBelow->IsVehicle()) {
+					carBelow = (CVehicle*)surfaceBelow;
+					if (carBelow->IsBoat()) {
+						weAreOnBoat = true;
+						m_pPed->bOnBoat = true;
+#ifdef VC_PED_PORTS
+						if (carBelow->m_status != STATUS_WRECKED && carBelow->GetUp().z > 0.3f)
+#else
+						if (carBelow->m_status != STATUS_WRECKED)
+#endif
+							m_pPed->SetSeekBoatPosition(carBelow);
+					}
+				}
+				// Find closest car
+				if (!weAreOnBoat) {
+					float minX = m_pPed->GetPosition().x - 10.0f;
+					float maxX = 10.0f + m_pPed->GetPosition().x;
+					float minY = m_pPed->GetPosition().y - 10.0f;
+					float maxY = 10.0f + m_pPed->GetPosition().y;
+
+					int minXSector = CWorld::GetSectorIndexX(minX);
+					if (minXSector < 0) minXSector = 0;
+					int minYSector = CWorld::GetSectorIndexY(minY);
+					if (minYSector < 0) minYSector = 0;
+					int maxXSector = CWorld::GetSectorIndexX(maxX);
+					if (maxXSector > NUMSECTORS_X - 1) maxXSector = NUMSECTORS_X - 1;
+					int maxYSector = CWorld::GetSectorIndexY(maxY);
+					if (maxYSector > NUMSECTORS_Y - 1) maxYSector = NUMSECTORS_Y - 1;
+
+					CWorld::AdvanceCurrentScanCode();
+
+					for (int curY = minYSector; curY <= maxYSector; curY++) {
+						for (int curX = minXSector; curX <= maxXSector; curX++) {
+							CSector *sector = CWorld::GetSector(curX, curY);
+							FindClosestCarSectorList(sector->m_lists[ENTITYLIST_VEHICLES], m_pPed,
+								minX, minY, maxX, maxY, &lastCloseness, &carBelow);
+							FindClosestCarSectorList(sector->m_lists[ENTITYLIST_VEHICLES_OVERLAP], m_pPed,
+								minX, minY, maxX, maxY, &lastCloseness, &carBelow);
+						}
+					}
+				}
+				// carBelow is now closest vehicle
+				if (carBelow && !weAreOnBoat) {
+					if (carBelow->m_status == STATUS_TRAIN_NOT_MOVING) {
+						m_pPed->SetObjective(OBJECTIVE_ENTER_CAR_AS_PASSENGER, carBelow);
+					} else if (carBelow->IsBoat()) {
+						if (!carBelow->pDriver) {
+							m_pPed->m_vehEnterType = 0;
+							m_pPed->SetEnterCar(carBelow, m_pPed->m_vehEnterType);
+						}
+					} else {
+						m_pPed->SetObjective(OBJECTIVE_ENTER_CAR_AS_DRIVER, carBelow);
+					}
+				}
+			}
+		}
+	}
+	if (m_bInRemoteMode) {
+		uint32 timeWithoutRemoteCar = CTimer::GetTimeInMilliseconds() - m_nTimeLostRemoteCar;
+		if (CTimer::GetPreviousTimeInMilliseconds() - m_nTimeLostRemoteCar < 1000 && timeWithoutRemoteCar >= 1000 && m_WBState == WBSTATE_PLAYING) {
+			TheCamera.SetFadeColour(0, 0, 0);
+			TheCamera.Fade(1.0f, 0);
+		}
+		if (timeWithoutRemoteCar > 2000) {
+			if (m_WBState == WBSTATE_PLAYING) {
+				TheCamera.RestoreWithJumpCut();
+				TheCamera.SetFadeColour(0, 0, 0);
+				TheCamera.Fade(1.0f, 1);
+				TheCamera.Process();
+				CTimer::Stop();
+				CCullZones::ForceCullZoneCoors(TheCamera.GetPosition());
+				CRenderer::RequestObjectsInFrustum();
+				CStreaming::LoadAllRequestedModels(false);
+				CTimer::Update();
+			}
+			m_bInRemoteMode = false;
+			CWorld::Players[CWorld::PlayerInFocus].m_pRemoteVehicle = nil;
+			if (FindPlayerVehicle()) {
+				FindPlayerVehicle()->m_status = STATUS_PLAYER;
+			}
+		}
+	}
+	if (!(CTimer::GetFrameCounter() & 31)) {
+		CVehicle *veh = FindPlayerVehicle();
+		if (veh && m_pPed->bInVehicle && veh->GetUp().z < 0.0f
+			&& veh->m_vecMoveSpeed.Magnitude() < 0.05f && veh->IsCar() && !veh->bIsInWater) {
+
+			if (veh->GetUp().z < -0.5f) {
+				m_nUpsideDownCounter += 2;
+			
+			} else {
+				m_nUpsideDownCounter++;
+			}
+		} else {
+			m_nUpsideDownCounter = 0;
+		}
+
+		if (m_nUpsideDownCounter > 6 && veh->bCanBeDamaged) {
+			veh->m_fHealth = 249.0f < veh->m_fHealth ? 249.0f : veh->m_fHealth;
+			if (veh->IsCar()) {
+				CAutomobile* car = (CAutomobile*)veh;
+				car->Damage.SetEngineStatus(225);
+				car->m_pSetOnFireEntity = nil;
+			}
+		}
+	}
+	if (FindPlayerVehicle()) {
+		CVehicle *veh = FindPlayerVehicle();
+		veh->m_nZoneLevel = -1;
+		for (int i = 0; i < ARRAY_SIZE(veh->pPassengers); i++) {
+			if (veh->pPassengers[i])
+				veh->pPassengers[i]->m_nZoneLevel = 0;
+		}
+		CStats::DistanceTravelledInVehicle += veh->m_fDistanceTravelled;
+	} else {
+		CStats::DistanceTravelledOnFoot += FindPlayerPed()->m_fDistanceTravelled;
+	}
 }
 
 STARTPATCHES
diff --git a/src/core/PlayerSkin.cpp b/src/core/PlayerSkin.cpp
index 28879918..62bcd07d 100644
--- a/src/core/PlayerSkin.cpp
+++ b/src/core/PlayerSkin.cpp
@@ -1,171 +1,171 @@
-#include "common.h"

-#include "patcher.h"

-#include "main.h"

-#include "PlayerSkin.h"

-#include "TxdStore.h"

-#include "rtbmp.h"

-#include "ClumpModelInfo.h"

-#include "VisibilityPlugins.h"

-#include "World.h"

-#include "PlayerInfo.h"

-#include "CdStream.h"

-#include "FileMgr.h"

-#include "Directory.h"

-#include "RwHelper.h"

-#include "Timer.h"

-#include "Lights.h"

-

-int CPlayerSkin::m_txdSlot;

-

-void

-FindPlayerDff(uint32 &offset, uint32 &size)

-{

-	int file;

-	CDirectory::DirectoryInfo info;

-

-	file = CFileMgr::OpenFile("models\\gta3.dir", "rb");

-

-	do {

-		if (!CFileMgr::Read(file, (char*)&info, sizeof(CDirectory::DirectoryInfo)))

-			return;

-	} while (strcasecmp("player.dff", info.name) != 0);

-

-	offset = info.offset;

-	size = info.size;

-}

-

-void

-LoadPlayerDff(void)

-{

-	RwStream *stream;

-	RwMemory mem;

-	uint32 offset, size;

-	uint8 *buffer;

-	bool streamWasAdded = false;

-

-	if (CdStreamGetNumImages() == 0) {

-		CdStreamAddImage("models\\gta3.img");

-		streamWasAdded = true;

-	}

-

-	FindPlayerDff(offset, size);

-	buffer = (uint8*)RwMallocAlign(size << 11, 2048);

-	CdStreamRead(0, buffer, offset, size);

-	CdStreamSync(0);

-

-	mem.start = buffer;

-	mem.length = size << 11;

-	stream = RwStreamOpen(rwSTREAMMEMORY, rwSTREAMREAD, &mem);

-

-	if (RwStreamFindChunk(stream, rwID_CLUMP, nil, nil))

-		gpPlayerClump = RpClumpStreamRead(stream);

-

-	RwStreamClose(stream, &mem);

-	RwFreeAlign(buffer);

-

-	if (streamWasAdded)

-		CdStreamRemoveImages();

-}

-

-void

-CPlayerSkin::Initialise(void)

-{

-	m_txdSlot = CTxdStore::AddTxdSlot("skin");

-	CTxdStore::Create(m_txdSlot);

-	CTxdStore::AddRef(m_txdSlot);

-}

-

-void

-CPlayerSkin::Shutdown(void)

-{

-	CTxdStore::RemoveTxdSlot(m_txdSlot);

-}

-

-RwTexture *

-CPlayerSkin::GetSkinTexture(const char *texName)

-{

-	RwTexture *tex;

-	RwRaster *raster;

-	int32 width, height, depth, format;

-

-	CTxdStore::PushCurrentTxd();

-	CTxdStore::SetCurrentTxd(m_txdSlot);

-	tex = RwTextureRead(texName, NULL);

-	CTxdStore::PopCurrentTxd();

-	if (tex) return tex;

-

-	if (strcmp(DEFAULT_SKIN_NAME, texName) == 0)

-		sprintf(gString, "models\\generic\\player.bmp");

-	else

-		sprintf(gString, "skins\\%s.bmp", texName);

-

-	if (RwImage *image = RtBMPImageRead(gString)) {

-		RwImageFindRasterFormat(image, rwRASTERTYPETEXTURE, &width, &height, &depth, &format);

-		raster = RwRasterCreate(width, height, depth, format);

-		RwRasterSetFromImage(raster, image);

-

-		tex = RwTextureCreate(raster);

-		RwTextureSetName(tex, texName);

-#ifdef FIX_BUGS

-		RwTextureSetFilterMode(tex, rwFILTERLINEAR); // filtering bugfix from VC

-#endif

-		RwTexDictionaryAddTexture(CTxdStore::GetSlot(m_txdSlot)->texDict, tex);

-

-		RwImageDestroy(image);

-	}

-	return tex;

-}

-

-void

-CPlayerSkin::BeginFrontendSkinEdit(void)

-{

-	LoadPlayerDff();

-	RpClumpForAllAtomics(gpPlayerClump, CClumpModelInfo::SetAtomicRendererCB, CVisibilityPlugins::RenderPlayerCB);

-	CWorld::Players[0].LoadPlayerSkin();

-	gOldFov = CDraw::GetFOV();

-	CDraw::SetFOV(30.0f);

-}

-

-void

-CPlayerSkin::EndFrontendSkinEdit(void)

-{

-	RpClumpDestroy(gpPlayerClump);

-	gpPlayerClump = NULL;

-	CDraw::SetFOV(gOldFov);

-}

-

-void

-CPlayerSkin::RenderFrontendSkinEdit(void)

-{

-	static float rotation = 0.0f;

-	RwRGBAReal AmbientColor = { 0.65f, 0.65f, 0.65f, 1.0f };

-	RwV3d pos = { 1.35f, 0.35f, 7.725f };

-	const RwV3d axis1 = { 1.0f, 0.0f, 0.0f };

-	const RwV3d axis2 = { 0.0f, 0.0f, 1.0f };

-	static uint32 LastFlash = 0;

-

-	RwFrame *frame = RpClumpGetFrame(gpPlayerClump);

-

-	if (CTimer::GetTimeInMillisecondsPauseMode() - LastFlash > 7) {

-		rotation += 2.0f;

-		if (rotation > 360.0f)

-			rotation -= 360.0f;

-		LastFlash = CTimer::GetTimeInMillisecondsPauseMode();

-	}

-	RwFrameTransform(frame, RwFrameGetMatrix(RwCameraGetFrame(Scene.camera)), rwCOMBINEREPLACE);

-	RwFrameTranslate(frame, &pos, rwCOMBINEPRECONCAT);

-	RwFrameRotate(frame, &axis1, -90.0f, rwCOMBINEPRECONCAT);

-	RwFrameRotate(frame, &axis2, rotation, rwCOMBINEPRECONCAT);

-	RwFrameUpdateObjects(frame);

-	SetAmbientColours(&AmbientColor);

-	RpClumpRender(gpPlayerClump);

-}

-

-STARTPATCHES

-InjectHook(0x59B9B0, &CPlayerSkin::Initialise, PATCH_JUMP);

-InjectHook(0x59B9E0, &CPlayerSkin::Shutdown, PATCH_JUMP);

-InjectHook(0x59B9F0, &CPlayerSkin::GetSkinTexture, PATCH_JUMP);

-InjectHook(0x59BC70, &CPlayerSkin::BeginFrontendSkinEdit, PATCH_JUMP);

-InjectHook(0x59BCB0, &CPlayerSkin::EndFrontendSkinEdit, PATCH_JUMP);

-InjectHook(0x59BCE0, &CPlayerSkin::RenderFrontendSkinEdit, PATCH_JUMP);

+#include "common.h"
+#include "patcher.h"
+#include "main.h"
+#include "PlayerSkin.h"
+#include "TxdStore.h"
+#include "rtbmp.h"
+#include "ClumpModelInfo.h"
+#include "VisibilityPlugins.h"
+#include "World.h"
+#include "PlayerInfo.h"
+#include "CdStream.h"
+#include "FileMgr.h"
+#include "Directory.h"
+#include "RwHelper.h"
+#include "Timer.h"
+#include "Lights.h"
+
+int CPlayerSkin::m_txdSlot;
+
+void
+FindPlayerDff(uint32 &offset, uint32 &size)
+{
+	int file;
+	CDirectory::DirectoryInfo info;
+
+	file = CFileMgr::OpenFile("models\\gta3.dir", "rb");
+
+	do {
+		if (!CFileMgr::Read(file, (char*)&info, sizeof(CDirectory::DirectoryInfo)))
+			return;
+	} while (strcasecmp("player.dff", info.name) != 0);
+
+	offset = info.offset;
+	size = info.size;
+}
+
+void
+LoadPlayerDff(void)
+{
+	RwStream *stream;
+	RwMemory mem;
+	uint32 offset, size;
+	uint8 *buffer;
+	bool streamWasAdded = false;
+
+	if (CdStreamGetNumImages() == 0) {
+		CdStreamAddImage("models\\gta3.img");
+		streamWasAdded = true;
+	}
+
+	FindPlayerDff(offset, size);
+	buffer = (uint8*)RwMallocAlign(size << 11, 2048);
+	CdStreamRead(0, buffer, offset, size);
+	CdStreamSync(0);
+
+	mem.start = buffer;
+	mem.length = size << 11;
+	stream = RwStreamOpen(rwSTREAMMEMORY, rwSTREAMREAD, &mem);
+
+	if (RwStreamFindChunk(stream, rwID_CLUMP, nil, nil))
+		gpPlayerClump = RpClumpStreamRead(stream);
+
+	RwStreamClose(stream, &mem);
+	RwFreeAlign(buffer);
+
+	if (streamWasAdded)
+		CdStreamRemoveImages();
+}
+
+void
+CPlayerSkin::Initialise(void)
+{
+	m_txdSlot = CTxdStore::AddTxdSlot("skin");
+	CTxdStore::Create(m_txdSlot);
+	CTxdStore::AddRef(m_txdSlot);
+}
+
+void
+CPlayerSkin::Shutdown(void)
+{
+	CTxdStore::RemoveTxdSlot(m_txdSlot);
+}
+
+RwTexture *
+CPlayerSkin::GetSkinTexture(const char *texName)
+{
+	RwTexture *tex;
+	RwRaster *raster;
+	int32 width, height, depth, format;
+
+	CTxdStore::PushCurrentTxd();
+	CTxdStore::SetCurrentTxd(m_txdSlot);
+	tex = RwTextureRead(texName, NULL);
+	CTxdStore::PopCurrentTxd();
+	if (tex) return tex;
+
+	if (strcmp(DEFAULT_SKIN_NAME, texName) == 0)
+		sprintf(gString, "models\\generic\\player.bmp");
+	else
+		sprintf(gString, "skins\\%s.bmp", texName);
+
+	if (RwImage *image = RtBMPImageRead(gString)) {
+		RwImageFindRasterFormat(image, rwRASTERTYPETEXTURE, &width, &height, &depth, &format);
+		raster = RwRasterCreate(width, height, depth, format);
+		RwRasterSetFromImage(raster, image);
+
+		tex = RwTextureCreate(raster);
+		RwTextureSetName(tex, texName);
+#ifdef FIX_BUGS
+		RwTextureSetFilterMode(tex, rwFILTERLINEAR); // filtering bugfix from VC
+#endif
+		RwTexDictionaryAddTexture(CTxdStore::GetSlot(m_txdSlot)->texDict, tex);
+
+		RwImageDestroy(image);
+	}
+	return tex;
+}
+
+void
+CPlayerSkin::BeginFrontendSkinEdit(void)
+{
+	LoadPlayerDff();
+	RpClumpForAllAtomics(gpPlayerClump, CClumpModelInfo::SetAtomicRendererCB, CVisibilityPlugins::RenderPlayerCB);
+	CWorld::Players[0].LoadPlayerSkin();
+	gOldFov = CDraw::GetFOV();
+	CDraw::SetFOV(30.0f);
+}
+
+void
+CPlayerSkin::EndFrontendSkinEdit(void)
+{
+	RpClumpDestroy(gpPlayerClump);
+	gpPlayerClump = NULL;
+	CDraw::SetFOV(gOldFov);
+}
+
+void
+CPlayerSkin::RenderFrontendSkinEdit(void)
+{
+	static float rotation = 0.0f;
+	RwRGBAReal AmbientColor = { 0.65f, 0.65f, 0.65f, 1.0f };
+	RwV3d pos = { 1.35f, 0.35f, 7.725f };
+	const RwV3d axis1 = { 1.0f, 0.0f, 0.0f };
+	const RwV3d axis2 = { 0.0f, 0.0f, 1.0f };
+	static uint32 LastFlash = 0;
+
+	RwFrame *frame = RpClumpGetFrame(gpPlayerClump);
+
+	if (CTimer::GetTimeInMillisecondsPauseMode() - LastFlash > 7) {
+		rotation += 2.0f;
+		if (rotation > 360.0f)
+			rotation -= 360.0f;
+		LastFlash = CTimer::GetTimeInMillisecondsPauseMode();
+	}
+	RwFrameTransform(frame, RwFrameGetMatrix(RwCameraGetFrame(Scene.camera)), rwCOMBINEREPLACE);
+	RwFrameTranslate(frame, &pos, rwCOMBINEPRECONCAT);
+	RwFrameRotate(frame, &axis1, -90.0f, rwCOMBINEPRECONCAT);
+	RwFrameRotate(frame, &axis2, rotation, rwCOMBINEPRECONCAT);
+	RwFrameUpdateObjects(frame);
+	SetAmbientColours(&AmbientColor);
+	RpClumpRender(gpPlayerClump);
+}
+
+STARTPATCHES
+InjectHook(0x59B9B0, &CPlayerSkin::Initialise, PATCH_JUMP);
+InjectHook(0x59B9E0, &CPlayerSkin::Shutdown, PATCH_JUMP);
+InjectHook(0x59B9F0, &CPlayerSkin::GetSkinTexture, PATCH_JUMP);
+InjectHook(0x59BC70, &CPlayerSkin::BeginFrontendSkinEdit, PATCH_JUMP);
+InjectHook(0x59BCB0, &CPlayerSkin::EndFrontendSkinEdit, PATCH_JUMP);
+InjectHook(0x59BCE0, &CPlayerSkin::RenderFrontendSkinEdit, PATCH_JUMP);
 ENDPATCHES
\ No newline at end of file
diff --git a/src/core/obrstr.cpp b/src/core/obrstr.cpp
index 3663d134..d9f7e9b4 100644
--- a/src/core/obrstr.cpp
+++ b/src/core/obrstr.cpp
@@ -1,119 +1,119 @@
-#include "common.h"

-#include "Debug.h"

-#include "obrstr.h"

-

-char obrstr[128];

-char obrstr2[128];

-

-void ObrInt(int32 n1)

-{

-	IntToStr(n1, obrstr);

-	CDebug::DebugAddText(obrstr);

-}

-

-void ObrInt2(int32 n1, int32 n2)

-{

-	IntToStr(n1, obrstr);

-	strcat(obrstr, "  ");

-	IntToStr(n2, obrstr2);

-	strcat(obrstr, obrstr2);

-	CDebug::DebugAddText(obrstr);

-}

-

-void ObrInt3(int32 n1, int32 n2, int32 n3)

-{

-	IntToStr(n1, obrstr);

-	strcat(obrstr, "  ");

-	IntToStr(n2, obrstr2);

-	strcat(obrstr, obrstr2);

-	strcat(obrstr, "  ");

-	IntToStr(n3, obrstr2);

-	strcat(obrstr, obrstr2);

-	CDebug::DebugAddText(obrstr);

-}

-

-void ObrInt4(int32 n1, int32 n2, int32 n3, int32 n4)

-{

-	IntToStr(n1, obrstr);

-	strcat(obrstr, "  ");

-	IntToStr(n2, obrstr2);

-	strcat(obrstr, obrstr2);

-	strcat(obrstr, "  ");

-	IntToStr(n3, obrstr2);

-	strcat(obrstr, obrstr2);

-	strcat(obrstr, "  ");

-	IntToStr(n4, obrstr2);

-	strcat(obrstr, obrstr2);

-	CDebug::DebugAddText(obrstr);

-}

-

-void ObrInt5(int32 n1, int32 n2, int32 n3, int32 n4, int32 n5)

-{

-	IntToStr(n1, obrstr);

-	strcat(obrstr, "  ");

-	IntToStr(n2, obrstr2);

-	strcat(obrstr, obrstr2);

-	strcat(obrstr, "  ");

-	IntToStr(n3, obrstr2);

-	strcat(obrstr, obrstr2);

-	strcat(obrstr, "  ");

-	IntToStr(n4, obrstr2);

-	strcat(obrstr, obrstr2);

-	strcat(obrstr, "  ");

-	IntToStr(n5, obrstr2);

-	strcat(obrstr, obrstr2);

-	CDebug::DebugAddText(obrstr);

-}

-

-void ObrInt6(int32 n1, int32 n2, int32 n3, int32 n4, int32 n5, int32 n6)

-{

-	IntToStr(n1, obrstr);

-	strcat(obrstr, "  ");

-	IntToStr(n2, obrstr2);

-	strcat(obrstr, obrstr2);

-	strcat(obrstr, "  ");

-	IntToStr(n3, obrstr2);

-	strcat(obrstr, obrstr2);

-	strcat(obrstr, "  ");

-	IntToStr(n4, obrstr2);

-	strcat(obrstr, obrstr2);

-	strcat(obrstr, "  ");

-	IntToStr(n5, obrstr2);

-	strcat(obrstr, obrstr2);

-	strcat(obrstr, "  ");

-	IntToStr(n6, obrstr2);

-	strcat(obrstr, obrstr2);

-	CDebug::DebugAddText(obrstr);

-}

-

-void IntToStr(int32 inNum, char *outStr)

-{

-	bool isNeg = inNum < 0;

-

-	if (isNeg) {

-		inNum = -inNum;

-		*outStr = '-';

-	}

-

-	int16 digits = 1;

-

-	if (inNum > 9) {

-		int32 _inNum = inNum;

-		do {

-			digits++;

-			_inNum /= 10;

-		} while (_inNum > 9);

-	}

-

-	int32 strSize = digits;

-	if (isNeg)

-		strSize++;

-

-	char *pStr = &outStr[strSize];

-	int32 i = 0;

-	do {

-		*(pStr-- - 1) = (inNum % 10) + '0';

-		inNum /= 10;

-	} while (++i < strSize);

-	outStr[strSize] = '\0';

+#include "common.h"
+#include "Debug.h"
+#include "obrstr.h"
+
+char obrstr[128];
+char obrstr2[128];
+
+void ObrInt(int32 n1)
+{
+	IntToStr(n1, obrstr);
+	CDebug::DebugAddText(obrstr);
+}
+
+void ObrInt2(int32 n1, int32 n2)
+{
+	IntToStr(n1, obrstr);
+	strcat(obrstr, "  ");
+	IntToStr(n2, obrstr2);
+	strcat(obrstr, obrstr2);
+	CDebug::DebugAddText(obrstr);
+}
+
+void ObrInt3(int32 n1, int32 n2, int32 n3)
+{
+	IntToStr(n1, obrstr);
+	strcat(obrstr, "  ");
+	IntToStr(n2, obrstr2);
+	strcat(obrstr, obrstr2);
+	strcat(obrstr, "  ");
+	IntToStr(n3, obrstr2);
+	strcat(obrstr, obrstr2);
+	CDebug::DebugAddText(obrstr);
+}
+
+void ObrInt4(int32 n1, int32 n2, int32 n3, int32 n4)
+{
+	IntToStr(n1, obrstr);
+	strcat(obrstr, "  ");
+	IntToStr(n2, obrstr2);
+	strcat(obrstr, obrstr2);
+	strcat(obrstr, "  ");
+	IntToStr(n3, obrstr2);
+	strcat(obrstr, obrstr2);
+	strcat(obrstr, "  ");
+	IntToStr(n4, obrstr2);
+	strcat(obrstr, obrstr2);
+	CDebug::DebugAddText(obrstr);
+}
+
+void ObrInt5(int32 n1, int32 n2, int32 n3, int32 n4, int32 n5)
+{
+	IntToStr(n1, obrstr);
+	strcat(obrstr, "  ");
+	IntToStr(n2, obrstr2);
+	strcat(obrstr, obrstr2);
+	strcat(obrstr, "  ");
+	IntToStr(n3, obrstr2);
+	strcat(obrstr, obrstr2);
+	strcat(obrstr, "  ");
+	IntToStr(n4, obrstr2);
+	strcat(obrstr, obrstr2);
+	strcat(obrstr, "  ");
+	IntToStr(n5, obrstr2);
+	strcat(obrstr, obrstr2);
+	CDebug::DebugAddText(obrstr);
+}
+
+void ObrInt6(int32 n1, int32 n2, int32 n3, int32 n4, int32 n5, int32 n6)
+{
+	IntToStr(n1, obrstr);
+	strcat(obrstr, "  ");
+	IntToStr(n2, obrstr2);
+	strcat(obrstr, obrstr2);
+	strcat(obrstr, "  ");
+	IntToStr(n3, obrstr2);
+	strcat(obrstr, obrstr2);
+	strcat(obrstr, "  ");
+	IntToStr(n4, obrstr2);
+	strcat(obrstr, obrstr2);
+	strcat(obrstr, "  ");
+	IntToStr(n5, obrstr2);
+	strcat(obrstr, obrstr2);
+	strcat(obrstr, "  ");
+	IntToStr(n6, obrstr2);
+	strcat(obrstr, obrstr2);
+	CDebug::DebugAddText(obrstr);
+}
+
+void IntToStr(int32 inNum, char *outStr)
+{
+	bool isNeg = inNum < 0;
+
+	if (isNeg) {
+		inNum = -inNum;
+		*outStr = '-';
+	}
+
+	int16 digits = 1;
+
+	if (inNum > 9) {
+		int32 _inNum = inNum;
+		do {
+			digits++;
+			_inNum /= 10;
+		} while (_inNum > 9);
+	}
+
+	int32 strSize = digits;
+	if (isNeg)
+		strSize++;
+
+	char *pStr = &outStr[strSize];
+	int32 i = 0;
+	do {
+		*(pStr-- - 1) = (inNum % 10) + '0';
+		inNum /= 10;
+	} while (++i < strSize);
+	outStr[strSize] = '\0';
 }
\ No newline at end of file
diff --git a/src/core/obrstr.h b/src/core/obrstr.h
index 6838afb5..c1633614 100644
--- a/src/core/obrstr.h
+++ b/src/core/obrstr.h
@@ -1,9 +1,9 @@
-#pragma once

-

-void ObrInt(int32 n1);

-void ObrInt2(int32 n1, int32 n2);

-void ObrInt3(int32 n1, int32 n2, int32 n3);

-void ObrInt4(int32 n1, int32 n2, int32 n3, int32 n4);

-void ObrInt5(int32 n1, int32 n2, int32 n3, int32 n4, int32 n5);

-void ObrInt6(int32 n1, int32 n2, int32 n3, int32 n4, int32 n5, int32 n6);

+#pragma once
+
+void ObrInt(int32 n1);
+void ObrInt2(int32 n1, int32 n2);
+void ObrInt3(int32 n1, int32 n2, int32 n3);
+void ObrInt4(int32 n1, int32 n2, int32 n3, int32 n4);
+void ObrInt5(int32 n1, int32 n2, int32 n3, int32 n4, int32 n5);
+void ObrInt6(int32 n1, int32 n2, int32 n3, int32 n4, int32 n5, int32 n6);
 void IntToStr(int32 inNum, char *outStr);
\ No newline at end of file
diff --git a/src/core/timebars.cpp b/src/core/timebars.cpp
index 30421731..93d85f8d 100644
--- a/src/core/timebars.cpp
+++ b/src/core/timebars.cpp
@@ -1,121 +1,121 @@
-#ifndef MASTER

-#include "common.h"

-#include "Font.h"

-#include "Frontend.h"

-#include "Timer.h"

-#include "Text.h"

-

-#define MAX_TIMERS (50)

-#define MAX_MS_COLLECTED (40)

-

-// enables frame time output

-#define FRAMETIME

-

-struct sTimeBar

-{

-	char name[20];

-	float startTime;

-	float endTime;

-	int32 unk;

-};

-

-struct

-{

-	sTimeBar Timers[MAX_TIMERS];

-	uint32 count;

-} TimerBar;

-float MaxTimes[MAX_TIMERS];

-float MaxFrameTime;

-

-uint32 curMS;

-uint32 msCollected[MAX_MS_COLLECTED];

-#ifdef FRAMETIME

-float FrameInitTime;

-#endif

-

-void tbInit()

-{

-	TimerBar.count = 0;

-	uint32 i = CTimer::GetFrameCounter() & 0x7F;

-	if (i == 0) {

-		do

-			MaxTimes[i++] = 0.0f;

-		while (i != MAX_TIMERS);

-#ifdef FRAMETIME

-		MaxFrameTime = 0.0f;

-#endif

-	}

-#ifdef FRAMETIME

-	FrameInitTime = (float)CTimer::GetCurrentTimeInCycles() / (float)CTimer::GetCyclesPerFrame();

-#endif

-}

-

-void tbStartTimer(int32 unk, char *name)

-{

-	strcpy(TimerBar.Timers[TimerBar.count].name, name);

-	TimerBar.Timers[TimerBar.count].unk = unk;

-	TimerBar.Timers[TimerBar.count].startTime = (float)CTimer::GetCurrentTimeInCycles() / (float)CTimer::GetCyclesPerFrame();

-	TimerBar.count++;

-}

-

-void tbEndTimer(char* name)

-{

-	uint32 n = 1500;

-	for (uint32 i = 0; i < TimerBar.count; i++) {

-		if (strcmp(name, TimerBar.Timers[i].name) == 0)

-			n = i;

-	}

-	assert(n != 1500);

-	TimerBar.Timers[n].endTime = (float)CTimer::GetCurrentTimeInCycles() / (float)CTimer::GetCyclesPerFrame();

-}

-

-float Diag_GetFPS()

-{

-	return 39000.0f / (msCollected[(curMS - 1) % MAX_MS_COLLECTED] - msCollected[curMS % MAX_MS_COLLECTED]);

-}

-

-void tbDisplay()

-{

-	char temp[200];

-	wchar wtemp[200];

-

-#ifdef FRAMETIME

-	float FrameEndTime = (float)CTimer::GetCurrentTimeInCycles() / (float)CTimer::GetCyclesPerFrame();

-#endif

-

-	msCollected[(curMS++) % MAX_MS_COLLECTED] = RsTimer();

-	CFont::SetBackgroundOff();

-	CFont::SetBackgroundColor(CRGBA(0, 0, 0, 128));

-	CFont::SetScale(0.48f, 1.12f);

-	CFont::SetCentreOff();

-	CFont::SetJustifyOff();

-	CFont::SetWrapx(640.0f);

-	CFont::SetRightJustifyOff();

-	CFont::SetPropOn();

-	CFont::SetFontStyle(FONT_BANK);

-	sprintf(temp, "FPS: %.2f", Diag_GetFPS());

-	AsciiToUnicode(temp, wtemp);

-	CFont::SetColor(CRGBA(255, 255, 255, 255));

-	if (!CMenuManager::m_PrefsMarketing || !CMenuManager::m_PrefsDisableTutorials) {

-		CFont::PrintString(RsGlobal.maximumWidth * (4.0f / DEFAULT_SCREEN_WIDTH), RsGlobal.maximumHeight * (4.0f / DEFAULT_SCREEN_HEIGHT), wtemp);

-

-#ifndef FINAL

-		// Timers output (my own implementation)

-		for (uint32 i = 0; i < TimerBar.count; i++) {

-			MaxTimes[i] = max(MaxTimes[i], TimerBar.Timers[i].endTime - TimerBar.Timers[i].startTime);

-			sprintf(temp, "%s: %.2f", &TimerBar.Timers[i].name[0], MaxTimes[i]);

-			AsciiToUnicode(temp, wtemp);

-			CFont::PrintString(RsGlobal.maximumWidth * (4.0f / DEFAULT_SCREEN_WIDTH), RsGlobal.maximumHeight * ((8.0f * (i + 2)) / DEFAULT_SCREEN_HEIGHT), wtemp);

-		}

-

-#ifdef FRAMETIME

-		MaxFrameTime = max(MaxFrameTime, FrameEndTime - FrameInitTime);

-		sprintf(temp, "Frame Time: %.2f", MaxFrameTime);

-		AsciiToUnicode(temp, wtemp);

-

-		CFont::PrintString(RsGlobal.maximumWidth * (4.0f / DEFAULT_SCREEN_WIDTH), RsGlobal.maximumHeight * ((8.0f * (TimerBar.count + 4)) / DEFAULT_SCREEN_HEIGHT), wtemp);

-#endif // FRAMETIME

-#endif // !FINAL

-	}

-}

+#ifndef MASTER
+#include "common.h"
+#include "Font.h"
+#include "Frontend.h"
+#include "Timer.h"
+#include "Text.h"
+
+#define MAX_TIMERS (50)
+#define MAX_MS_COLLECTED (40)
+
+// enables frame time output
+#define FRAMETIME
+
+struct sTimeBar
+{
+	char name[20];
+	float startTime;
+	float endTime;
+	int32 unk;
+};
+
+struct
+{
+	sTimeBar Timers[MAX_TIMERS];
+	uint32 count;
+} TimerBar;
+float MaxTimes[MAX_TIMERS];
+float MaxFrameTime;
+
+uint32 curMS;
+uint32 msCollected[MAX_MS_COLLECTED];
+#ifdef FRAMETIME
+float FrameInitTime;
+#endif
+
+void tbInit()
+{
+	TimerBar.count = 0;
+	uint32 i = CTimer::GetFrameCounter() & 0x7F;
+	if (i == 0) {
+		do
+			MaxTimes[i++] = 0.0f;
+		while (i != MAX_TIMERS);
+#ifdef FRAMETIME
+		MaxFrameTime = 0.0f;
+#endif
+	}
+#ifdef FRAMETIME
+	FrameInitTime = (float)CTimer::GetCurrentTimeInCycles() / (float)CTimer::GetCyclesPerFrame();
+#endif
+}
+
+void tbStartTimer(int32 unk, char *name)
+{
+	strcpy(TimerBar.Timers[TimerBar.count].name, name);
+	TimerBar.Timers[TimerBar.count].unk = unk;
+	TimerBar.Timers[TimerBar.count].startTime = (float)CTimer::GetCurrentTimeInCycles() / (float)CTimer::GetCyclesPerFrame();
+	TimerBar.count++;
+}
+
+void tbEndTimer(char* name)
+{
+	uint32 n = 1500;
+	for (uint32 i = 0; i < TimerBar.count; i++) {
+		if (strcmp(name, TimerBar.Timers[i].name) == 0)
+			n = i;
+	}
+	assert(n != 1500);
+	TimerBar.Timers[n].endTime = (float)CTimer::GetCurrentTimeInCycles() / (float)CTimer::GetCyclesPerFrame();
+}
+
+float Diag_GetFPS()
+{
+	return 39000.0f / (msCollected[(curMS - 1) % MAX_MS_COLLECTED] - msCollected[curMS % MAX_MS_COLLECTED]);
+}
+
+void tbDisplay()
+{
+	char temp[200];
+	wchar wtemp[200];
+
+#ifdef FRAMETIME
+	float FrameEndTime = (float)CTimer::GetCurrentTimeInCycles() / (float)CTimer::GetCyclesPerFrame();
+#endif
+
+	msCollected[(curMS++) % MAX_MS_COLLECTED] = RsTimer();
+	CFont::SetBackgroundOff();
+	CFont::SetBackgroundColor(CRGBA(0, 0, 0, 128));
+	CFont::SetScale(0.48f, 1.12f);
+	CFont::SetCentreOff();
+	CFont::SetJustifyOff();
+	CFont::SetWrapx(640.0f);
+	CFont::SetRightJustifyOff();
+	CFont::SetPropOn();
+	CFont::SetFontStyle(FONT_BANK);
+	sprintf(temp, "FPS: %.2f", Diag_GetFPS());
+	AsciiToUnicode(temp, wtemp);
+	CFont::SetColor(CRGBA(255, 255, 255, 255));
+	if (!CMenuManager::m_PrefsMarketing || !CMenuManager::m_PrefsDisableTutorials) {
+		CFont::PrintString(RsGlobal.maximumWidth * (4.0f / DEFAULT_SCREEN_WIDTH), RsGlobal.maximumHeight * (4.0f / DEFAULT_SCREEN_HEIGHT), wtemp);
+
+#ifndef FINAL
+		// Timers output (my own implementation)
+		for (uint32 i = 0; i < TimerBar.count; i++) {
+			MaxTimes[i] = max(MaxTimes[i], TimerBar.Timers[i].endTime - TimerBar.Timers[i].startTime);
+			sprintf(temp, "%s: %.2f", &TimerBar.Timers[i].name[0], MaxTimes[i]);
+			AsciiToUnicode(temp, wtemp);
+			CFont::PrintString(RsGlobal.maximumWidth * (4.0f / DEFAULT_SCREEN_WIDTH), RsGlobal.maximumHeight * ((8.0f * (i + 2)) / DEFAULT_SCREEN_HEIGHT), wtemp);
+		}
+
+#ifdef FRAMETIME
+		MaxFrameTime = max(MaxFrameTime, FrameEndTime - FrameInitTime);
+		sprintf(temp, "Frame Time: %.2f", MaxFrameTime);
+		AsciiToUnicode(temp, wtemp);
+
+		CFont::PrintString(RsGlobal.maximumWidth * (4.0f / DEFAULT_SCREEN_WIDTH), RsGlobal.maximumHeight * ((8.0f * (TimerBar.count + 4)) / DEFAULT_SCREEN_HEIGHT), wtemp);
+#endif // FRAMETIME
+#endif // !FINAL
+	}
+}
 #endif // !MASTER
\ No newline at end of file
diff --git a/src/core/timebars.h b/src/core/timebars.h
index 8ffccd8e..6d3b853e 100644
--- a/src/core/timebars.h
+++ b/src/core/timebars.h
@@ -1,6 +1,6 @@
-#pragma once

-

-void tbInit();

-void tbStartTimer(int32, char*);

-void tbEndTimer(char*);

+#pragma once
+
+void tbInit();
+void tbStartTimer(int32, char*);
+void tbEndTimer(char*);
 void tbDisplay();
\ No newline at end of file