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

Added initial weapon HUD icons for mod: 'valve'

Browse source
This commit is contained in:
Marco Cawthorne 2019-08-31 05:48:54 +02:00
parent 3cd56b57af
commit da693c9999
14 changed files with 37 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Source/client/valve/hud.c
View file

@ -198,7 +198,7 @@ void HUD_DrawAmmo1(void)
ammo1_alpha = HUD_ALPHA;
}
pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
pos = video_mins + [video_res[0] - 72, video_res[1] - 42];
/* Magazine/Clip */
if (pl.a_ammo1 != -1) {
@ -227,7 +227,7 @@ void HUD_DrawAmmo2(void)
ammo2_alpha = HUD_ALPHA;
}
pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
pos = video_mins + [video_res[0] - 72, video_res[1] - 42];
/* Leftover Ammo */
HUD_DrawNums(pl.a_ammo2, pos, ammo2_alpha, g_hud_color);
@ -252,7 +252,7 @@ void HUD_DrawAmmo3(void)
ammo3_alpha = HUD_ALPHA;
}
pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
pos = video_mins + [video_res[0] - 72, video_res[1] - 42];
/* Special */
//if (pl.a_ammo3) {

10
Source/shared/valve/w_crossbow.c
View file

@ -66,10 +66,10 @@ void w_crossbow_draw(void)
Weapons_SetModel("models/v_crossbow.mdl");
if (pl.a_ammo1) {
Weapons_ViewAnimation(CROSSBOW_DRAW1);
} else {
Weapons_ViewAnimation(CROSSBOW_DRAW2);
}
Weapons_ViewAnimation(CROSSBOW_DRAW1);
} else {
Weapons_ViewAnimation(CROSSBOW_DRAW2);
}
}
void w_crossbow_holster(void)
@ -225,6 +225,8 @@ void w_crossbow_crosshair(void)
drawsubpic(cross_pos, [24,24], "sprites/crosshairs.spr_0.tga", [72/128,0], [0.1875, 0.1875], [1,1,1], 1, DRAWFLAG_NORMAL);
HUD_DrawAmmo1();
HUD_DrawAmmo2();
vector aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [96/256,72/128], [24/256, 24/128], g_hud_color, 1, DRAWFLAG_ADDITIVE);
#endif
}

2
Source/shared/valve/w_egon.c
View file

@ -134,6 +134,8 @@ void w_egon_crosshair(void)
cross_pos = (video_res / 2) + [-12,-12];
drawsubpic(cross_pos, [24,24], "sprites/crosshairs.spr_0.tga", [72/128,48/128], [0.1875, 0.1875], [1,1,1], 1, DRAWFLAG_NORMAL);
HUD_DrawAmmo2();
vector aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [0,96/128], [24/256, 24/128], g_hud_color, 1, DRAWFLAG_ADDITIVE);
#endif
}

2
Source/shared/valve/w_gauss.c
View file

@ -348,6 +348,8 @@ void w_gauss_crosshair(void)
cross_pos = (video_res / 2) + [-12,-12];
drawsubpic(cross_pos, [24,24], "sprites/crosshairs.spr_0.tga", [48/128,48/128], [0.1875, 0.1875], [1,1,1], 1, DRAWFLAG_NORMAL);
HUD_DrawAmmo2();
vector aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [0,96/128], [24/256, 24/128], g_hud_color, 1, DRAWFLAG_ADDITIVE);
#endif
}

2
Source/shared/valve/w_glock.c
View file

@ -219,6 +219,8 @@ void w_glock_hud(void)
drawsubpic(cross_pos, [24,24], "sprites/crosshairs.spr_0.tga", [0.1875,0], [0.1875, 0.1875], [1,1,1], 1, DRAWFLAG_NORMAL);
HUD_DrawAmmo1();
HUD_DrawAmmo2();
vector aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [0,72/128], [24/256, 24/128], g_hud_color, 1, DRAWFLAG_ADDITIVE);
#endif
}
void w_glock_hudpic(int s, vector pos)

2
Source/shared/valve/w_handgrenade.c
View file

@ -166,6 +166,8 @@ void w_handgrenade_hud(void)
{
#ifdef CSQC
HUD_DrawAmmo2();
vector aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [48/256,96/128], [24/256, 24/128], g_hud_color, 1, DRAWFLAG_ADDITIVE);
#endif
}

2
Source/shared/valve/w_hornetgun.c
View file

@ -206,6 +206,8 @@ void w_hornetgun_crosshair(void)
cross_pos = (video_res / 2) + [-12,-12];
drawsubpic(cross_pos, [24,24], "sprites/crosshairs.spr_0.tga", [72/128,24/128], [0.1875, 0.1875], [1,1,1], 1, DRAWFLAG_NORMAL);
HUD_DrawAmmo2();
vector aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [24/256,96/128], [24/256, 24/128], g_hud_color, 1, DRAWFLAG_ADDITIVE);
#endif
}

4
Source/shared/valve/w_mp5.c
View file

@ -231,6 +231,10 @@ void w_mp5_crosshair(void)
HUD_DrawAmmo1();
HUD_DrawAmmo2();
HUD_DrawAmmo3();
vector aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [0,72/128], [24/256, 24/128], g_hud_color, 1, DRAWFLAG_ADDITIVE);
aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 74];
drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [48/256,72/128], [24/256, 24/128], g_hud_color, 1, DRAWFLAG_ADDITIVE);
#endif
}

2
Source/shared/valve/w_python.c
View file

@ -179,6 +179,8 @@ void w_python_crosshair(void)
drawsubpic(cross_pos, [24,24], "sprites/crosshairs.spr_0.tga", [48/128,0], [0.1875, 0.1875], [1,1,1], 1, DRAWFLAG_NORMAL);
HUD_DrawAmmo1();
HUD_DrawAmmo2();
vector aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [24/256,72/128], [24/256, 24/128], g_hud_color, 1, DRAWFLAG_ADDITIVE);
#endif
}

2
Source/shared/valve/w_rpg.c
View file

@ -222,6 +222,8 @@ void w_rpg_laser(void)
drawpic(cross_pos, "sprites/laserdot.spr_0.tga", lasersize, [1,1,1], 1.0f, DRAWFLAG_ADDITIVE);
HUD_DrawAmmo1();
HUD_DrawAmmo2();
vector aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [120/256,72/128], [24/256, 24/128], g_hud_color, 1, DRAWFLAG_ADDITIVE);
#endif
}

2
Source/shared/valve/w_satchel.c
View file

@ -222,6 +222,8 @@ void w_satchel_hud(void)
{
#ifdef CSQC
HUD_DrawAmmo2();
vector aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [72/256,96/128], [24/256, 24/128], g_hud_color, 1, DRAWFLAG_ADDITIVE);
#endif
}

2
Source/shared/valve/w_shotgun.c
View file

@ -248,6 +248,8 @@ void w_shotgun_crosshair(void)
drawsubpic(cross_pos, [24,24], "sprites/crosshairs.spr_0.tga", [48/128,24/128], [0.1875, 0.1875], [1,1,1], 1, DRAWFLAG_NORMAL);
HUD_DrawAmmo1();
HUD_DrawAmmo2();
vector aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [72/256,72/128], [24/256, 24/128], g_hud_color, 1, DRAWFLAG_ADDITIVE);
#endif
}

6
Source/shared/valve/w_snark.c
View file

@ -198,8 +198,8 @@ void w_snark_precache(void)
precache_sound("squeek/sqk_die1.wav");
precache_sound("squeek/sqk_blast1.wav");
precache_sound("squeek/sqk_hunt1.wav");
precache_sound("squeek/sqk_hunt2.wav");
precache_sound("squeek/sqk_hunt3.wav");
precache_sound("squeek/sqk_hunt2.wav");
precache_sound("squeek/sqk_hunt3.wav");
}
void w_snark_updateammo(player pl)
{
@ -230,6 +230,8 @@ void w_snark_hud(void)
{
#ifdef CSQC
HUD_DrawAmmo2();
vector aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [96/256,96/128], [24/256, 24/128], g_hud_color, 1, DRAWFLAG_ADDITIVE);
#endif
}

2
Source/shared/valve/w_tripmine.c
View file

@ -244,6 +244,8 @@ void w_tripmine_hud(void)
{
#ifdef CSQC
HUD_DrawAmmo2();
vector aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [120/256,96/128], [24/256, 24/128], g_hud_color, 1, DRAWFLAG_ADDITIVE);
#endif
}