CInfoMessages: Apply infc damage texture aspect ratio

Author: Kaffeine

src/game/client/components/infomessages.cpp

@@ -433,23 +433,35 @@ void CInfoMessages::RenderKillMsg(const CInfoMsg &InfoMsg, float x, float y)
 	}
 
 	// render weapon
-	x -= 32.0f;
 	int VanillaWeapon = InfoMsg.m_Weapon;
 	if(InfoMsg.m_InfDamageType >= 0)
 	{
 		int Index = InfoMsg.m_InfDamageType;
 		EDamageType DamageType = static_cast<EDamageType>(InfoMsg.m_InfDamageType);
+		float AspectRatio = GameClient()->GetAspectTextureRatio(DamageType);
 		IGraphics::CTextureHandle DamageTypeTexture = GameClient()->GetInfclassTextureForDamageType(DamageType);
 		if(DamageTypeTexture.IsValid())
 		{
+			float ExtraOffset = 0;
+			static const float DefaultMetric = 32.0;
+			if(AspectRatio >= 1)
+			{
+				AspectRatio = 1;
+			}
+			else
+			{
+				ExtraOffset = (1 - AspectRatio) / 2;
+			}
 			Graphics()->TextureSet(DamageTypeTexture);
-			Graphics()->RenderQuadContainerAsSprite(m_SpriteQuadContainerIndex, m_InfWeaponOffset + Index, x, y + 20);
+			x -= DefaultMetric * AspectRatio;
+			Graphics()->RenderQuadContainerAsSprite(m_SpriteQuadContainerIndex, m_InfWeaponOffset + Index, x - ExtraOffset * DefaultMetric, y + 20);
 			VanillaWeapon = -1;
 		}
 	}
 
 	if(VanillaWeapon >= 0)
 	{
+		x -= 32.0f;
 		Graphics()->TextureSet(GameClient()->m_GameSkin.m_aSpriteWeapons[InfoMsg.m_Weapon]);
 		Graphics()->RenderQuadContainerAsSprite(m_SpriteQuadContainerIndex, 4 + InfoMsg.m_Weapon, x, y + 28);
 	}

src/game/client/gameclient.cpp

@@ -4402,6 +4402,21 @@ int CGameClient::GetInfclassSpriteForDamageType(EDamageType DamageType)
 	}
 }
 
+float CGameClient::GetAspectTextureRatio(EDamageType DamageType)
+{
+	int SpriteIndex = GetInfclassSpriteForDamageType(DamageType);
+	if(SpriteIndex < 0)
+		return 1;
+
+	float H = g_pData->m_aSprites[SpriteIndex].m_H;
+	float W = g_pData->m_aSprites[SpriteIndex].m_W;
+	if(W <= 0)
+	{
+		return 0;
+	}
+	return W / H;
+}
+
 IGraphics::CTextureHandle *CGameClient::GetInfclassTexturePtrForDamageType(EDamageType DamageType)
 {
 	switch(DamageType)

src/game/client/gameclient.h

@@ -806,6 +806,7 @@ class CGameClient : public IGameClient
 	IGraphics::CTextureHandle *GetInfclassTexturePtrForDamageType(EDamageType DamageType);
 	IGraphics::CTextureHandle GetInfclassTextureForDamageType(EDamageType DamageType);
 	int GetInfclassSpriteForDamageType(EDamageType DamageType);
+	float GetAspectTextureRatio(EDamageType DamageType);
 
 	struct SClientParticlesSkin
 	{