Skip to content

Commit af7ac92

Browse files
committed
add inf symbol in HUD if ammo is -1 (infinite)
1 parent 0ddb833 commit af7ac92

4 files changed

Lines changed: 15 additions & 2 deletions

File tree

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1847,6 +1847,7 @@ set(EXPECTED_DATA
18471847
skins7/x_ninja.json
18481848
skins7/xmas_hat.png
18491849
strong_weak.png
1850+
symbol_infinite.png
18501851
clienticons/duckicon.png
18511852
clienticons/kaizoicon.png
18521853
clienticons/license.txt

data/symbol_infinite.png

4.8 KB
Loading

datasrc/content.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,7 @@ def FileList(fmt, num):
254254
container.images.Add(image_guibuttons)
255255
container.images.Add(image_guiicons)
256256
container.images.Add(image_arrow)
257+
container.images.Add(Image("symbol_infinite", "symbol_infinite.png"))
257258
container.images.Add(image_audio_source)
258259
container.images.Add(image_strongweak)
259260
container.images.Add(image_hud)

src/game/client/components/hud.cpp

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -861,14 +861,25 @@ void CHud::RenderAmmoHealthAndArmor(const CNetObj_Character *pCharacter)
861861
}
862862
else if(CurWeapon >= 0 && GameClient()->m_GameSkin.m_aSpriteWeaponProjectiles[CurWeapon].IsValid())
863863
{
864+
int Ammo = pCharacter->m_AmmoCount == -1 ? 1 : std::clamp(pCharacter->m_AmmoCount, 0, 10);
864865
Graphics()->TextureSet(GameClient()->m_GameSkin.m_aSpriteWeaponProjectiles[CurWeapon]);
865866
if(AmmoOffsetY > 0)
866867
{
867-
Graphics()->RenderQuadContainerEx(m_HudQuadContainerIndex, m_aAmmoOffset[CurWeapon] + QuadOffsetSixup, std::clamp(pCharacter->m_AmmoCount, 0, 10), 0, AmmoOffsetY);
868+
Graphics()->RenderQuadContainerEx(m_HudQuadContainerIndex, m_aAmmoOffset[CurWeapon] + QuadOffsetSixup, Ammo, 0, AmmoOffsetY);
868869
}
869870
else
870871
{
871-
Graphics()->RenderQuadContainer(m_HudQuadContainerIndex, m_aAmmoOffset[CurWeapon] + QuadOffsetSixup, std::clamp(pCharacter->m_AmmoCount, 0, 10));
872+
Graphics()->RenderQuadContainer(m_HudQuadContainerIndex, m_aAmmoOffset[CurWeapon] + QuadOffsetSixup, Ammo);
873+
}
874+
875+
if (pCharacter->m_AmmoCount == -1)
876+
{
877+
Graphics()->TextureSet(g_pData->m_aImages[IMAGE_SYMBOL_INFINITE].m_Id);
878+
Graphics()->QuadsBegin();
879+
Graphics()->SetColor(vec4(1.0f, 1.0f, 1.0f, 1.0));
880+
IGraphics::CQuadItem QuadItemBackground(18.0f, AmmoOffsetY+3, 16, 16);
881+
Graphics()->QuadsDrawTL(&QuadItemBackground, 1);
882+
Graphics()->QuadsEnd();
872883
}
873884
}
874885
}

0 commit comments

Comments
 (0)