From 31be4808496b9befebad4efec88658225520e041 Mon Sep 17 00:00:00 2001 From: terencehill Date: Tue, 14 May 2013 19:49:39 +0200 Subject: [PATCH] Reduce scope of AMMO_COUNT --- qcsrc/client/hud.qc | 3 ++- qcsrc/common/items.qh | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index 4626bd968..7058cdbf7 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -942,7 +942,7 @@ void DrawAmmoItem(vector myPos, vector mySize, float itemcode, float currently_s void HUD_Ammo(void) { - if(hud != HUD_NORMAL) return; + if(hud != HUD_NORMAL) return; if(!autocvar__hud_configure) { if(!autocvar_hud_panel_ammo) return; @@ -965,6 +965,7 @@ void HUD_Ammo(void) mySize -= '2 2 0' * panel_bg_padding; } + const float AMMO_COUNT = 4; float rows = 0, columns, row, column; vector ammo_size; if (autocvar_hud_panel_ammo_onlycurrent) diff --git a/qcsrc/common/items.qh b/qcsrc/common/items.qh index ba42d55ac..0bf8fd8ef 100644 --- a/qcsrc/common/items.qh +++ b/qcsrc/common/items.qh @@ -51,8 +51,6 @@ float IT_AMMO = 3968; // IT_SHELLS | IT_NAILS | IT_ROCKET float IT_PICKUPMASK = 51; // IT_FUEL_REGEN | IT_JETPACK | IT_UNLIMITED_AMMO; // strength and invincible are handled separately float IT_UNLIMITED_AMMO = 3; // IT_UNLIMITED_SUPERWEAPONS | IT_UNLIMITED_WEAPON_AMMO; -float AMMO_COUNT = 4; // amount of ammo types to show in the inventory panel - // variables: string weaponorder_byid; -- 2.39.2