From e14252914e9bd4cf7702479b5e0b050b935ba4aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?eray=20or=C3=A7unus?= <erayorcunus@gmail.com>
Date: Mon, 3 Aug 2020 04:00:12 +0300
Subject: Squeeze performance option, minor fixes Fixes are already in miami

---
 src/weapons/BulletInfo.cpp | 39 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 37 insertions(+), 2 deletions(-)

(limited to 'src/weapons/BulletInfo.cpp')

diff --git a/src/weapons/BulletInfo.cpp b/src/weapons/BulletInfo.cpp
index 26fc459d..15dde011 100644
--- a/src/weapons/BulletInfo.cpp
+++ b/src/weapons/BulletInfo.cpp
@@ -24,6 +24,10 @@
 #include "World.h"
 #include "SurfaceTable.h"
 
+#ifdef SQUEEZE_PERFORMANCE
+uint32 bulletInfoInUse;
+#endif
+
 #define BULLET_LIFETIME (1000)
 #define NUM_PED_BLOOD_PARTICLES (8)
 #define BLOOD_PARTICLE_OFFSET (CVector(0.0f, 0.0f, 0.0f))
@@ -47,6 +51,9 @@ void CBulletInfo::Initialise(void)
 		gaBulletInfo[i].m_pSource = nil;
 	}
 	debug("CBulletInfo ready\n");
+#ifdef SQUEEZE_PERFORMANCE
+	bulletInfoInUse = 0;
+#endif
 }
 
 void CBulletInfo::Shutdown(void)
@@ -71,11 +78,19 @@ bool CBulletInfo::AddBullet(CEntity* pSource, eWeaponType type, CVector vecPosit
 	gaBulletInfo[i].m_vecSpeed = vecSpeed;
 	gaBulletInfo[i].m_fTimer = CTimer::GetTimeInMilliseconds() + BULLET_LIFETIME;
 	gaBulletInfo[i].m_bInUse = true;
+
+#ifdef SQUEEZE_PERFORMANCE
+	bulletInfoInUse++;
+#endif
 	return true;
 }
 
 void CBulletInfo::Update(void)
 {
+#ifdef SQUEEZE_PERFORMANCE
+	if (bulletInfoInUse == 0)
+		return;
+#endif
 	bool bAddSound = true;
 	bPlayerSniperBullet = false;
 	for (int i = 0; i < NUM_BULLETS; i++) {
@@ -84,8 +99,12 @@ void CBulletInfo::Update(void)
 			pBullet->m_pSource = nil;
 		if (!pBullet->m_bInUse)
 			continue;
-		if (CTimer::GetTimeInMilliseconds() > pBullet->m_fTimer)
+		if (CTimer::GetTimeInMilliseconds() > pBullet->m_fTimer) {
 			pBullet->m_bInUse = false;
+#ifdef SQUEEZE_PERFORMANCE
+			bulletInfoInUse--;
+#endif
+		}
 		CVector vecOldPos = pBullet->m_vecPosition;
 		CVector vecNewPos = pBullet->m_vecPosition + pBullet->m_vecSpeed * CTimer::GetTimeStep() * 0.5f;
 		CWorld::bIncludeCarTyres = true;
@@ -108,6 +127,9 @@ void CBulletInfo::Update(void)
 						pPed->InflictDamage(pBullet->m_pSource, pBullet->m_eWeaponType, pBullet->m_nDamage, (ePedPieceTypes)point.pieceB, pPed->GetLocalDirection(pPed->GetPosition() - point.point));
 						CEventList::RegisterEvent(pPed->m_nPedType == PEDTYPE_COP ? EVENT_SHOOT_COP : EVENT_SHOOT_PED, EVENT_ENTITY_PED, pPed, (CPed*)pBullet->m_pSource, 1000);
 						pBullet->m_bInUse = false;
+#ifdef SQUEEZE_PERFORMANCE
+						bulletInfoInUse--;
+#endif
 						vecNewPos = point.point;
 					}
 					else {
@@ -134,6 +156,9 @@ void CBulletInfo::Update(void)
 						}
 					}
 					pBullet->m_bInUse = false;
+#ifdef SQUEEZE_PERFORMANCE
+					bulletInfoInUse--;
+#endif
 					vecNewPos = point.point;
 				}
 			}
@@ -148,6 +173,9 @@ void CBulletInfo::Update(void)
 				}
 #ifdef FIX_BUGS
 				pBullet->m_bInUse = false;
+#ifdef SQUEEZE_PERFORMANCE
+				bulletInfoInUse--;
+#endif
 				vecNewPos = point.point;
 #endif
 			}
@@ -167,6 +195,9 @@ void CBulletInfo::Update(void)
 				}
 #ifdef FIX_BUGS
 				pBullet->m_bInUse = false;
+#ifdef SQUEEZE_PERFORMANCE
+				bulletInfoInUse--;
+#endif
 				vecNewPos = point.point;
 #endif
 			}
@@ -217,8 +248,12 @@ void CBulletInfo::Update(void)
 		}
 		pBullet->m_vecPosition = vecNewPos;
 		if (pBullet->m_vecPosition.x < -MAP_BORDER || pBullet->m_vecPosition.x > MAP_BORDER ||
-			pBullet->m_vecPosition.y < -MAP_BORDER || pBullet->m_vecPosition.y > MAP_BORDER)
+			pBullet->m_vecPosition.y < -MAP_BORDER || pBullet->m_vecPosition.y > MAP_BORDER) {
 			pBullet->m_bInUse = false;
+#ifdef SQUEEZE_PERFORMANCE
+			bulletInfoInUse--;
+#endif
+		}
 	}
 }
 
-- 
cgit v1.2.3