sync with upstream

src/control/CarCtrl.cpp

@@ -442,6 +442,11 @@ CCarCtrl::GenerateOneRandomCar()
 	pVehicle->GetRight() = CVector(forwardY, -forwardX, 0.0f);
 	pVehicle->GetUp() = CVector(0.0f, 0.0f, 1.0f);
 
+	float currentPathLinkForwardX = pVehicle->AutoPilot.m_nCurrentDirection * ThePaths.m_carPathLinks[pVehicle->AutoPilot.m_nCurrentPathNodeInfo].GetDirX();
+	float currentPathLinkForwardY = pVehicle->AutoPilot.m_nCurrentDirection * ThePaths.m_carPathLinks[pVehicle->AutoPilot.m_nCurrentPathNodeInfo].GetDirY();
+	float nextPathLinkForwardX = pVehicle->AutoPilot.m_nNextDirection * ThePaths.m_carPathLinks[pVehicle->AutoPilot.m_nNextPathNodeInfo].GetDirX();
+	float nextPathLinkForwardY = pVehicle->AutoPilot.m_nNextDirection * ThePaths.m_carPathLinks[pVehicle->AutoPilot.m_nNextPathNodeInfo].GetDirY();
+
 #ifdef FIX_BUGS
 	CCarPathLink* pCurrentLink;
 	CCarPathLink* pNextLink;
@@ -452,10 +457,6 @@ CCarCtrl::GenerateOneRandomCar()
 	float directionNextLinkX;
 	float directionNextLinkY;
 	if (positionBetweenNodes < 0.5f) {
-		float currentPathLinkForwardX = pVehicle->AutoPilot.m_nCurrentDirection * ThePaths.m_carPathLinks[pVehicle->AutoPilot.m_nCurrentPathNodeInfo].GetDirX();
-		float currentPathLinkForwardY = pVehicle->AutoPilot.m_nCurrentDirection * ThePaths.m_carPathLinks[pVehicle->AutoPilot.m_nCurrentPathNodeInfo].GetDirY();
-		float nextPathLinkForwardX = pVehicle->AutoPilot.m_nNextDirection * ThePaths.m_carPathLinks[pVehicle->AutoPilot.m_nNextPathNodeInfo].GetDirX();
-		float nextPathLinkForwardY = pVehicle->AutoPilot.m_nNextDirection * ThePaths.m_carPathLinks[pVehicle->AutoPilot.m_nNextPathNodeInfo].GetDirY();
 
 		pCurrentLink = &ThePaths.m_carPathLinks[pVehicle->AutoPilot.m_nCurrentPathNodeInfo];
 		pNextLink = &ThePaths.m_carPathLinks[pVehicle->AutoPilot.m_nNextPathNodeInfo];
@@ -486,11 +487,6 @@ CCarCtrl::GenerateOneRandomCar()
 		pVehicle->AutoPilot.m_nTimeEnteredCurve = CTimer::GetTimeInMilliseconds() -
 			(uint32)((positionBetweenNodes - 0.5f) * pVehicle->AutoPilot.m_nTimeToSpendOnCurrentCurve);
 
-		float currentPathLinkForwardX = pVehicle->AutoPilot.m_nCurrentDirection * ThePaths.m_carPathLinks[pVehicle->AutoPilot.m_nCurrentPathNodeInfo].GetDirX();
-		float currentPathLinkForwardY = pVehicle->AutoPilot.m_nCurrentDirection * ThePaths.m_carPathLinks[pVehicle->AutoPilot.m_nCurrentPathNodeInfo].GetDirY();
-		float nextPathLinkForwardX = pVehicle->AutoPilot.m_nNextDirection * ThePaths.m_carPathLinks[pVehicle->AutoPilot.m_nNextPathNodeInfo].GetDirX();
-		float nextPathLinkForwardY = pVehicle->AutoPilot.m_nNextDirection * ThePaths.m_carPathLinks[pVehicle->AutoPilot.m_nNextPathNodeInfo].GetDirY();
-
 		pCurrentLink = &ThePaths.m_carPathLinks[pVehicle->AutoPilot.m_nCurrentPathNodeInfo];
 		pNextLink = &ThePaths.m_carPathLinks[pVehicle->AutoPilot.m_nNextPathNodeInfo];
 		positionOnCurrentLinkIncludingLane = CVector(

src/control/Record.h

@@ -57,9 +57,7 @@ public:
 	static void RestoreInfoForMatrix(CMatrix&, CCarStateEachFrame*);
 	static void RestoreInfoForCar(CAutomobile*, CCarStateEachFrame*, bool);
 	static void ProcessControlCars(void);
-#if (defined(GTA_PS2) || defined(FIX_BUGS))
 	static bool ShouldThisPadBeLeftAlone(uint8 pad);
-#endif
 	static void GiveUsACar(int32, CVector, float, CAutomobile**, uint8, uint8);
 	static void StartChaseScene(float);
 	static void CleanUpChaseScene(void);

src/core/Camera.cpp

@@ -3621,6 +3621,8 @@ CCamera::LoadPathSplines(int file)
 			m_arrPathArray[i].m_arr_PathData[j] = atof(token);
 			i++;
 			j = 0;
+			if (i == MAX_NUM_OF_SPLINETYPES)
+				reading = false;
 			memset(token, 0, 32);
 			n = 0;
 		}

src/core/World.cpp

@@ -35,7 +35,7 @@
 
 CColPoint gaTempSphereColPoints[MAX_COLLISION_POINTS];
 
-CPtrList CWorld::ms_bigBuildingsList[4];
+CPtrList CWorld::ms_bigBuildingsList[NUM_LEVELS];
 CPtrList CWorld::ms_listMovingEntityPtrs;
 CSector CWorld::ms_aSectors[NUMSECTORS_Y][NUMSECTORS_X];
 uint16 CWorld::ms_nCurrentScanCode;
@@ -1788,13 +1788,13 @@ CWorld::ShutDown(void)
 		pSector->m_lists[ENTITYLIST_DUMMIES_OVERLAP].Flush();
 #endif
 	}
-	for(int32 i = 0; i < 4; i++) {
+	for(int32 i = 0; i < NUM_LEVELS; i++) {
-		for(CPtrNode *pNode = GetBigBuildingList((eLevelName)i).first; pNode; pNode = pNode->next) {
+		for(CPtrNode *pNode = ms_bigBuildingsList[i].first; pNode; pNode = pNode->next) {
 			CEntity *pEntity = (CEntity *)pNode->item;
 			// Maybe remove from world here?
 			delete pEntity;
 		}
-		GetBigBuildingList((eLevelName)i).Flush();
+		ms_bigBuildingsList[i].Flush();
 	}
 	for(int i = 0; i < NUMSECTORS_X * NUMSECTORS_Y; i++) {
 		CSector *pSector = GetSector(i % NUMSECTORS_X, i / NUMSECTORS_Y);

src/core/World.h

@@ -55,7 +55,7 @@ struct CStoredCollPoly;
 
 class CWorld
 {
-	static CPtrList ms_bigBuildingsList[4];
+	static CPtrList ms_bigBuildingsList[NUM_LEVELS];
 	static CPtrList ms_listMovingEntityPtrs;
 	static CSector ms_aSectors[NUMSECTORS_Y][NUMSECTORS_X];
 	static uint16 ms_nCurrentScanCode;

src/objects/Object.cpp

@@ -14,6 +14,12 @@
 #include "soundlist.h"
 #include "WaterLevel.h"
 #include "Timecycle.h"
+#include "Stats.h"
+#include "SpecialFX.h"
+
+#define BEACHBALL_MAX_SCORE 250
+// the proportion of the ball speed compared to the player speed when it hits the player
+#define BEACHBALL_SPEED_PROPORTION 0.4f
 
 int16 CObject::nNoTempObjects;
 //int16 CObject::nBodyCastHealth = 1000;
@@ -107,7 +113,8 @@ CObject::ProcessControl(void)
 		m_vecMoveSpeed *= fTimeStep;
 		m_vecTurnSpeed *= fTimeStep;
 	}
-	if ((GetModelIndex() == MI_EXPLODINGBARREL || GetModelIndex() == MI_PETROLPUMP) && bHasBeenDamaged && bIsVisible
+	int16 mi = GetModelIndex();
+	if ((mi == MI_EXPLODINGBARREL || mi == MI_PETROLPUMP || mi == MI_PETROLPUMP2) && bHasBeenDamaged && bIsVisible
 		&& (CGeneral::GetRandomNumber() & 0x1F) == 10) {
 		bExplosionProof = true;
 		bIsVisible = false;
@@ -115,6 +122,68 @@ CObject::ProcessControl(void)
 		bAffectedByGravity = false;
 		m_vecMoveSpeed = CVector(0.0f, 0.0f, 0.0f);
 	}
+	if (mi == MI_RCBOMB) {
+		float fTurnForce = -(m_fTurnMass / 20.0f);
+		CPhysical::ApplyTurnForce(m_vecMoveSpeed * fTurnForce, -GetForward());
+		float fScalar = 1.0f - m_vecMoveSpeed.MagnitudeSqr() / 5.0f;
+		float fScalarTimed = Pow(fScalar, CTimer::GetTimeStep());
+		m_vecMoveSpeed *= fScalarTimed;
+	}
+	if (mi == MI_BEACHBALL) {
+		float fTimeStep = Pow(0.95f, CTimer::GetTimeStep());
+		float fPreviousVecSpeedMag = m_vecMoveSpeed.Magnitude2D();
+		m_vecMoveSpeed.x *= fTimeStep;
+		m_vecMoveSpeed.y *= fTimeStep;
+		m_vecMoveSpeed.z += fPreviousVecSpeedMag - m_vecMoveSpeed.Magnitude2D();
+		if (!FindPlayerVehicle()) {
+			CVector distance;
+			distance.x = FindPlayerCoors().x - GetPosition().x;
+			distance.y = FindPlayerCoors().y - GetPosition().y;
+			distance.z = FindPlayerCoors().z - GetPosition().z;
+			if (distance.z > 0.0 && distance.z < 1.5f && distance.Magnitude2D() < 1.0f) {
+				CVector playerSpeed = FindPlayerSpeed();
+				if (fPreviousVecSpeedMag < 0.05f && playerSpeed.Magnitude() > 0.1f) {
+					playerSpeed.z = 0.0f;
+					playerSpeed.Normalise();
+					playerSpeed.z = 0.3f;
+					m_vecMoveSpeed = CVector(
+						playerSpeed.x * BEACHBALL_SPEED_PROPORTION,
+						playerSpeed.y * BEACHBALL_SPEED_PROPORTION,
+						0.3f          * BEACHBALL_SPEED_PROPORTION
+					);
+					PlayOneShotScriptObject(SCRIPT_SOUND_HIT_BALL, GetPosition());
+					m_vecTurnSpeed += CVector(
+						((CGeneral::GetRandomNumber() % 16) - 7) / 10.0f,
+						((CGeneral::GetRandomNumber() % 16) - 7) / 10.0f,
+						0.0f);
+					if (m_nBeachballBounces > 0) {
+						m_nBeachballBounces++;
+					}
+					if (m_nBeachballBounces > 0) {
+						sprintf(gString, "%d", m_nBeachballBounces);
+						CMoneyMessages::RegisterOne(GetPosition(), gString, 255, 50, 0, 0.6f, 0.5f);
+						CStats::RegisterHighestScore(3, m_nBeachballBounces);
+					}
+				}
+			}
+			if (distance.z > -1.05 && distance.z < -0.6 && m_vecMoveSpeed.z < 0.0f && distance.Magnitude2D() < 0.9f) {
+				m_vecMoveSpeed.x += (CGeneral::GetRandomNumber() % 8 - 3) / 100.0f;
+				m_vecMoveSpeed.y += (CGeneral::GetRandomNumber() % 8 - 3) / 100.0f;
+				m_vecMoveSpeed.z = Max(m_vecMoveSpeed.z + 0.3f, 0.2f);
+				PlayOneShotScriptObject(SCRIPT_SOUND_HIT_BALL, GetPosition());
+				m_vecTurnSpeed.x += (CGeneral::GetRandomNumber() % 16 - 7) / 10.0f;
+				m_vecTurnSpeed.y += (CGeneral::GetRandomNumber() % 16 - 7) / 10.0f;
+				m_nBeachballBounces++;
+				m_nBeachballBounces = Min(m_nBeachballBounces, BEACHBALL_MAX_SCORE);
+				sprintf(gString, "%d", m_nBeachballBounces);
+				CMoneyMessages::RegisterOne(GetPosition(), gString, 255, 50, 0, 0.6f, 0.5f);
+				CStats::RegisterHighestScore(3, m_nBeachballBounces);
+			}
+		}
+	}
+	if (bIsBIGBuilding) {
+		bIsInSafePosition = true;
+	}
 }
 
 void
@@ -289,83 +358,145 @@ CObject::ObjectDamage(float amount)
 	if ((amount * m_fCollisionDamageMultiplier > 150.0f || bBodyCastDamageEffect) && m_nCollisionDamageEffect) {
 		const CVector &vecPos = m_matrix.GetPosition();
 		const float fDirectionZ = 0.0002f * amount;
-		switch (m_nCollisionDamageEffect)
+		switch (m_nCollisionDamageEffect) {
-		{
 			case DAMAGE_EFFECT_CHANGE_MODEL:
 				bRenderDamaged = true;
-			break;
+				return;
 			case DAMAGE_EFFECT_SPLIT_MODEL:
+				return;
+			case DAMAGE_EFFECT_SMASH_AND_DAMAGE_TRAFFICLIGHTS:
+			{
+				static RwRGBA debrisColor = { 0xc8,0xc8,0xc8,0xff };
+				if (bRenderDamaged) {
 					break;
-		case DAMAGE_EFFECT_SMASH_COMPLETELY:
+				}
-			bIsVisible = false;
+				bRenderDamaged = true;
-			bUsesCollision = false;
+				CVector min = 0.85f * GetColModel()->boundingBox.min;
-			SetIsStatic(true);
+				CVector max = 0.85f * GetColModel()->boundingBox.max;
-			bExplosionProof = true;
+				min.z = max.z;
-			SetMoveSpeed(0.0f, 0.0f, 0.0f);
+				min = GetMatrix() * min;
-			SetTurnSpeed(0.0f, 0.0f, 0.0f);
+				max = GetMatrix() * max;
+				CVector temp = (max - min) * 0.02f;
+				for (int32 i = 0; i < 50; i++) {
+					CVector vecDir = CVector(
+						CGeneral::GetRandomNumberInRange(-0.35f, 0.35f),
+						CGeneral::GetRandomNumberInRange(-0.35f, 0.35f),
+						CGeneral::GetRandomNumberInRange(0.10f, 0.25f)
+					);
+					++nFrameGen;
+					int32 currentFrame = nFrameGen & 3;
+					CVector pos = min + temp * (float)i;
+					float fSize = CGeneral::GetRandomNumberInRange(0.02f, 0.20f);
+					float fColorFactor = CGeneral::GetRandomNumberInRange(0.6f, 1.2f);
+					RwRGBA color = debrisColor;
+					color.red *= fColorFactor;
+					color.green *= fColorFactor;
+					int32 nRotationSpeed = CGeneral::GetRandomNumberInRange(-0.40f, 0.40f);
+					CParticle::AddParticle(PARTICLE_CAR_DEBRIS, pos, vecDir, nil, fSize, color, nRotationSpeed, 0, currentFrame, 0);
+				}
+				PlayOneShotScriptObject(SCRIPT_SOUND_METAL_COLLISION, min);
 				break;
-		case DAMAGE_EFFECT_CHANGE_THEN_SMASH:
+			}
+			case DAMAGE_EFFECT_CHANGE_THEN_SMASH: {
 				if (!bRenderDamaged) {
 					bRenderDamaged = true;
+					return;
 				}
-			else {
+				// fall through
+			}
+			case DAMAGE_EFFECT_SMASH_COMPLETELY: {
 				bIsVisible = false;
 				bUsesCollision = false;
+				if (!GetIsStatic()) {
+					RemoveFromMovingList();
+				}
 				SetIsStatic(true);
 				bExplosionProof = true;
 				SetMoveSpeed(0.0f, 0.0f, 0.0f);
 				SetTurnSpeed(0.0f, 0.0f, 0.0f);
-			}
 				break;
-		case DAMAGE_EFFECT_SMASH_CARDBOARD_COMPLETELY: {
+			}
+			case DAMAGE_EFFECT_SMASH_CARDBOARD_COMPLETELY:
+			case DAMAGE_EFFECT_SMASH_YELLOW_TARGET_COMPLETELY:
+			{
 				bIsVisible = false;
 				bUsesCollision = false;
+				if (!GetIsStatic()) {
+					RemoveFromMovingList();
+				}
 				SetIsStatic(true);
 				bExplosionProof = true;
 				SetMoveSpeed(0.0f, 0.0f, 0.0f);
 				SetTurnSpeed(0.0f, 0.0f, 0.0f);
 				const RwRGBA color = { 96, 48, 0, 255 };
 				for (int32 i = 0; i < 25; i++) {
-				CVector vecDir(CGeneral::GetRandomNumberInRange(-0.35f, 0.7f),
+					CVector vecDir = CVector(
-					CGeneral::GetRandomNumberInRange(-0.35f, 0.7f),
+						CGeneral::GetRandomNumberInRange(-0.35f, 0.35f),
-					CGeneral::GetRandomNumberInRange(0.1f, 0.15f) + fDirectionZ);
+						CGeneral::GetRandomNumberInRange(-0.35f, 0.35f),
+						CGeneral::GetRandomNumberInRange(0.10f, 0.25f) + fDirectionZ
+					);
 					++nFrameGen;
 					int32 currentFrame = nFrameGen & 3;
+					RwRGBA randomColor = color;
+					switch (m_nCollisionDamageEffect) {
+						case DAMAGE_EFFECT_SMASH_CARDBOARD_COMPLETELY: {
 							float fRandom = CGeneral::GetRandomNumberInRange(0.01f, 1.0f);
-				RwRGBA randomColor = { uint8(color.red * fRandom), uint8(color.green * fRandom) , color.blue, color.alpha };
+							randomColor.red *= fRandom;
-				float fSize = CGeneral::GetRandomNumberInRange(0.02f, 0.18f);
+							randomColor.green *= fRandom;
-				int32 nRotationSpeed = CGeneral::GetRandomNumberInRange(-40, 80);
+							randomColor.blue *= fRandom;
+							break;
+						}
+						case DAMAGE_EFFECT_SMASH_YELLOW_TARGET_COMPLETELY: {
+							randomColor.red = 0xff;
+							randomColor.green = 0xfc;
+							break;
+						}
+					}
+					float fSize = CGeneral::GetRandomNumberInRange(0.02f, 0.20f);
+					int32 nRotationSpeed = CGeneral::GetRandomNumberInRange(-40, 40);
 					CParticle::AddParticle(PARTICLE_CAR_DEBRIS, vecPos, vecDir, nil, fSize, randomColor, nRotationSpeed, 0, currentFrame, 0);
 				}
 				PlayOneShotScriptObject(SCRIPT_SOUND_BOX_DESTROYED_2, vecPos);
 				break;
 			}
-		case DAMAGE_EFFECT_SMASH_WOODENBOX_COMPLETELY: {
+			case DAMAGE_EFFECT_SMASH_WOODENBOX_COMPLETELY:
+			{
 				bIsVisible = false;
 				bUsesCollision = false;
+				if (!GetIsStatic()) {
+					RemoveFromMovingList();
+				}
 				SetIsStatic(true);
 				bExplosionProof = true;
 				SetMoveSpeed(0.0f, 0.0f, 0.0f);
 				SetTurnSpeed(0.0f, 0.0f, 0.0f);
-			const RwRGBA color = { 128, 128, 128, 255 };
+				static const RwRGBA color = { 128, 128, 128, 255 };
+				CVector position = GetPosition();
 				for (int32 i = 0; i < 45; i++) {
-				CVector vecDir(CGeneral::GetRandomNumberInRange(-0.35f, 0.7f),
+					CVector vecDir = CVector(
-					CGeneral::GetRandomNumberInRange(-0.35f, 0.7f),
+						CGeneral::GetRandomNumberInRange(-0.35f, 0.35f),
-					CGeneral::GetRandomNumberInRange(0.1f, 0.15f) + fDirectionZ);
+						CGeneral::GetRandomNumberInRange(-0.35f, 0.35f),
+						CGeneral::GetRandomNumberInRange(0.10f, 0.25f) + fDirectionZ
+					);
 					++nFrameGen;
 					int32 currentFrame = nFrameGen & 3;
-				float fRandom = CGeneral::GetRandomNumberInRange(0.5f, 0.5f);
+					float fRandom = CGeneral::GetRandomNumberInRange(0.5f, 1.0f);
 					RwRGBA randomColor = { uint8(color.red * fRandom), uint8(color.green * fRandom), uint8(color.blue * fRandom), color.alpha };
-				float fSize = CGeneral::GetRandomNumberInRange(0.02f, 0.18f);
+					float fSize = CGeneral::GetRandomNumberInRange(0.02f, 0.20f);
-				int32 nRotationSpeed = CGeneral::GetRandomNumberInRange(-40, 80);
+					int32 nRotationSpeed = CGeneral::GetRandomNumberInRange(-40, 40);
 					CParticle::AddParticle(PARTICLE_CAR_DEBRIS, vecPos, vecDir, nil, fSize, randomColor, nRotationSpeed, 0, currentFrame, 0);
 				}
 				PlayOneShotScriptObject(SCRIPT_SOUND_BOX_DESTROYED_1, vecPos);
 				break;
 			}
-		case DAMAGE_EFFECT_SMASH_TRAFFICCONE_COMPLETELY: {
+			case DAMAGE_EFFECT_SMASH_TRAFFICCONE_COMPLETELY:
+			case DAMAGE_EFFECT_BURST_BEACHBALL:
+			{
 				bIsVisible = false;
 				bUsesCollision = false;
+				if (!GetIsStatic()) {
+					RemoveFromMovingList();
+				}
 				SetIsStatic(true);
 				bExplosionProof = true;
 				SetMoveSpeed(0.0f, 0.0f, 0.0f);
@@ -373,46 +504,213 @@ CObject::ObjectDamage(float amount)
 				const RwRGBA color1 = { 200, 0, 0, 255 };
 				const RwRGBA color2 = { 200, 200, 200, 255 };
 				for (int32 i = 0; i < 10; i++) {
-				CVector vecDir(CGeneral::GetRandomNumberInRange(-0.35f, 0.7f),
+					CVector vecDir = CVector(
-					CGeneral::GetRandomNumberInRange(-0.35f, 0.7f),
+						CGeneral::GetRandomNumberInRange(-0.35f, 0.35f),
-					CGeneral::GetRandomNumberInRange(0.1f, 0.15f) + fDirectionZ);
+						CGeneral::GetRandomNumberInRange(-0.35f, 0.35f),
+						CGeneral::GetRandomNumberInRange(0.10f, 0.25f) + fDirectionZ
+					);
 					++nFrameGen;
 					int32 currentFrame = nFrameGen & 3;
 					RwRGBA color = color2;
 					if (nFrameGen & 1)
 						color = color1;
-				float fSize = CGeneral::GetRandomNumberInRange(0.02f, 0.18f);
+					float fSize = CGeneral::GetRandomNumberInRange(0.02f, 0.20f);
-				int32 nRotationSpeed = CGeneral::GetRandomNumberInRange(-40, 80);
+					int32 nRotationSpeed = CGeneral::GetRandomNumberInRange(-40, 40);
 					CParticle::AddParticle(PARTICLE_CAR_DEBRIS, vecPos, vecDir, nil, fSize, color, nRotationSpeed, 0, currentFrame, 0);
 				}
+				if (m_nCollisionDamageEffect == DAMAGE_EFFECT_BURST_BEACHBALL) {
+					PlayOneShotScriptObject(SCRIPT_SOUND_HIT_BALL, vecPos);
+				} else {
 					PlayOneShotScriptObject(SCRIPT_SOUND_TIRE_COLLISION, vecPos);
+				}
 				break;
 			}
-		case DAMAGE_EFFECT_SMASH_BARPOST_COMPLETELY: {
+			case DAMAGE_EFFECT_SMASH_BARPOST_COMPLETELY:
+			{
 				bIsVisible = false;
 				bUsesCollision = false;
+				if (!GetIsStatic()) {
+					RemoveFromMovingList();
+				}
 				SetIsStatic(true);
 				bExplosionProof = true;
 				SetMoveSpeed(0.0f, 0.0f, 0.0f);
 				SetTurnSpeed(0.0f, 0.0f, 0.0f);
 				const RwRGBA color1 = { 200, 0, 0, 255 };
 				const RwRGBA color2 = { 200, 200, 200, 255 };
+				SetMoveSpeed(0.0f, 0.0f, 0.0f);
+				SetTurnSpeed(0.0f, 0.0f, 0.0f);
 				for (int32 i = 0; i < 32; i++) {
-				CVector vecDir(CGeneral::GetRandomNumberInRange(-0.35f, 0.7f),
+					CVector vecDir = CVector(
-					CGeneral::GetRandomNumberInRange(-0.35f, 0.7f),
+						CGeneral::GetRandomNumberInRange(-0.35f, 0.35f),
-					CGeneral::GetRandomNumberInRange(0.1f, 0.15f) + fDirectionZ);
+						CGeneral::GetRandomNumberInRange(-0.35f, 0.35f),
+						CGeneral::GetRandomNumberInRange(0.10f, 0.25f) + fDirectionZ
+					);
 					++nFrameGen;
 					int32 currentFrame = nFrameGen & 3;
-				RwRGBA color = color2;
+					const RwRGBA &color = nFrameGen & 1 ? color1 : color2;
-				if (nFrameGen & 1)
+					float fSize = CGeneral::GetRandomNumberInRange(0.02f, 0.20f);
-					color = color1;
+					int32 nRotationSpeed = CGeneral::GetRandomNumberInRange(-40, 40);
-				float fSize = CGeneral::GetRandomNumberInRange(0.02f, 0.18f);
-				int32 nRotationSpeed = CGeneral::GetRandomNumberInRange(-40, 80);
 					CParticle::AddParticle(PARTICLE_CAR_DEBRIS, vecPos, vecDir, nil, fSize, color, nRotationSpeed, 0, currentFrame, 0);
 				}
 				PlayOneShotScriptObject(SCRIPT_SOUND_METAL_COLLISION, vecPos);
 				break;
 			}
+			case DAMAGE_EFFECT_SMASH_NEWSTANDNEW1:
+			case DAMAGE_EFFECT_SMASH_NEWSTANDNEW2:
+			case DAMAGE_EFFECT_SMASH_NEWSTANDNEW3:
+			case DAMAGE_EFFECT_SMASH_NEWSTANDNEW4:
+			case DAMAGE_EFFECT_SMASH_NEWSTANDNEW5:
+			{
+				bIsVisible = false;
+				bUsesCollision = false;
+				if (!GetIsStatic()) {
+					RemoveFromMovingList();
+				}
+				SetIsStatic(true);
+				bExplosionProof = true;
+				SetMoveSpeed(0.0f, 0.0f, 0.0f);
+				SetTurnSpeed(0.0f, 0.0f, 0.0f);
+				CRGBA possibleColor1;
+				CRGBA possibleColor2;
+				switch (m_nCollisionDamageEffect) {
+					case DAMAGE_EFFECT_SMASH_NEWSTANDNEW1:
+						possibleColor1 = CRGBA(0xC0, 0x3E, 0xC, 0xFF);
+						possibleColor2 = possibleColor1;
+						break;
+					case DAMAGE_EFFECT_SMASH_NEWSTANDNEW2:
+						possibleColor1 = CRGBA(0xA3, 0x36, 0x21, 0xFF);
+						possibleColor2 = possibleColor1;
+						break;
+					case DAMAGE_EFFECT_SMASH_NEWSTANDNEW3:
+						possibleColor1 = CRGBA(0x12, 0x31, 0x24, 0xFF);
+						possibleColor2 = possibleColor1;
+						break;
+					case DAMAGE_EFFECT_SMASH_NEWSTANDNEW4:
+						possibleColor1 = CRGBA(0xC0, 0xC8, 0xBE, 0xFF);
+						possibleColor2 = CRGBA(0x10, 0x57, 0x85, 0xFF);
+						break;
+					case DAMAGE_EFFECT_SMASH_NEWSTANDNEW5:
+						possibleColor1 = CRGBA(0xD0, 0x94, 0x1B, 0xFF);
+						possibleColor2 = possibleColor1;
+						break;
+				}
+				for (int32 i = 0; i < 16; i++) {
+					CVector vecDir(
+						CGeneral::GetRandomNumberInRange(-0.35f, 0.35f),
+						CGeneral::GetRandomNumberInRange(-0.35f, 0.35f),
+						CGeneral::GetRandomNumberInRange(0.10f, 0.15f) + fDirectionZ
+					);
+					float fSize = CGeneral::GetRandomNumberInRange(0.02f, 0.20f);
+					int32 nRotationSpeed = CGeneral::GetRandomNumberInRange(-40, 40);
+					++nFrameGen;
+					int32 nCurFrame = nFrameGen & 0x3;
+					CRGBA &selectedColor = nFrameGen & 0x1 ? possibleColor1 : possibleColor2;
+					CParticle::AddParticle(PARTICLE_CAR_DEBRIS, vecPos, vecDir, nil, fSize, selectedColor, nRotationSpeed, 0, nCurFrame, 0);
+					if (!(i % 7)) {
+						static CRGBA secondParticleColors[4] = {
+							CRGBA(0xA0, 0x60, 0x60, 0xFF),
+							CRGBA(0x60, 0xA0, 0x60, 0xFF),
+							CRGBA(0x60, 0x60, 0xA0, 0xFF),
+							CRGBA(0xA0, 0xA0, 0xA0, 0xFF)
+						};
+						vecDir *= 0.5f;
+						CRGBA &secondParticleColor = secondParticleColors[nFrameGen & 3];
+						int32 nSecondRotationSpeed = CGeneral::GetRandomNumberInRange(-40, 40);
+						CParticle::AddParticle(PARTICLE_DEBRIS, vecPos, vecDir, nil, 0.1f, secondParticleColor, nSecondRotationSpeed, 0, 1, 0);
+					}
+				}
+				PlayOneShotScriptObject(SCRIPT_SOUND_METAL_COLLISION, vecPos);
+				break;
+			}
+			case DAMAGE_EFFECT_SMASH_VEGPALM:
+			{
+				static RwRGBA primaryColor1 = { 0x39, 0x4D, 0x29, 0xff };
+				static RwRGBA primaryColor2 = { 0x94, 0x7D, 0x73, 0xff };
+				bIsVisible = false;
+				bUsesCollision = false;
+				if (!GetIsStatic()) {
+					RemoveFromMovingList();
+				}
+				SetIsStatic(true);
+				bExplosionProof = true;
+				SetMoveSpeed(0.0f, 0.0f, 0.0f);
+				SetTurnSpeed(0.0f, 0.0f, 0.0f);
+				float fRadius = GetColModel()->boundingSphere.radius;
+				for (int32 i = 0; i < 32; i++) {
+					CVector particleDir = CVector(
+						CGeneral::GetRandomNumberInRange(-0.25f, 0.25f),
+						CGeneral::GetRandomNumberInRange(-0.25f, 0.25f),
+						CGeneral::GetRandomNumberInRange(-0.05f, 0.05f) + fDirectionZ
+					);
+					CVector particlePos = vecPos;
+					particlePos.z += CGeneral::GetRandomNumberInRange(0.0f, 1.0f) * fRadius;
+					++nFrameGen;
+					int32 nRotationSpeed = CGeneral::GetRandomNumberInRange(-40, 40);
+					int32 nCurFrame = nFrameGen & 0x3;
+					float fSize = CGeneral::GetRandomNumberInRange(0.02f, 0.20f);
+					RwRGBA& particleColor = nFrameGen & 1 ? primaryColor1 : primaryColor2;
+					CParticle::AddParticle(PARTICLE_CAR_DEBRIS, particlePos, particleDir, nil, fSize, particleColor, nRotationSpeed, 0, nCurFrame, 0);
+					if ((i % 7) == 0) {
+						static RwRGBA secondaryColor = { 0x9A, 0x99, 0x99, 0x3E };
+						CParticle::AddParticle(PARTICLE_DEBRIS, particlePos, particleDir, nil, 0.3, secondaryColor, nRotationSpeed, 0, 0, 0);
+					}
+				}
+				PlayOneShotScriptObject(SCRIPT_SOUND_BOX_DESTROYED_2, vecPos);
+				break;
+			}
+			case DAMAGE_EFFECT_SMASH_BLACKBAG:
+			case DAMAGE_EFFECT_SMASH_BEACHLOUNGE_WOOD:
+			case DAMAGE_EFFECT_SMASH_BEACHLOUNGE_TOWEL:
+			{
+				bIsVisible = false;
+				bUsesCollision = false;
+				if (!GetIsStatic()) {
+					RemoveFromMovingList();
+				}
+				SetIsStatic(true);
+				bExplosionProof = true;
+				SetMoveSpeed(0.0f, 0.0f, 0.0f);
+				SetTurnSpeed(0.0f, 0.0f, 0.0f);
+				CRGBA possibleColor1;
+				CRGBA possibleColor2;
+				switch (m_nCollisionDamageEffect) {
+					case DAMAGE_EFFECT_SMASH_BLACKBAG:
+						possibleColor1 = CRGBA(0, 0, 0, 0xFF);
+						possibleColor2 = possibleColor1;
+						break;
+					case DAMAGE_EFFECT_SMASH_BEACHLOUNGE_WOOD:
+						possibleColor1 = CRGBA(0x8F, 0x8A, 0x8C, 0xFF);
+						possibleColor2 = CRGBA(0x73, 0x75, 0x7B, 0xFF);
+						break;
+					case DAMAGE_EFFECT_SMASH_BEACHLOUNGE_TOWEL:
+						possibleColor1 = CRGBA(0x52, 0x92, 0x4A, 0xFF);
+						possibleColor2 = CRGBA(0xCE, 0xCF, 0xCE, 0xFF);
+						break;
+				}
+				for (int32 i = 0; i < 16; i++) {
+					CVector vecDir(
+						CGeneral::GetRandomNumberInRange(-0.35f, 0.35f),
+						CGeneral::GetRandomNumberInRange(-0.35f, 0.35f),
+						CGeneral::GetRandomNumberInRange(0.10f, 0.25f) + fDirectionZ
+					);
+					++nFrameGen;
+					int32 nCurFrame = nFrameGen & 0x3;
+					CRGBA &selectedColor = nFrameGen & 0x1 ? possibleColor1 : possibleColor2;
+					float fSize = CGeneral::GetRandomNumberInRange(0.02f, 0.20f);
+					int32 nRotationSpeed = CGeneral::GetRandomNumberInRange(-40, 40);
+					CParticle::AddParticle(PARTICLE_CAR_DEBRIS, vecPos, vecDir, nil, fSize, selectedColor, nRotationSpeed, 0, nCurFrame, 0);
+				}
+				if (m_nCollisionDamageEffect == DAMAGE_EFFECT_SMASH_BLACKBAG) {
+					PlayOneShotScriptObject(SCRIPT_SOUND_BOX_DESTROYED_2, vecPos);
+				} else if (m_nCollisionDamageEffect == DAMAGE_EFFECT_SMASH_BEACHLOUNGE_WOOD) {
+					PlayOneShotScriptObject(SCRIPT_SOUND_METAL_COLLISION, vecPos);
+				}
+				break;
+			}
+			default:
+				DEV("Unhandled collision damage effect id: %d\n", m_nCollisionDamageEffect);
+				return;
 		}
 	}
 }
@@ -515,7 +813,8 @@ CObject::DeleteAllTempObjectsInArea(CVector point, float fRadius)
 	CObjectPool *objectPool = CPools::GetObjectPool();
 	for (int32 i = 0; i < objectPool->GetSize(); i++) {
 		CObject *pObject = objectPool->GetSlot(i);
-		if (pObject && pObject->ObjectCreatedBy == TEMP_OBJECT && fRadius * fRadius > pObject->GetPosition().MagnitudeSqr()) {
+		CVector dist = point - pObject->GetPosition();
+		if (pObject && pObject->ObjectCreatedBy == TEMP_OBJECT && dist.MagnitudeSqr() < fRadius * fRadius) {
 			CWorld::Remove(pObject);
 			delete pObject;
 		}

src/objects/Object.h

@@ -32,23 +32,23 @@ enum CollisionDamageEffect
 	DAMAGE_EFFECT_CHANGE_THEN_SMASH,
 
 	DAMAGE_EFFECT_SMASH_CARDBOARD_COMPLETELY = 50,
-	DAMAGE_EFFECT_SMASH_YELLOW_TARGET_COMPLETELY,
+	DAMAGE_EFFECT_SMASH_YELLOW_TARGET_COMPLETELY = 51,
 
 	DAMAGE_EFFECT_SMASH_WOODENBOX_COMPLETELY = 60,
 	DAMAGE_EFFECT_SMASH_TRAFFICCONE_COMPLETELY = 70,
 	DAMAGE_EFFECT_SMASH_BARPOST_COMPLETELY = 80,
 
 	DAMAGE_EFFECT_SMASH_NEWSTANDNEW1 = 91,
-	DAMAGE_EFFECT_SMASH_NEWSTANDNEW21,
+	DAMAGE_EFFECT_SMASH_NEWSTANDNEW2 = 92,
-	DAMAGE_EFFECT_SMASH_NEWSTANDNEW31,
+	DAMAGE_EFFECT_SMASH_NEWSTANDNEW3 = 93,
-	DAMAGE_EFFECT_SMASH_NEWSTANDNEW41,
+	DAMAGE_EFFECT_SMASH_NEWSTANDNEW4 = 94,
-	DAMAGE_EFFECT_SMASH_NEWSTANDNEW51,
+	DAMAGE_EFFECT_SMASH_NEWSTANDNEW5 = 95,
 
 	DAMAGE_EFFECT_SMASH_BLACKBAG = 100,
 	DAMAGE_EFFECT_SMASH_VEGPALM = 110,
 	DAMAGE_EFFECT_BURST_BEACHBALL = 120,
 	DAMAGE_EFFECT_SMASH_BEACHLOUNGE_WOOD = 131,
-	DAMAGE_EFFECT_SMASH_BEACHLOUNGE_TOWEL,
+	DAMAGE_EFFECT_SMASH_BEACHLOUNGE_TOWEL = 132,
 };
 
 class CVehicle;
@@ -76,7 +76,7 @@ public:
 	uint8 m_nCollisionDamageEffect;
 	uint8 m_nSpecialCollisionResponseCases;
 	bool m_bCameraToAvoidThisObject;
-	int8 m_nBeachballBounces;
+	uint8 m_nBeachballBounces;
 	uint32 m_obj_unused1;
 	uint32 m_nEndOfLifeTime;
 	int16 m_nRefModelIndex;

src/render/Font.cpp

@@ -374,7 +374,11 @@ CFont::PrintChar(float x, float y, wchar c)
 	if(Details.style == FONT_BANK || Details.style == FONT_STANDARD){
 		if (bDontPrint) return;
 		if (RenderState.slant == 0.0f) {
+#ifdef FIX_BUGS
+			if (c < 192) {
+#else
 			if (c < 193) {
+#endif
 				CSprite2d::AddToBuffer(
 					CRect(x, y,
 						x + 32.0f * RenderState.scaleX * 1.0f,
@@ -390,9 +394,9 @@ CFont::PrintChar(float x, float y, wchar c)
 						x + 32.0f * RenderState.scaleX * 1.0f,
 						y + 33.0f * RenderState.scaleY * 0.5f),
 					RenderState.color,
-					xoff / 16.0f, yoff / 12.8f,
+					xoff / 16.0f, yoff / 12.8f + 0.0021f,
-					(xoff + 1.0f) / 16.0f - 0.001f, yoff / 12.8f - 0.017f,
+					(xoff + 1.0f) / 16.0f - 0.001f, yoff / 12.8f + 0.0021f,
-					xoff / 16.0f, (yoff + 1.0f) / 12.8f,
+					xoff / 16.0f, (yoff + 1.0f) / 12.8f - 0.017f,
 					(xoff + 1.0f) / 16.0f - 0.001f, (yoff + 1.0f) / 12.8f - 0.017f);
 			}
 		} else

src/vehicles/Bike.cpp

@@ -202,7 +202,7 @@ CVector vecTestResistance(0.9995f, 0.9f, 0.95f);
 float fDAxisX = 1.0f;
 float fDAxisXExtra = 100.0f;
 float fDAxisY = 1000.0f;
-float fInAirXRes = 0.88f;
+float fInAirXRes = 0.98f;
 float fFlySpeedMult = -0.6f;
 
 void
@@ -1213,7 +1213,8 @@ CBike::ProcessControl(void)
 
 	// Balance bike
 	if(bBalancedByRider || bIsBeingPickedUp || bIsStanding){
-		float onSideness = clamp(DotProduct(GetRight(), m_vecAvgSurfaceNormal), -1.0f, 1.0f);
+		float onSideness = DotProduct(GetRight(), m_vecAvgSurfaceNormal);
+		onSideness = clamp(onSideness, -1.0f, 1.0f);
 		CVector worldCOM = Multiply3x3(GetMatrix(), m_vecCentreOfMass);
 		// Keep bike upright
 		if(bBalancedByRider){

src/weapons/Weapon.cpp

@@ -1457,7 +1457,8 @@ CWeapon::DoBulletImpact(CEntity *shooter, CEntity *victim,
 
 #ifndef FIX_BUGS
 					CVector dist = point->point - (*source);
-					CVector smokePos = point->point - Max(0.1f * dist.Magnitude(), 0.2f) * dist / dist.Magnitude();
+					float distMagnitude = dist.Magnitude();
+					CVector smokePos = point->point - Max(distMagnitude / 10.0f, 0.2f) * dist / distMagnitude;
 #else
 				    CVector smokePos = point->point;
 #endif // !FIX_BUGS

utils/gxt/build.bat

@@ -1,7 +1,5 @@
-gxt -g III -i "american.txt" -o "../../gamefiles/TEXT/american.gxt"
+gxt -g VC -i "american.txt" -o "../../gamefiles/TEXT/american.gxt"
-gxt -g III -i "english.txt" -o "../../gamefiles/TEXT/english.gxt"
+gxt -g VC -i "french.txt" -o "../../gamefiles/TEXT/french.gxt"
-gxt -g III -i "french.txt" -o "../../gamefiles/TEXT/french.gxt"
+gxt -g VC -i "german.txt" -o "../../gamefiles/TEXT/german.gxt"
-gxt -g III -i "german.txt" -o "../../gamefiles/TEXT/german.gxt"
+gxt -g VC -i "italian.txt" -o "../../gamefiles/TEXT/italian.gxt"
-gxt -g III -i "italian.txt" -o "../../gamefiles/TEXT/italian.gxt"
+gxt -g VC -i "spanish.txt" -o "../../gamefiles/TEXT/spanish.gxt"
-gxt -g III -i "spanish.txt" -o "../../gamefiles/TEXT/spanish.gxt"
-gxt -g III -r -i "russian.txt" -o "../../gamefiles/TEXT/russian.gxt"