reimplemented extra projectiles

2 files changed, 31 insertions, 7 deletions

diff --git a/src/game/client/components/items.cpp b/src/game/client/components/items.cpp
index 526c94d6..db0b8abd 100644
--- a/src/game/client/components/items.cpp
+++ b/src/game/client/components/items.cpp
@@ -15,6 +15,11 @@
 
 #include "items.h"
 
+void CItems::OnReset()
+{
+	ExtraProjectilesNum = 0;
+}
+
 void CItems::RenderProjectile(const CNetObj_Projectile *pCurrent, int ItemID)
 {
 
@@ -302,15 +307,23 @@ void CItems::OnRender()
 	}
 
 	// render extra projectiles
-	/*
-	for(int i = 0; i < extraproj_num; i++)
+	for(int i = 0; i < ExtraProjectilesNum; i++)
 	{
-		if(extraproj_projectiles[i].start_tick < Client()->GameTick())
+		if(aExtraProjectiles[i].m_StartTick < Client()->GameTick())
 		{
-			extraproj_projectiles[i] = extraproj_projectiles[extraproj_num-1];
-			extraproj_num--;
+			aExtraProjectiles[i] = aExtraProjectiles[ExtraProjectilesNum-1];
+			ExtraProjectilesNum--;
 		}
 		else
-			render_projectile(&extraproj_projectiles[i], 0);
-	}*/
+			RenderProjectile(&aExtraProjectiles[i], 0);
+	}
+}
+
+void CItems::AddExtraProjectile(CNetObj_Projectile *pProj)
+{
+	if(ExtraProjectilesNum != MAX_EXTRA_PROJECTILES)
+	{
+		aExtraProjectiles[ExtraProjectilesNum] = *pProj;
+		ExtraProjectilesNum++;
+	}
 }
diff --git a/src/game/client/components/items.h b/src/game/client/components/items.h
index 17702394..c366b8d9 100644
--- a/src/game/client/components/items.h
+++ b/src/game/client/components/items.h
@@ -6,13 +6,24 @@
 
 class CItems : public CComponent
 {	
+	enum
+	{
+		MAX_EXTRA_PROJECTILES=32,
+	};
+	
+	CNetObj_Projectile aExtraProjectiles[MAX_EXTRA_PROJECTILES];
+	int ExtraProjectilesNum;
+	
 	void RenderProjectile(const CNetObj_Projectile *pCurrent, int ItemID);
 	void RenderPickup(const CNetObj_Pickup *pPrev, const CNetObj_Pickup *pCurrent);
 	void RenderFlag(const CNetObj_Flag *pPrev, const CNetObj_Flag *pCurrent, const CNetObj_GameData *pPrevGameData, const CNetObj_GameData *pCurGameData);
 	void RenderLaser(const struct CNetObj_Laser *pCurrent);
 	
 public:
+	virtual void OnReset();
 	virtual void OnRender();
+	
+	void AddExtraProjectile(CNetObj_Projectile *pProj);
 };
 
 #endif