vera/nuclide
4
0
Fork 0
Code Issues 32 Pull requests Projects Releases Packages Activity

Make cstrike use spriteframe() for HUD gfx

Browse source
This commit is contained in:
Marco Cawthorne 2020-05-31 13:20:04 +02:00
parent c709117209
commit cef8ba0443
31 changed files with 155 additions and 139 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/client/cstrike/defs.h
View file

@ -24,6 +24,21 @@ vector g_hud_color;
vector g_hudmins;
vector g_hudres;
var string g_hud1_spr;
var string g_hud2_spr;
var string g_hud3_spr;
var string g_hud4_spr;
var string g_hud5_spr;
var string g_hud6_spr;
var string g_hud7_spr;
var string g_hud10_spr;
var string g_hud11_spr;
var string g_hud12_spr;
var string g_hud13_spr;
var string g_hud14_spr;
var string g_hud15_spr;
var string g_hud16_spr;
struct
{
/* viewmodel stuff */

87
src/client/cstrike/hud.c
View file

@ -17,7 +17,6 @@
void HUD_DrawWeaponSelect(void);
/* Use first frame for drawing (needs precache) */
#define HUD_NUMS "sprites/640hud7.spr_0.tga"
#define NUMSIZE_X 24/256
#define NUMSIZE_Y 24/256
#define HUD_ALPHA 0.5
@ -40,20 +39,22 @@ void
HUD_Init(void)
{
precache_model("sprites/640_logo.spr");
precache_model("sprites/640hud1.spr");
precache_model("sprites/640hud2.spr");
precache_model("sprites/640hud3.spr");
precache_model("sprites/640hud4.spr");
precache_model("sprites/640hud5.spr");
precache_model("sprites/640hud6.spr");
precache_model("sprites/640hud7.spr");
precache_model("sprites/640hud10.spr");
precache_model("sprites/640hud11.spr");
precache_model("sprites/640hud12.spr");
precache_model("sprites/640hud13.spr");
precache_model("sprites/640hud14.spr");
precache_model("sprites/640hud15.spr");
precache_model("sprites/640hud16.spr");
g_hud1_spr = spriteframe("sprites/640hud1.spr", 0, 0.0f);
g_hud2_spr = spriteframe("sprites/640hud2.spr", 0, 0.0f);
g_hud3_spr = spriteframe("sprites/640hud3.spr", 0, 0.0f);
g_hud4_spr = spriteframe("sprites/640hud4.spr", 0, 0.0f);
g_hud5_spr = spriteframe("sprites/640hud5.spr", 0, 0.0f);
g_hud6_spr = spriteframe("sprites/640hud6.spr", 0, 0.0f);
g_hud7_spr = spriteframe("sprites/640hud7.spr", 0, 0.0f);
g_hud10_spr = spriteframe("sprites/640hud10.spr", 0, 0.0f);
g_hud11_spr = spriteframe("sprites/640hud11.spr", 0, 0.0f);
g_hud12_spr = spriteframe("sprites/640hud12.spr", 0, 0.0f);
g_hud13_spr = spriteframe("sprites/640hud13.spr", 0, 0.0f);
g_hud14_spr = spriteframe("sprites/640hud14.spr", 0, 0.0f);
g_hud15_spr = spriteframe("sprites/640hud15.spr", 0, 0.0f);
g_hud16_spr = spriteframe("sprites/640hud16.spr", 0, 0.0f);
precache_model("sprites/bottom.spr");
precache_model("sprites/bottom_left.spr");
precache_model("sprites/bottom_right.spr");
@ -72,7 +73,7 @@ HUD_DrawSeperator(vector pos)
{
drawsubpic(pos,
[2,24],
HUD_NUMS,
g_hud7_spr,
[240/256, 0],
[2/256, 24/256],
g_hud_color,
@ -87,7 +88,7 @@ HUD_DrawNumber(int iNumber, vector vecPos, float fAlpha, vector vColor)
{
drawsubpic(vecPos,
[20,25],
HUD_NUMS,
g_hud7_spr,
[spr_hudnum[iNumber], 0],
[20/256, 25/256],
vColor,
@ -152,14 +153,14 @@ HUD_DrawTimer(int spectator)
HUD_DrawNumber(iUnits, time_pos + [99,0],1 - fAlpha, g_hud_color);
/* : symbol */
drawsubpic(time_pos + [70,6], [3,3], HUD_NUMS, [0.9375, 0], [0.01171875, 0.01171875], [1,0,0], fAlpha, DRAWFLAG_ADDITIVE);
drawsubpic(time_pos + [70,16], [3,3], HUD_NUMS, [0.9375, 0], [0.01171875, 0.01171875], [1,0,0], fAlpha, DRAWFLAG_ADDITIVE);
drawsubpic(time_pos + [70,6], [3,3], HUD_NUMS, [0.9375, 0], [0.01171875, 0.01171875], g_hud_color, 1 - fAlpha, DRAWFLAG_ADDITIVE);
drawsubpic(time_pos + [70,16], [3,3], HUD_NUMS, [0.9375, 0], [0.01171875, 0.01171875], g_hud_color, 1 - fAlpha, DRAWFLAG_ADDITIVE);
drawsubpic(time_pos + [70,6], [3,3], g_hud7_spr, [0.9375, 0], [0.01171875, 0.01171875], [1,0,0], fAlpha, DRAWFLAG_ADDITIVE);
drawsubpic(time_pos + [70,16], [3,3], g_hud7_spr, [0.9375, 0], [0.01171875, 0.01171875], [1,0,0], fAlpha, DRAWFLAG_ADDITIVE);
drawsubpic(time_pos + [70,6], [3,3], g_hud7_spr, [0.9375, 0], [0.01171875, 0.01171875], g_hud_color, 1 - fAlpha, DRAWFLAG_ADDITIVE);
drawsubpic(time_pos + [70,16], [3,3], g_hud7_spr, [0.9375, 0], [0.01171875, 0.01171875], g_hud_color, 1 - fAlpha, DRAWFLAG_ADDITIVE);
/* clock */
drawsubpic(time_pos, [24,25], HUD_NUMS, [NUMSIZE_X * 6, NUMSIZE_Y * 3], [NUMSIZE_X, NUMSIZE_Y], [1,0,0], fAlpha, DRAWFLAG_ADDITIVE);
drawsubpic(time_pos, [24,25], HUD_NUMS, [NUMSIZE_X * 6, NUMSIZE_Y * 3], [NUMSIZE_X, NUMSIZE_Y], g_hud_color, 1 - fAlpha, DRAWFLAG_ADDITIVE);
drawsubpic(time_pos, [24,25], g_hud7_spr, [NUMSIZE_X * 6, NUMSIZE_Y * 3], [NUMSIZE_X, NUMSIZE_Y], [1,0,0], fAlpha, DRAWFLAG_ADDITIVE);
drawsubpic(time_pos, [24,25], g_hud7_spr, [NUMSIZE_X * 6, NUMSIZE_Y * 3], [NUMSIZE_X, NUMSIZE_Y], g_hud_color, 1 - fAlpha, DRAWFLAG_ADDITIVE);
} else {
if (iUnits != pSeat->m_iTimeUnitsOld) {
pSeat->m_flTimeAlpha = 1.0;
@ -174,10 +175,10 @@ HUD_DrawTimer(int spectator)
HUD_DrawNumber(iTens, time_pos + [75,0], pSeat->m_flTimeAlpha, g_hud_color);
HUD_DrawNumber(iUnits, time_pos + [95,0], pSeat->m_flTimeAlpha, g_hud_color);
drawsubpic(time_pos + [70,6], [3,3], HUD_NUMS, [0.9375, 0], [0.01171875, 0.01171875], g_hud_color, pSeat->m_flTimeAlpha, DRAWFLAG_ADDITIVE);
drawsubpic(time_pos + [70,16], [3,3], HUD_NUMS, [0.9375, 0], [0.01171875, 0.01171875], g_hud_color, pSeat->m_flTimeAlpha, DRAWFLAG_ADDITIVE);
drawsubpic(time_pos + [70,6], [3,3], g_hud7_spr, [0.9375, 0], [0.01171875, 0.01171875], g_hud_color, pSeat->m_flTimeAlpha, DRAWFLAG_ADDITIVE);
drawsubpic(time_pos + [70,16], [3,3], g_hud7_spr, [0.9375, 0], [0.01171875, 0.01171875], g_hud_color, pSeat->m_flTimeAlpha, DRAWFLAG_ADDITIVE);
drawsubpic(time_pos, [24,25], HUD_NUMS, [NUMSIZE_X * 6, NUMSIZE_Y * 3], [NUMSIZE_X, NUMSIZE_Y], g_hud_color, pSeat->m_flTimeAlpha, DRAWFLAG_ADDITIVE);
drawsubpic(time_pos, [24,25], g_hud7_spr, [NUMSIZE_X * 6, NUMSIZE_Y * 3], [NUMSIZE_X, NUMSIZE_Y], g_hud_color, pSeat->m_flTimeAlpha, DRAWFLAG_ADDITIVE);
pSeat->m_iTimeUnitsOld = iUnits;
}
}
@ -221,7 +222,7 @@ HUD_DrawMoney(void)
drawsubpic(
money_pos,
[18,26],
HUD_NUMS,
g_hud7_spr,
[192/256, 24/256],
[18/256, 26/256],
g_hud_color,
@ -236,7 +237,7 @@ HUD_DrawMoney(void)
drawsubpic(
money_pos,
[18,26],
HUD_NUMS,
g_hud7_spr,
[192/256, 24/256],
[18/256, 26/256],
pSeat->m_vecMoneyColor,
@ -247,9 +248,9 @@ HUD_DrawMoney(void)
/* draw the +/- symbols depending on whether
* or not we made or lost money */
if (pSeat->m_iMoneyDelta < 0) {
drawsubpic(money_pos + [0,-32], [18,23], HUD_NUMS, [0.8671875, 0.09765625], [0.0703125, 0.08984375], pSeat->m_vecMoneyColor, endalpha, DRAWFLAG_ADDITIVE);
drawsubpic(money_pos + [0,-32], [18,23], g_hud7_spr, [0.8671875, 0.09765625], [0.0703125, 0.08984375], pSeat->m_vecMoneyColor, endalpha, DRAWFLAG_ADDITIVE);
} else {
drawsubpic(money_pos + [0,-32], [13,23], HUD_NUMS, [0.8203125, 0.09765625], [0.05078125, 0.08984375], pSeat->m_vecMoneyColor, endalpha, DRAWFLAG_ADDITIVE);
drawsubpic(money_pos + [0,-32], [13,23], g_hud7_spr, [0.8203125, 0.09765625], [0.05078125, 0.08984375], pSeat->m_vecMoneyColor, endalpha, DRAWFLAG_ADDITIVE);
}
/* shift the numbers for reverse drawing */
@ -298,7 +299,7 @@ HUD_DrawHealth(void)
drawsubpic(
pos + [-72,1],
[24,24],
HUD_NUMS,
g_hud7_spr,
[spr_health[0], spr_health[1]],
[spr_health[2], spr_health[3]],
g_hud_color,
@ -310,7 +311,7 @@ HUD_DrawHealth(void)
drawsubpic(
pos + [-72,1],
[24,24],
HUD_NUMS,
g_hud7_spr,
[spr_health[0], spr_health[1]],
[spr_health[2], spr_health[3]],
[1,0,0],
@ -346,7 +347,7 @@ HUD_DrawArmor(void)
drawsubpic(
pos + [-80,1],
[24,24],
HUD_NUMS,
g_hud7_spr,
[spr_suit4[0], spr_suit4[1]],
[spr_suit4[2], spr_suit4[3]],
g_hud_color,
@ -357,7 +358,7 @@ HUD_DrawArmor(void)
drawsubpic(
pos + [-80,1],
[24,24],
HUD_NUMS,
g_hud7_spr,
[spr_suit2[0], spr_suit2[1]],
[spr_suit2[2], spr_suit2[3]],
g_hud_color,
@ -371,7 +372,7 @@ HUD_DrawArmor(void)
drawsubpic(
pos + [-80,1],
[24, 24 * (pl.armor / 100)],
HUD_NUMS,
g_hud7_spr,
[spr_suit3[0],
spr_suit3[1]],
[spr_suit3[2], spr_suit3[3] * (pl.armor / 100)],
@ -383,7 +384,7 @@ HUD_DrawArmor(void)
drawsubpic(
pos + [-80,1],
[24, 24 * (pl.armor / 100)],
HUD_NUMS,
g_hud7_spr,
[spr_suit1[0],
spr_suit1[1]],
[spr_suit1[2], spr_suit1[3] * (pl.armor / 100)],
@ -478,7 +479,7 @@ HUD_DrawFlashlight(void)
drawsubpic(
pos,
[32,32],
HUD_NUMS,
g_hud7_spr,
[spr_flash1[0], spr_flash1[1]],
[spr_flash1[2], spr_flash1[3]],
g_hud_color,
@ -489,7 +490,7 @@ HUD_DrawFlashlight(void)
drawsubpic(
pos,
[48,32],
HUD_NUMS,
g_hud7_spr,
[spr_flash2[0], spr_flash2[1]],
[spr_flash2[2], spr_flash2[3]],
g_hud_color,
@ -500,7 +501,7 @@ HUD_DrawFlashlight(void)
drawsubpic(
pos,
[32,32],
HUD_NUMS,
g_hud7_spr,
[spr_flash1[0], spr_flash1[1]],
[spr_flash1[2], spr_flash1[3]],
g_hud_color,
@ -536,7 +537,7 @@ HUD_DrawZones(void)
drawsubpic(
pos,
[32,32],
HUD_NUMS,
g_hud7_spr,
[96/256,148/256],
[32/256,32/256],
[0,1,0],
@ -549,7 +550,7 @@ HUD_DrawZones(void)
drawsubpic(
pos,
[32,32],
HUD_NUMS,
g_hud7_spr,
[0/256,148/256],
[32/256,32/256],
[0,1,0],
@ -562,7 +563,7 @@ HUD_DrawZones(void)
drawsubpic(
pos,
[32,32],
HUD_NUMS,
g_hud7_spr,
[64/256,148/256],
[32/256,32/256],
[0,1,0],
@ -575,7 +576,7 @@ HUD_DrawZones(void)
drawsubpic(
pos,
[32,32],
HUD_NUMS,
g_hud7_spr,
[48/256,148/256],
[32/256,32/256],
[0,1,0],

4
src/client/cstrike/hud_weaponselect.c
View file

@ -101,7 +101,7 @@ HUD_DrawWeaponSelect_Last(void)
void
HUD_DrawWeaponSelect_Num(vector vecPos, int val)
{
drawsubpic(vecPos, [20,20], "sprites/640hud7.spr_0.tga", g_vecHUDNums[val], [20/256, 20/256], g_hud_color, 1, DRAWFLAG_ADDITIVE);
drawsubpic(vecPos, [20,20], g_hud7_spr, g_vecHUDNums[val], [20/256, 20/256], g_hud_color, 1, DRAWFLAG_ADDITIVE);
}
int
@ -205,7 +205,7 @@ HUD_DrawWeaponSelect(void)
if (x == wantpos) {
// Selected Sprite
Weapons_HUDPic(pSeat->m_iHUDWeaponSelected, 1, vecPos, 1.0f);
drawsubpic(vecPos, [170,45], "sprites/640hud3.spr_0.tga",
drawsubpic(vecPos, [170,45], g_hud3_spr,
[0,180/256], [170/256,45/256], g_hud_color, 1, DRAWFLAG_ADDITIVE);
vecPos[1] += 50;
} else if ((b=HUD_InSlotPos(i, x)) != -1) {

6
src/shared/cstrike/w_ak47.c
View file

@ -212,7 +212,7 @@ w_ak47_hud(void)
HUD_DrawAmmo1();
HUD_DrawAmmo2();
vector aicon_pos = g_hudmins + [g_hudres[0] - 48, g_hudres[1] - 42];
drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [72/256,72/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
drawsubpic(aicon_pos, [24,24], g_hud7_spr, [72/256,72/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
#endif
}
@ -224,7 +224,7 @@ w_ak47_hudpic(int selected, vector pos, float a)
drawsubpic(
pos,
[170,45],
"sprites/640hud11.spr_0.tga",
g_hud11_spr,
[0,0],
[170/256,45/256],
g_hud_color,
@ -235,7 +235,7 @@ w_ak47_hudpic(int selected, vector pos, float a)
drawsubpic(
pos,
[170,45],
"sprites/640hud11.spr_0.tga",
g_hud11_spr,
[0,0],
[170/256,45/256],
g_hud_color,

6
src/shared/cstrike/w_aug.c
View file

@ -237,7 +237,7 @@ w_aug_hud(void)
HUD_DrawAmmo1();
HUD_DrawAmmo2();
vector aicon_pos = g_hudmins + [g_hudres[0] - 48, g_hudres[1] - 42];
drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [72/256,72/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
drawsubpic(aicon_pos, [24,24], g_hud7_spr, [72/256,72/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
#endif
}
@ -249,7 +249,7 @@ w_aug_hudpic(int selected, vector pos, float a)
drawsubpic(
pos,
[170,45],
"sprites/640hud15.spr_0.tga",
g_hud15_spr,
[0,45/256],
[170/256,45/256],
g_hud_color,
@ -260,7 +260,7 @@ w_aug_hudpic(int selected, vector pos, float a)
drawsubpic(
pos,
[170,45],
"sprites/640hud14.spr_0.tga",
g_hud14_spr,
[0,45/256],
[170/256,45/256],
g_hud_color,

6
src/shared/cstrike/w_awp.c
View file

@ -263,7 +263,7 @@ w_awp_hud(void)
HUD_DrawAmmo1();
HUD_DrawAmmo2();
vector aicon_pos = g_hudmins + [g_hudres[0] - 48, g_hudres[1] - 42];
drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [24/256,96/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
drawsubpic(aicon_pos, [24,24], g_hud7_spr, [24/256,96/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
#endif
}
@ -275,7 +275,7 @@ w_awp_hudpic(int selected, vector pos, float a)
drawsubpic(
pos,
[170,45],
"sprites/640hud5.spr_0.tga",
g_hud5_spr,
[0,135/256],
[170/256,45/256],
g_hud_color,
@ -286,7 +286,7 @@ w_awp_hudpic(int selected, vector pos, float a)
drawsubpic(
pos,
[170,45],
"sprites/640hud2.spr_0.tga",
g_hud2_spr,
[0,135/256],
[170/256,45/256],
g_hud_color,

6
src/shared/cstrike/w_c4bomb.c
View file

@ -172,7 +172,7 @@ w_c4bomb_hud(void)
#ifdef CLIENT
HUD_DrawAmmo2();
vector aicon_pos = g_hudmins + [g_hudres[0] - 48, g_hudres[1] - 42];
drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [96/256,96/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
drawsubpic(aicon_pos, [24,24], g_hud7_spr, [96/256,96/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
#endif
}
@ -184,7 +184,7 @@ w_c4bomb_hudpic(int selected, vector pos, float a)
drawsubpic(
pos,
[170,45],
"sprites/640hud4.spr_0.tga",
g_hud4_spr,
[0,0],
[170/256,45/256],
g_hud_color,
@ -195,7 +195,7 @@ w_c4bomb_hudpic(int selected, vector pos, float a)
drawsubpic(
pos,
[170,45],
"sprites/640hud1.spr_0.tga",
g_hud1_spr,
[0,0],
[170/256,45/256],
g_hud_color,

6
src/shared/cstrike/w_deagle.c
View file

@ -217,7 +217,7 @@ w_deagle_hud(void)
HUD_DrawAmmo1();
HUD_DrawAmmo2();
vector aicon_pos = g_hudmins + [g_hudres[0] - 48, g_hudres[1] - 42];
drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [24/256,72/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
drawsubpic(aicon_pos, [24,24], g_hud7_spr, [24/256,72/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
#endif
}
@ -229,7 +229,7 @@ w_deagle_hudpic(int selected, vector pos, float a)
drawsubpic(
pos,
[170,45],
"sprites/640hud11.spr_0.tga",
g_hud11_spr,
[0,90/256],
[170/256,45/256],
g_hud_color,
@ -240,7 +240,7 @@ w_deagle_hudpic(int selected, vector pos, float a)
drawsubpic(
pos,
[170,45],
"sprites/640hud10.spr_0.tga",
g_hud10_spr,
[0,90/256],
[170/256,45/256],
g_hud_color,

6
src/shared/cstrike/w_elites.c
View file

@ -268,7 +268,7 @@ w_elites_hud(void)
HUD_DrawAmmo1();
HUD_DrawAmmo2();
vector aicon_pos = g_hudmins + [g_hudres[0] - 48, g_hudres[1] - 42];
drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [48/256,72/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
drawsubpic(aicon_pos, [24,24], g_hud7_spr, [48/256,72/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
#endif
}
@ -280,7 +280,7 @@ w_elites_hudpic(int selected, vector pos, float a)
drawsubpic(
pos,
[170,45],
"sprites/640hud15.spr_0.tga",
g_hud15_spr,
[0,90/256],
[170/256,45/256],
g_hud_color,
@ -291,7 +291,7 @@ w_elites_hudpic(int selected, vector pos, float a)
drawsubpic(
pos,
[170,45],
"sprites/640hud14.spr_0.tga",
g_hud14_spr,
[0,90/256],
[170/256,45/256],
g_hud_color,

6
src/shared/cstrike/w_fiveseven.c
View file

@ -217,7 +217,7 @@ w_fiveseven_hud(void)
HUD_DrawAmmo1();
HUD_DrawAmmo2();
vector aicon_pos = g_hudmins + [g_hudres[0] - 48, g_hudres[1] - 42];
drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [120/256,96/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
drawsubpic(aicon_pos, [24,24], g_hud7_spr, [120/256,96/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
#endif
}
@ -229,7 +229,7 @@ w_fiveseven_hudpic(int selected, vector pos, float a)
drawsubpic(
pos,
[170,45],
"sprites/640hud15.spr_0.tga",
g_hud15_spr,
[0,135/256],
[170/256,45/256],
g_hud_color,
@ -240,7 +240,7 @@ w_fiveseven_hudpic(int selected, vector pos, float a)
drawsubpic(
pos,
[170,45],
"sprites/640hud14.spr_0.tga",
g_hud14_spr,
[0,135/256],
[170/256,45/256],
g_hud_color,

6
src/shared/cstrike/w_flashbang.c
View file

@ -228,7 +228,7 @@ w_flashbang_hud(void)
HUD_DrawAmmo2();
vector aicon_pos = g_hudmins + [g_hudres[0] - 48, g_hudres[1] - 42];
drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [48/256,96/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
drawsubpic(aicon_pos, [24,24], g_hud7_spr, [48/256,96/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
#endif
}
@ -240,7 +240,7 @@ w_flashbang_hudpic(int selected, vector pos, float a)
drawsubpic(
pos,
[170,45],
"sprites/640hud6.spr_0.tga",
g_hud6_spr,
[0,90/256],
[170/256,45/256],
g_hud_color,
@ -251,7 +251,7 @@ w_flashbang_hudpic(int selected, vector pos, float a)
drawsubpic(
pos,
[170,45],
"sprites/640hud3.spr_0.tga",
g_hud3_spr,
[0,90/256],
[170/256,45/256],
g_hud_color,

6
src/shared/cstrike/w_g3sg1.c
View file

@ -228,7 +228,7 @@ w_g3sg1_hud(void)
HUD_DrawAmmo1();
HUD_DrawAmmo2();
vector aicon_pos = g_hudmins + [g_hudres[0] - 48, g_hudres[1] - 42];
drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [72/256,72/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
drawsubpic(aicon_pos, [24,24], g_hud7_spr, [72/256,72/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
#endif
}
@ -240,7 +240,7 @@ w_g3sg1_hudpic(int selected, vector pos, float a)
drawsubpic(
pos,
[170,45],
"sprites/640hud5.spr_0.tga",
g_hud5_spr,
[0,180/256],
[170/256,45/256],
g_hud_color,
@ -251,7 +251,7 @@ w_g3sg1_hudpic(int selected, vector pos, float a)
drawsubpic(
pos,
[170,45],
"sprites/640hud2.spr_0.tga",
g_hud2_spr,
[0,180/256],
[170/256,45/256],
g_hud_color,

6
src/shared/cstrike/w_glock18.c
View file

@ -276,7 +276,7 @@ w_glock18_hud(void)
HUD_DrawAmmo1();
HUD_DrawAmmo2();
vector aicon_pos = g_hudmins + [g_hudres[0] - 48, g_hudres[1] - 42];
drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [48/256,72/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
drawsubpic(aicon_pos, [24,24], g_hud7_spr, [48/256,72/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
#endif
}
@ -288,7 +288,7 @@ w_glock18_hudpic(int selected, vector pos, float a)
drawsubpic(
pos,
[170,45],
"sprites/640hud4.spr_0.tga",
g_hud4_spr,
[0,45/256],
[170/256,45/256],
g_hud_color,
@ -299,7 +299,7 @@ w_glock18_hudpic(int selected, vector pos, float a)
drawsubpic(
pos,
[170,45],
"sprites/640hud1.spr_0.tga",
g_hud1_spr,
[0,45/256],
[170/256,45/256],
g_hud_color,

6
src/shared/cstrike/w_hegrenade.c
View file

@ -230,7 +230,7 @@ w_hegrenade_hud(void)
HUD_DrawAmmo2();
vector aicon_pos = g_hudmins + [g_hudres[0] - 48, g_hudres[1] - 42];
drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [72/256,96/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
drawsubpic(aicon_pos, [24,24], g_hud7_spr, [72/256,96/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
#endif
}
@ -242,7 +242,7 @@ w_hegrenade_hudpic(int selected, vector pos, float a)
drawsubpic(
pos,
[170,45],
"sprites/640hud6.spr_0.tga",
g_hud6_spr,
[0,45/256],
[170/256,45/256],
g_hud_color,
@ -253,7 +253,7 @@ w_hegrenade_hudpic(int selected, vector pos, float a)
drawsubpic(
pos,
[170,45],
"sprites/640hud3.spr_0.tga",
g_hud3_spr,
[0,45/256],
[170/256,45/256],
g_hud_color,

4
src/shared/cstrike/w_knife.c
View file

@ -189,7 +189,7 @@ w_knife_hudpic(int selected, vector pos, float a)
drawsubpic(
pos,
[170,45],
"sprites/640hud11.spr_0.tga",
g_hud11_spr,
[0,135/256],
[170/256,45/256],
g_hud_color,
@ -200,7 +200,7 @@ w_knife_hudpic(int selected, vector pos, float a)
drawsubpic(
pos,
[170,45],
"sprites/640hud10.spr_0.tga",
g_hud10_spr,
[0,135/256],
[170/256,45/256],
g_hud_color,

6
src/shared/cstrike/w_m3.c
View file

@ -252,7 +252,7 @@ w_m3_hud(void)
HUD_DrawAmmo1();
HUD_DrawAmmo2();
vector aicon_pos = g_hudmins + [g_hudres[0] - 48, g_hudres[1] - 42];
drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [0,72/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
drawsubpic(aicon_pos, [24,24], g_hud7_spr, [0,72/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
#endif
}
@ -264,7 +264,7 @@ w_m3_hudpic(int selected, vector pos, float a)
drawsubpic(
pos,
[170,45],
"sprites/640hud4.spr_0.tga",
g_hud4_spr,
[0,135/256],
[170/256,45/256],
g_hud_color,
@ -275,7 +275,7 @@ w_m3_hudpic(int selected, vector pos, float a)
drawsubpic(
pos,
[170,45],
"sprites/640hud1.spr_0.tga",
g_hud1_spr,
[0,135/256],
[170/256,45/256],
g_hud_color,

6
src/shared/cstrike/w_m4a1.c
View file

@ -283,7 +283,7 @@ w_m4a1_hud(void)
HUD_DrawAmmo1();
HUD_DrawAmmo2();
vector aicon_pos = g_hudmins + [g_hudres[0] - 48, g_hudres[1] - 42];
drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [0,96/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
drawsubpic(aicon_pos, [24,24], g_hud7_spr, [0,96/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
#endif
}
@ -314,7 +314,7 @@ w_m4a1_hudpic(int selected, vector pos, float a)
drawsubpic(
pos,
[170,45],
"sprites/640hud5.spr_0.tga",
g_hud5_spr,
[0,45/256],
[170/256,45/256],
g_hud_color,
@ -325,7 +325,7 @@ w_m4a1_hudpic(int selected, vector pos, float a)
drawsubpic(
pos,
[170,45],
"sprites/640hud2.spr_0.tga",
g_hud2_spr,
[0,45/256],
[170/256,45/256],
g_hud_color,

6
src/shared/cstrike/w_mac10.c
View file

@ -211,7 +211,7 @@ w_mac10_hud(void)
HUD_DrawAmmo1();
HUD_DrawAmmo2();
vector aicon_pos = g_hudmins + [g_hudres[0] - 48, g_hudres[1] - 42];
drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [96/256,72/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
drawsubpic(aicon_pos, [24,24], g_hud7_spr, [96/256,72/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
#endif
}
@ -223,7 +223,7 @@ w_mac10_hudpic(int selected, vector pos, float a)
drawsubpic(
pos,
[170,45],
"sprites/640hud15.spr_0.tga",
g_hud15_spr,
[0,0],
[170/256,45/256],
g_hud_color,
@ -234,7 +234,7 @@ w_mac10_hudpic(int selected, vector pos, float a)
drawsubpic(
pos,
[170,45],
"sprites/640hud14.spr_0.tga",
g_hud14_spr,
[0,0],
[170/256,45/256],
g_hud_color,

6
src/shared/cstrike/w_mp5.c
View file

@ -216,7 +216,7 @@ w_mp5_hud(void)
HUD_DrawAmmo1();
HUD_DrawAmmo2();
vector aicon_pos = g_hudmins + [g_hudres[0] - 48, g_hudres[1] - 42];
drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [48/256,72/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
drawsubpic(aicon_pos, [24,24], g_hud7_spr, [48/256,72/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
#endif
}
@ -228,7 +228,7 @@ w_mp5_hudpic(int selected, vector pos, float a)
drawsubpic(
pos,
[170,45],
"sprites/640hud4.spr_0.tga",
g_hud4_spr,
[0,180/256],
[170/256,45/256],
g_hud_color,
@ -239,7 +239,7 @@ w_mp5_hudpic(int selected, vector pos, float a)
drawsubpic(
pos,
[170,45],
"sprites/640hud1.spr_0.tga",
g_hud1_spr,
[0,180/256],
[170/256,45/256],
g_hud_color,

6
src/shared/cstrike/w_p228.c
View file

@ -222,7 +222,7 @@ w_p228_hud(void)
HUD_DrawAmmo1();
HUD_DrawAmmo2();
vector aicon_pos = g_hudmins + [g_hudres[0] - 48, g_hudres[1] - 42];
drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [120/256,72/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
drawsubpic(aicon_pos, [24,24], g_hud7_spr, [120/256,72/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
#endif
}
@ -234,7 +234,7 @@ w_p228_hudpic(int selected, vector pos, float a)
drawsubpic(
pos,
[170,45],
"sprites/640hud13.spr_0.tga",
g_hud13_spr,
[0,90/256],
[170/256,45/256],
g_hud_color,
@ -245,7 +245,7 @@ w_p228_hudpic(int selected, vector pos, float a)
drawsubpic(
pos,
[170,45],
"sprites/640hud12.spr_0.tga",
g_hud12_spr,
[0,90/256],
[170/256,45/256],
g_hud_color,

6
src/shared/cstrike/w_p90.c
View file

@ -212,7 +212,7 @@ w_p90_hud(void)
HUD_DrawAmmo1();
HUD_DrawAmmo2();
vector aicon_pos = g_hudmins + [g_hudres[0] - 48, g_hudres[1] - 42];
drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [120/256,96/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
drawsubpic(aicon_pos, [24,24], g_hud7_spr, [120/256,96/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
#endif
}
@ -224,7 +224,7 @@ w_p90_hudpic(int selected, vector pos, float a)
drawsubpic(
pos,
[170,45],
"sprites/640hud13.spr_0.tga",
g_hud13_spr,
[0,0],
[170/256,45/256],
g_hud_color,
@ -235,7 +235,7 @@ w_p90_hudpic(int selected, vector pos, float a)
drawsubpic(
pos,
[170,45],
"sprites/640hud12.spr_0.tga",
g_hud12_spr,
[0,0],
[170/256,45/256],
g_hud_color,

6
src/shared/cstrike/w_para.c
View file

@ -208,7 +208,7 @@ w_para_hud(void)
HUD_DrawAmmo1();
HUD_DrawAmmo2();
vector aicon_pos = g_hudmins + [g_hudres[0] - 48, g_hudres[1] - 42];
drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [0,96/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
drawsubpic(aicon_pos, [24,24], g_hud7_spr, [0,96/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
#endif
}
@ -220,7 +220,7 @@ w_para_hudpic(int selected, vector pos, float a)
drawsubpic(
pos,
[170,45],
"sprites/640hud6.spr_0.tga",
g_hud6_spr,
[0,0],
[170/256,45/256],
g_hud_color,
@ -231,7 +231,7 @@ w_para_hudpic(int selected, vector pos, float a)
drawsubpic(
pos,
[170,45],
"sprites/640hud3.spr_0.tga",
g_hud3_spr,
[0,0],
[170/256,45/256],
g_hud_color,

6
src/shared/cstrike/w_scout.c
View file

@ -260,7 +260,7 @@ w_scout_hud(void)
HUD_DrawAmmo1();
HUD_DrawAmmo2();
vector aicon_pos = g_hudmins + [g_hudres[0] - 48, g_hudres[1] - 42];
drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [72/256,72/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
drawsubpic(aicon_pos, [24,24], g_hud7_spr, [72/256,72/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
#endif
}
@ -272,7 +272,7 @@ w_scout_hudpic(int selected, vector pos, float a)
drawsubpic(
pos,
[170,45],
"sprites/640hud13.spr_0.tga",
g_hud13_spr,
[0,45/256],
[170/256,45/256],
g_hud_color,
@ -283,7 +283,7 @@ w_scout_hudpic(int selected, vector pos, float a)
drawsubpic(
pos,
[170,45],
"sprites/640hud12.spr_0.tga",
g_hud12_spr,
[0,45/256],
[170/256,45/256],
g_hud_color,

6
src/shared/cstrike/w_sg550.c
View file

@ -229,7 +229,7 @@ w_sg550_hud(void)
HUD_DrawAmmo1();
HUD_DrawAmmo2();
vector aicon_pos = g_hudmins + [g_hudres[0] - 48, g_hudres[1] - 42];
drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [0,96/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
drawsubpic(aicon_pos, [24,24], g_hud7_spr, [0,96/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
#endif
}
@ -241,7 +241,7 @@ w_sg550_hudpic(int selected, vector pos, float a)
drawsubpic(
pos,
[170,45],
"sprites/640hud15.spr_0.tga",
g_hud15_spr,
[0,180/256],
[170/256,45/256],
g_hud_color,
@ -252,7 +252,7 @@ w_sg550_hudpic(int selected, vector pos, float a)
drawsubpic(
pos,
[170,45],
"sprites/640hud14.spr_0.tga",
g_hud14_spr,
[0,180/256],
[170/256,45/256],
g_hud_color,

6
src/shared/cstrike/w_sg552.c
View file

@ -237,7 +237,7 @@ w_sg552_hud(void)
HUD_DrawAmmo1();
HUD_DrawAmmo2();
vector aicon_pos = g_hudmins + [g_hudres[0] - 48, g_hudres[1] - 42];
drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [0,96/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
drawsubpic(aicon_pos, [24,24], g_hud7_spr, [0,96/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
#endif
}
@ -249,7 +249,7 @@ w_sg552_hudpic(int selected, vector pos, float a)
drawsubpic(
pos,
[170,45],
"sprites/640hud11.spr_0.tga",
g_hud11_spr,
[0,45/256],
[170/256,45/256],
g_hud_color,
@ -260,7 +260,7 @@ w_sg552_hudpic(int selected, vector pos, float a)
drawsubpic(
pos,
[170,45],
"sprites/640hud10.spr_0.tga",
g_hud10_spr,
[0,45/256],
[170/256,45/256],
g_hud_color,

6
src/shared/cstrike/w_smokegrenade.c
View file

@ -226,7 +226,7 @@ w_smokegrenade_hud(void)
#ifdef CLIENT
HUD_DrawAmmo2();
vector aicon_pos = g_hudmins + [g_hudres[0] - 48, g_hudres[1] - 42];
drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [144/256,96/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
drawsubpic(aicon_pos, [24,24], g_hud7_spr, [144/256,96/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
#endif
}
@ -238,7 +238,7 @@ w_smokegrenade_hudpic(int selected, vector pos, float a)
drawsubpic(
pos,
[170,45],
"sprites/640hud6.spr_0.tga",
g_hud6_spr,
[0,135/256],
[170/256,45/256],
g_hud_color,
@ -249,7 +249,7 @@ w_smokegrenade_hudpic(int selected, vector pos, float a)
drawsubpic(
pos,
[170,45],
"sprites/640hud3.spr_0.tga",
g_hud3_spr,
[0,135/256],
[170/256,45/256],
g_hud_color,

6
src/shared/cstrike/w_tmp.c
View file

@ -212,7 +212,7 @@ w_tmp_hud(void)
HUD_DrawAmmo1();
HUD_DrawAmmo2();
vector aicon_pos = g_hudmins + [g_hudres[0] - 48, g_hudres[1] - 42];
drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [48/256,72/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
drawsubpic(aicon_pos, [24,24], g_hud7_spr, [48/256,72/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
#endif
}
@ -224,7 +224,7 @@ w_tmp_hudpic(int selected, vector pos, float a)
drawsubpic(
pos,
[170,45],
"sprites/640hud5.spr_0.tga",
g_hud5_spr,
[0,0],
[170/256,45/256],
g_hud_color,
@ -235,7 +235,7 @@ w_tmp_hudpic(int selected, vector pos, float a)
drawsubpic(
pos,
[170,45],
"sprites/640hud2.spr_0.tga",
g_hud2_spr,
[0,0],
[170/256,45/256],
g_hud_color,

6
src/shared/cstrike/w_ump45.c
View file

@ -212,7 +212,7 @@ w_ump45_hud(void)
HUD_DrawAmmo1();
HUD_DrawAmmo2();
vector aicon_pos = g_hudmins + [g_hudres[0] - 48, g_hudres[1] - 42];
drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [96/256,72/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
drawsubpic(aicon_pos, [24,24], g_hud7_spr, [96/256,72/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
#endif
}
@ -224,7 +224,7 @@ w_ump45_hudpic(int selected, vector pos, float a)
drawsubpic(
pos,
[170,45],
"sprites/640hud16.spr_0.tga",
g_hud16_spr,
[0,0],
[170/256,45/256],
g_hud_color,
@ -235,7 +235,7 @@ w_ump45_hudpic(int selected, vector pos, float a)
drawsubpic(
pos,
[170,45],
"sprites/640hud16.spr_0.tga",
g_hud16_spr,
[0,0],
[170/256,45/256],
g_hud_color,

6
src/shared/cstrike/w_usp45.c
View file

@ -297,7 +297,7 @@ w_usp45_hud(void)
HUD_DrawAmmo1();
HUD_DrawAmmo2();
vector aicon_pos = g_hudmins + [g_hudres[0] - 48, g_hudres[1] - 42];
drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [96/256,72/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
drawsubpic(aicon_pos, [24,24], g_hud7_spr, [96/256,72/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
#endif
}
@ -309,7 +309,7 @@ w_usp45_hudpic(int selected, vector pos, float a)
drawsubpic(
pos,
[170,45],
"sprites/640hud4.spr_0.tga",
g_hud4_spr,
[0,90/256],
[170/256,45/256],
g_hud_color,
@ -320,7 +320,7 @@ w_usp45_hudpic(int selected, vector pos, float a)
drawsubpic(
pos,
[170,45],
"sprites/640hud1.spr_0.tga",
g_hud1_spr,
[0,90/256],
[170/256,45/256],
g_hud_color,

6
src/shared/cstrike/w_xm1014.c
View file

@ -255,7 +255,7 @@ w_xm1014_hud(void)
HUD_DrawAmmo1();
HUD_DrawAmmo2();
vector aicon_pos = g_hudmins + [g_hudres[0] - 48, g_hudres[1] - 42];
drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [0,72/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
drawsubpic(aicon_pos, [24,24], g_hud7_spr, [0,72/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
#endif
}
@ -267,7 +267,7 @@ w_xm1014_hudpic(int selected, vector pos, float a)
drawsubpic(
pos,
[170,45],
"sprites/640hud13.spr_0.tga",
g_hud13_spr,
[0,135/256],
[170/256,45/256],
g_hud_color,
@ -278,7 +278,7 @@ w_xm1014_hudpic(int selected, vector pos, float a)
drawsubpic(
pos,
[170,45],
"sprites/640hud12.spr_0.tga",
g_hud12_spr,
[0,135/256],
[170/256,45/256],
g_hud_color,

28
src/shared/cstrike/weapons.h
View file

@ -48,43 +48,43 @@ enum
};
#define AMMO_MAX_50AE 35
// drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [24/256,72/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
// drawsubpic(aicon_pos, [24,24], g_hud7_spr, [24/256,72/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
#define AMMO_MAX_762MM 90
// drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [72/256,72/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
// drawsubpic(aicon_pos, [24,24], g_hud7_spr, [72/256,72/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
#define AMMO_MAX_556MM 90
// drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [0,96/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
// drawsubpic(aicon_pos, [24,24], g_hud7_spr, [0,96/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
#define AMMO_MAX_556MMBOX 200
// drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [0,96/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
// drawsubpic(aicon_pos, [24,24], g_hud7_spr, [0,96/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
#define AMMO_MAX_338MAG 30
// drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [24/256,96/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
// drawsubpic(aicon_pos, [24,24], g_hud7_spr, [24/256,96/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
#define AMMO_MAX_9MM 150
// drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [48/256,72/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
// drawsubpic(aicon_pos, [24,24], g_hud7_spr, [48/256,72/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
#define AMMO_MAX_BUCKSHOT 32
// drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [0,72/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
// drawsubpic(aicon_pos, [24,24], g_hud7_spr, [0,72/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
#define AMMO_MAX_45ACP 100
// drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [96/256,72/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
// drawsubpic(aicon_pos, [24,24], g_hud7_spr, [96/256,72/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
#define AMMO_MAX_357SIG 52
// drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [120/256,72/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
// drawsubpic(aicon_pos, [24,24], g_hud7_spr, [120/256,72/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
#define AMMO_MAX_57MM 100
// drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [120/256,96/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
// drawsubpic(aicon_pos, [24,24], g_hud7_spr, [120/256,96/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
// flashbang
// drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [48/256,96/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
// drawsubpic(aicon_pos, [24,24], g_hud7_spr, [48/256,96/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
// he
// drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [72/256,96/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
// drawsubpic(aicon_pos, [24,24], g_hud7_spr, [72/256,96/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
// smoke
// drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [144/256,96/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
// drawsubpic(aicon_pos, [24,24], g_hud7_spr, [144/256,96/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
// c4
// drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [96/256,96/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
// drawsubpic(aicon_pos, [24,24], g_hud7_spr, [96/256,96/256], [24/256, 24/256], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);