add some support for projectiles and kill messages

Author: Pointer31

src/game/client/components/infomessages.cpp

@@ -8,6 +8,7 @@
 
 #include <game/client/gameclient.h>
 #include <game/client/animstate.h>
+#include <game/client/components/resources.h>
 #include "infomessages.h"
 
 #include "chat.h"
@@ -247,7 +248,15 @@ void CInfoMessages::RenderKillMsg(CInfoMsg *pInfoMsg, float x, float y) const
 
 	// render weapon
 	x -= 44.0f;
-	if(pInfoMsg->m_Weapon >= 0)
+	if(pInfoMsg->m_Weapon >= NUM_WEAPONS)
+	{
+		Graphics()->TextureSet(m_pClient->m_pResources->GetWeaponResource(pInfoMsg->m_Weapon)->m_Texture);
+		Graphics()->QuadsBegin();
+		IGraphics::CQuadItem QuadItem(x-16, y+28, 128, 128);
+		Graphics()->QuadsDraw(&QuadItem, 1);
+		Graphics()->QuadsEnd();
+	}
+	else if(pInfoMsg->m_Weapon >= 0)
 	{
 		Graphics()->TextureSet(g_pData->m_aImages[IMAGE_GAME].m_Id);
 		Graphics()->QuadsBegin();

src/game/client/components/items.cpp

@@ -22,21 +22,24 @@ void CItems::RenderProjectile(const CNetObj_Projectile *pCurrent, int ItemID)
 	// get positions
 	float Curvature = 0;
 	float Speed = 0;
-	if(pCurrent->m_Type == WEAPON_GRENADE)
+
+	int WeaponPredict = pCurrent->m_Type >= NUM_WEAPONS ? m_pClient->m_pResources->GetWeaponResourcePredictsLike(pCurrent->m_Type) : pCurrent->m_Type;
+	if(WeaponPredict == WEAPON_GRENADE)
 	{
 		Curvature = m_pClient->m_Tuning.m_GrenadeCurvature;
 		Speed = m_pClient->m_Tuning.m_GrenadeSpeed;
 	}
-	else if(pCurrent->m_Type == WEAPON_SHOTGUN)
+	else if(WeaponPredict == WEAPON_SHOTGUN)
 	{
 		Curvature = m_pClient->m_Tuning.m_ShotgunCurvature;
 		Speed = m_pClient->m_Tuning.m_ShotgunSpeed;
 	}
-	else if(pCurrent->m_Type == WEAPON_GUN)
+	else if(WeaponPredict == WEAPON_GUN)
 	{
 		Curvature = m_pClient->m_Tuning.m_GunCurvature;
 		Speed = m_pClient->m_Tuning.m_GunSpeed;
 	}
+		
 
 	static float s_LastGameTickTime = Client()->GameTickTime();
 	if(!m_pClient->IsWorldPaused() && !m_pClient->IsDemoPlaybackPaused())
@@ -75,14 +78,20 @@ void CItems::RenderProjectile(const CNetObj_Projectile *pCurrent, int ItemID)
 	vec2 Pos = CalcPos(StartPos, StartVel, Curvature, Speed, Ct);
 	vec2 PrevPos = CalcPos(StartPos, StartVel, Curvature, Speed, Ct-0.001f);
 
-	Graphics()->TextureSet(g_pData->m_aImages[IMAGE_GAME].m_Id);
+	if (pCurrent->m_Type >= NUM_WEAPONS)
+		Graphics()->TextureSet(m_pClient->m_pResources->GetWeaponResourceProjectile(pCurrent->m_Type)->m_Texture);
+	else
+		Graphics()->TextureSet(g_pData->m_aImages[IMAGE_GAME].m_Id);
 	Graphics()->QuadsBegin();
 
-	RenderTools()->SelectSprite(g_pData->m_Weapons.m_aId[clamp(pCurrent->m_Type, 0, NUM_WEAPONS-1)].m_pSpriteProj);
+	if (pCurrent->m_Type < NUM_WEAPONS)
+		RenderTools()->SelectSprite(g_pData->m_Weapons.m_aId[clamp(pCurrent->m_Type, 0, NUM_WEAPONS-1)].m_pSpriteProj);
+
 	const vec2 Vel = Pos-PrevPos;
 
 	// add particle for this projectile
-	if(pCurrent->m_Type == WEAPON_GRENADE)
+	int WeaponLooks = pCurrent->m_Type >= NUM_WEAPONS ? m_pClient->m_pResources->GetWeaponResourceLooksLike(pCurrent->m_Type) : pCurrent->m_Type;
+	if(WeaponLooks == WEAPON_GRENADE)
 	{
 		m_pClient->m_pEffects->SmokeTrail(Pos, Vel*-1);
 		const float Now = Client()->LocalTime();
@@ -98,7 +107,8 @@ void CItems::RenderProjectile(const CNetObj_Projectile *pCurrent, int ItemID)
 		Graphics()->QuadsSetRotation(length(Vel) > 0.00001f ? angle(Vel) : 0);
 	}
 
-	IGraphics::CQuadItem QuadItem(Pos.x, Pos.y, 32, 32);
+	const int Size = pCurrent->m_Type >= NUM_WEAPONS ? 64 : 32;
+	IGraphics::CQuadItem QuadItem(Pos.x, Pos.y, Size, Size);
 	Graphics()->QuadsDraw(&QuadItem, 1);
 	Graphics()->QuadsSetRotation(0);
 	Graphics()->QuadsEnd();

src/game/client/components/resources.cpp

@@ -119,6 +119,22 @@ const CResources::CResource *CResources::GetWeaponResourceAmmo(int WeaponId)
 		return Get(WeaponMapping[WeaponId][3]);
 }
 
+const int CResources::GetWeaponResourceLooksLike(int WeaponId)
+{
+	if (WeaponId < 0 || WeaponId >= MAX_RESOURCES)
+		return -1;
+	else
+		return WeaponMapping[WeaponId][4];
+}
+
+const int CResources::GetWeaponResourcePredictsLike(int WeaponId)
+{
+	if (WeaponId < 0 || WeaponId >= MAX_RESOURCES)
+		return -1;
+	else
+		return WeaponMapping[WeaponId][5];
+}
+
 int CResources::Find(const char *pName)
 {
 	for(int i = 0; i < m_aResources.size(); i++)
@@ -171,10 +187,11 @@ void CResources::OnCustomWeaponInfoMessage(CNetMsg_Sv_CustomWeaponInfo* msg)
 	str_format(aBuf, sizeof(aBuf), "got weapon id %i", WeaponId);
 	Console()->Print(IConsole::OUTPUT_LEVEL_DEBUG, "resources", aBuf);
 
-	// msg->m_LooksLike;
-	// msg->m_PredictsLike;
+
 	WeaponMapping[WeaponId][0] = msg->m_ResourceIdWeapon;
 	WeaponMapping[WeaponId][1] = msg->m_ResourceIdProjectile;
 	WeaponMapping[WeaponId][2] = msg->m_ResourceIdCrosshair;
 	WeaponMapping[WeaponId][3] = msg->m_ResourceIdAmmo;
+	WeaponMapping[WeaponId][4] = msg->m_LooksLike;
+	WeaponMapping[WeaponId][5] = msg->m_PredictsLike;
 }

src/game/client/components/resources.h

@@ -31,6 +31,8 @@ class CResources : public CComponent
 	const CResource *GetWeaponResourceCrosshair(int WeaponId);
 	const CResource *GetWeaponResourceAmmo(int WeaponId);
 	const CResource *GetWeaponResourceProjectile(int WeaponId);
+	const int GetWeaponResourceLooksLike(int WeaponId);
+	const int GetWeaponResourcePredictsLike(int WeaponId);
 
 	void OnResourceMessage(CNetMsg_Sv_ImageResource* msg);
 	void OnCustomWeaponInfoMessage(CNetMsg_Sv_CustomWeaponInfo* msg);