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

Improved entity documentation, added cl_hudaspect variable so that

Browse source 
you can control how close the elements are to the center of the screen.
This commit is contained in:
Marco Cawthorne 2020-04-01 18:43:09 +02:00
parent db8c10eeac
commit af53ab36ef
125 changed files with 410 additions and 210 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/client/chat.c
View file

@ -36,7 +36,7 @@ Chat_Draw(void)
string tempstr;
vector temppos;
tempstr = sprintf("^3Vote: %s", serverkey("vote_cmd"));
temppos[0] = (video_res[0]/2) - (stringwidth(tempstr, TRUE, [12,12]) / 2);
temppos[0] = (g_hudres[0]/2) - (stringwidth(tempstr, TRUE, [12,12]) / 2);
temppos[1] = 96;
drawstring(temppos, tempstr, [12,12], [1,1,1], 1.0f, 0);
@ -45,12 +45,12 @@ Chat_Draw(void)
serverkey("votes_y"),
serverkey("votes_n")
);
temppos[0] = (video_res[0]/2) - (stringwidth(tempstr, TRUE, [12,12]) / 2);
temppos[0] = (g_hudres[0]/2) - (stringwidth(tempstr, TRUE, [12,12]) / 2);
drawstring(temppos + [0,16], tempstr, [12,12], [1,1,1], 1.0f, 0);
}
g_chatpos[0] = video_mins[0] + 16;
g_chatpos[1] = video_mins[1] + video_res[1] - 128;
g_chatpos[0] = g_hudmins[0] + 16;
g_chatpos[1] = g_hudmins[1] + g_hudres[1] - 128;
if (g_chatlines < 0) {
return;

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

@ -105,7 +105,7 @@ HUD_DrawHealth(void)
pSeat->health_alpha = HUD_ALPHA;
}
pos = video_mins + [88, video_res[1] - 42];
pos = g_hudmins + [88, g_hudres[1] - 42];
if (pl.health > 25) {
drawsubpic(
pos + [-72,1],
@ -142,7 +142,7 @@ HUD_DrawArmor(void)
vector pos;
player pl = (player)pSeat->ePlayer;
pos = video_mins + [198, video_res[1] - 42];
pos = g_hudmins + [198, g_hudres[1] - 42];
if (pl.armor != pSeat->armor_old) {
pSeat->armor_alpha = 1.0;
@ -201,7 +201,7 @@ HUD_DrawAmmo1(void)
pSeat->ammo1_alpha = HUD_ALPHA;
}
pos = video_mins + [video_res[0] - 152, video_res[1] - 42];
pos = g_hudmins + [g_hudres[0] - 152, g_hudres[1] - 42];
HUD_DrawNums(pl.a_ammo1, pos, pSeat->ammo1_alpha, g_hud_color);
HUD_DrawSeperator(pos + [30,0]);
}
@ -224,7 +224,7 @@ HUD_DrawAmmo2(void)
pSeat->ammo2_alpha = HUD_ALPHA;
}
pos = video_mins + [video_res[0] - 72, video_res[1] - 42];
pos = g_hudmins + [g_hudres[0] - 72, g_hudres[1] - 42];
HUD_DrawNums(pl.a_ammo2, pos, pSeat->ammo2_alpha, g_hud_color);
}
@ -246,7 +246,7 @@ HUD_DrawAmmo3(void)
pSeat->ammo3_alpha = HUD_ALPHA;
}
pos = video_mins + [video_res[0] - 72, video_res[1] - 74];
pos = g_hudmins + [g_hudres[0] - 72, g_hudres[1] - 74];
HUD_DrawNums(pl.a_ammo3, pos, pSeat->ammo3_alpha, g_hud_color);
}
@ -256,7 +256,7 @@ HUD_DrawFlashlight(void)
{
vector pos;
player pl = (player)pSeat->ePlayer;
pos = video_mins + [video_res[0] - 48, 16];
pos = g_hudmins + [g_hudres[0] - 48, 16];
/* both on, draw both sprites at full intensity */
if (pl.flags & FL_FLASHLIGHT) {
@ -304,7 +304,7 @@ HUD_DrawLogo(void)
static float frame_timer;
frame_timer -= clframetime;
pos = [video_res[0] - 262, 48];
pos = [g_hudres[0] - 262, 48];
drawpic(
pos,
@ -337,7 +337,7 @@ HUD_DrawNotify(void)
return;
}
pos = video_mins + [video_res[0] - 192, video_res[1] - 128];
pos = g_hudmins + [g_hudres[0] - 192, g_hudres[1] - 128];
Weapons_HUDPic(pSeat->pickup_weapon, 1, pos, pSeat->pickup_alpha);
pSeat->pickup_alpha -= frametime;
}

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

@ -166,14 +166,14 @@ void HUD_DrawWeaponSelect(void)
return;
}
vector vecPos = video_mins + [16,16];
vector vecPos = g_hudmins + [16,16];
int b;
int wantslot = g_weapons[pSeat->fHUDWeaponSelected].slot;
int wantpos = g_weapons[pSeat->fHUDWeaponSelected].slot_pos;
for (int i = 0; i < 5; i++) {
int slot_selected = 0;
vecPos[1] = video_mins[1] + 16;
vecPos[1] = g_hudmins[1] + 16;
HUD_DrawWeaponSelect_Num(vecPos, i);
vecPos[1] += 20;
for (int x = 0; x < 32; x++) {

1
src/client/defs.h
View file

@ -49,6 +49,7 @@ var vector autocvar_v_gunofs = [0,0,0];
var int autocvar_r_viewmodelpass = 0;
var float autocvar_r_viewmodelfov = 90.0f;
var float autocvar_r_viewmodelscale = 1.0f;
var float autocvar_cl_hudaspect = 0.0f;
/* particle descriptors */
var float PARTICLE_BLOOD;

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

@ -172,14 +172,14 @@ void HUD_DrawWeaponSelect(void)
return;
}
vector vecPos = video_mins + [16,16];
vector vecPos = g_hudmins + [16,16];
int b;
int wantslot = g_weapons[pSeat->fHUDWeaponSelected].slot;
int wantpos = g_weapons[pSeat->fHUDWeaponSelected].slot_pos;
for (int i = 0; i < 7; i++) {
int slot_selected = 0;
vecPos[1] = video_mins[1] + 16;
vecPos[1] = g_hudmins[1] + 16;
HUD_DrawWeaponSelect_Num(vecPos, i);
vecPos[1] += 20;
for (int x = 0; x < 32; x++) {

4
src/client/obituary.c
View file

@ -14,8 +14,6 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
extern vector g_hud_color;
#define OBITUARY_LINES 4
#define OBITUARY_TIME 5
@ -104,7 +102,7 @@ Obituary_Draw(void)
vector pos;
vector item;
drawfont = FONT_CON;
pos = video_mins + [video_res[0] - 18, 56];
pos = g_hudmins + [g_hudres[0] - 18, 56];
if (g_obituary_time <= 0 && g_obituary_count > 0) {
for (i = 0; i < (OBITUARY_LINES-1); i++) {

14
src/client/rewolf/hud.c
View file

@ -105,10 +105,10 @@ void HUD_DrawHealth(void)
pl = (player)pSeat->ePlayer;
/* Shift digits by 128 units for the larger HUD */
if (video_res[0] <= 640) {
pos = video_mins + [0, video_res[1] - 128];
if (g_hudres[0] <= 640) {
pos = g_hudmins + [0, g_hudres[1] - 128];
} else {
pos = video_mins + [128, video_res[1] - 128];
pos = g_hudmins + [128, g_hudres[1] - 128];
}
/* Obligatory low-health color tint */
@ -134,7 +134,7 @@ void HUD_DrawHealth(void)
}
/* Minimal VS Larger HUD */
if (video_res[0] <= 640) {
if (g_hudres[0] <= 640) {
drawpic(pos, "gfx/vgui/640_metalhud_small.tga", [128,128],
[1,1,1], 1.0f);
} else {
@ -187,7 +187,7 @@ void HUD_DrawAmmo1(void)
ammo1_alpha = HUD_ALPHA;
}
pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
pos = g_hudmins + [g_hudres[0] - 48, g_hudres[1] - 42];
/* Magazine/Clip */
if (pl.a_ammo1 != -1) {
@ -216,7 +216,7 @@ void HUD_DrawAmmo2(void)
ammo2_alpha = HUD_ALPHA;
}
pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
pos = g_hudmins + [g_hudres[0] - 48, g_hudres[1] - 42];
/* Leftover Ammo */
HUD_DrawNums(pl.a_ammo2, pos, ammo2_alpha, g_hud_color);
@ -241,7 +241,7 @@ void HUD_DrawAmmo3(void)
ammo3_alpha = HUD_ALPHA;
}
pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
pos = g_hudmins + [g_hudres[0] - 48, g_hudres[1] - 42];
/* Special */
if (pl.a_ammo3) {

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

@ -174,14 +174,14 @@ void HUD_DrawWeaponSelect(void)
return;
}
vector vecPos = video_mins + [16,16];
vector vecPos = g_hudmins + [16,16];
int b;
int wantslot = g_weapons[pSeat->fHUDWeaponSelected].slot;
int wantpos = g_weapons[pSeat->fHUDWeaponSelected].slot_pos;
for (int i = 0; i < 5; i++) {
int slot_selected = 0;
vecPos[1] = video_mins[1] + 16;
vecPos[1] = g_hudmins[1] + 16;
HUD_DrawWeaponSelect_Num(vecPos, i);
vecPos[1] += 20;
for (int x = 0; x < 32; x++) {

8
src/client/text.c
View file

@ -52,9 +52,9 @@ GameText_DrawString(vector pos, string msg, vector col, float alpha)
float strwidth = stringwidth(argv(i), TRUE, [20,20]);
if (pos[0] == -1) {
rpos[0] = (video_res[0] / 2) - (strwidth/2);
rpos[0] = g_hudmins[0] + (g_hudres[0] / 2) - (strwidth/2);
} else {
rpos[0] = video_res[0] * pos[0];
rpos[0] = g_hudmins[0] + g_hudres[0] * pos[0];
if (pos[0] >= 0.5) {
rpos[0] -= strwidth;
@ -62,9 +62,9 @@ GameText_DrawString(vector pos, string msg, vector col, float alpha)
}
if (pos[1] == -1) {
rpos[1] = (video_res[1] / 2) - 6;
rpos[1] = g_hudmins[1] + (g_hudres[1] / 2) - 6;
} else {
rpos[1] = ((video_res[1] - 12) * pos[1]);
rpos[1] = g_hudmins[1] + ((g_hudres[1] - 12) * pos[1]);
}
rpos[1] += 20 * i;
rpos[1] -= (20 * c) / 2;

2
src/client/valve/defs.h
View file

@ -17,6 +17,8 @@
var int autocvar_cl_autoweaponswitch = TRUE;
vector g_hud_color;
vector g_hudmins;
vector g_hudres;
struct
{

16
src/client/valve/hud.c
View file

@ -141,7 +141,7 @@ HUD_DrawHealth(void)
pSeat->health_alpha = HUD_ALPHA;
}
pos = video_mins + [88, video_res[1] - 42];
pos = g_hudmins + [88, g_hudres[1] - 42];
if (pl.health > 25) {
drawsubpic(
pos + [-72,-4],
@ -178,7 +178,7 @@ HUD_DrawArmor(void)
vector pos;
player pl = (player)pSeat->ePlayer;
pos = video_mins + [198, video_res[1] - 42];
pos = g_hudmins + [198, g_hudres[1] - 42];
if (pl.armor != pSeat->armor_old) {
pSeat->armor_alpha = 1.0;
@ -237,7 +237,7 @@ HUD_DrawAmmo1(void)
pSeat->ammo1_alpha = HUD_ALPHA;
}
pos = video_mins + [video_res[0] - 152, video_res[1] - 42];
pos = g_hudmins + [g_hudres[0] - 152, g_hudres[1] - 42];
HUD_DrawNums(pl.a_ammo1, pos, pSeat->ammo1_alpha, g_hud_color);
HUD_DrawSeperator(pos + [30,0]);
}
@ -260,7 +260,7 @@ HUD_DrawAmmo2(void)
pSeat->ammo2_alpha = HUD_ALPHA;
}
pos = video_mins + [video_res[0] - 72, video_res[1] - 42];
pos = g_hudmins + [g_hudres[0] - 72, g_hudres[1] - 42];
HUD_DrawNums(pl.a_ammo2, pos, pSeat->ammo2_alpha, g_hud_color);
}
@ -282,7 +282,7 @@ HUD_DrawAmmo3(void)
pSeat->ammo3_alpha = HUD_ALPHA;
}
pos = video_mins + [video_res[0] - 72, video_res[1] - 74];
pos = g_hudmins + [g_hudres[0] - 72, g_hudres[1] - 74];
HUD_DrawNums(pl.a_ammo3, pos, pSeat->ammo3_alpha, g_hud_color);
}
@ -292,7 +292,7 @@ HUD_DrawFlashlight(void)
{
vector pos;
player pl = (player)pSeat->ePlayer;
pos = video_mins + [video_res[0] - 48, 16];
pos = g_hudmins + [g_hudres[0] - 48, 16];
/* both on, draw both sprites at full intensity */
if (pl.flags & FL_FLASHLIGHT) {
@ -340,7 +340,7 @@ HUD_DrawLogo(void)
static float frame_timer;
frame_timer -= clframetime;
pos = [video_res[0] - 262, 48];
pos = [g_hudres[0] - 262, 48];
drawpic(
pos,
@ -373,7 +373,7 @@ HUD_DrawNotify(void)
return;
}
pos = video_mins + [video_res[0] - 192, video_res[1] - 128];
pos = g_hudmins + [g_hudres[0] - 192, g_hudres[1] - 128];
Weapons_HUDPic(pSeat->pickup_weapon, 1, pos, pSeat->pickup_alpha);
pSeat->pickup_alpha -= frametime;
}

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

@ -166,14 +166,14 @@ void HUD_DrawWeaponSelect(void)
return;
}
vector vecPos = video_mins + [16,16];
vector vecPos = g_hudmins + [16,16];
int b;
int wantslot = g_weapons[pSeat->fHUDWeaponSelected].slot;
int wantpos = g_weapons[pSeat->fHUDWeaponSelected].slot_pos;
for (int i = 0; i < 5; i++) {
int slot_selected = 0;
vecPos[1] = video_mins[1] + 16;
vecPos[1] = g_hudmins[1] + 16;
HUD_DrawWeaponSelect_Num(vecPos, i);
vecPos[1] += 20;
for (int x = 0; x < 32; x++) {

11
src/client/view.c
View file

@ -69,6 +69,17 @@ View_CalcViewport(int s, float fWinWidth, float fWinHeight)
video_mins = [0, 0];
break;
}
/* generate usable hud variables */
if (autocvar_cl_hudaspect <= 0) {
g_hudmins = video_mins;
g_hudres = video_res;
} else {
g_hudmins = video_mins;
g_hudmins[0] += (video_res[0] / 2) - ((video_res[1] * autocvar_cl_hudaspect) / 2);
g_hudres[0] = video_res[1] * autocvar_cl_hudaspect;
g_hudres[1] = video_res[1];
}
}
void

42
src/server/gearbox/ammo_op4.cpp
View file

@ -14,10 +14,14 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/*
* Ammo for the M249.
* A single ammo_556 will provide 50 bullets.
*/
/*QUAKED ammo_556 (0 0 0.8) (-16 -16 0) (16 16 32)
HALF-LIFE: OPPOSING FORCE (1999) ENTITY
Ammo for the M249.
A single ammo_556 will provide 50 bullets.
*/
class ammo_556:item_ammo
{
void() ammo_556;
@ -42,10 +46,14 @@ ammo_556::touch(void)
}
}
/*
* Ammo for the M-40A1 Sniper.
* A single ammo_762 will provide 5 bullets.
*/
/*QUAKED ammo_762 (0 0 0.8) (-16 -16 0) (16 16 32)
HALF-LIFE: OPPOSING FORCE (1999) ENTITY
Ammo for the M-40A1 Sniper.
A single ammo_762 will provide 5 bullets.
*/
class ammo_762:item_ammo
{
void() ammo_762;
@ -70,14 +78,18 @@ ammo_762::touch(void)
}
}
/*
* Ammo for the Spore Launcher.
* A single ammo_spore will provide 1 spore.
* TODO
* It needs to be static (no pickup), and needs to
* fire a projectile upon inflicted damage.
*/
/*QUAKED ammo_spore (0 0 0.8) (-16 -16 0) (16 16 32)
HALF-LIFE: OPPOSING FORCE (1999) ENTITY
Ammo for the Spore Launcher.
A single ammo_spore will provide 1 spore.
TODO:
It needs to be static (no pickup), and needs to
fire a projectile upon inflicted damage.
*/
class ammo_spore:item_ammo
{
void() ammo_spore;

5
src/server/gearbox/monster_drillsergeant.cpp
View file

@ -16,9 +16,10 @@
/*QUAKED monster_drillsergeant (0 0.8 0.8) (-16 -16 0) (16 16 72)
Drill Sergeant
HALF-LIFE: OPPOSING FORCE (1999) ENTITY
Opposing Force Boot-Camp Training
Drill Sergeant
...from the Opposing Force Boot-Camp Training
*/

5
src/server/gearbox/monster_recruit.cpp
View file

@ -16,9 +16,10 @@
/*QUAKED monster_recruit (0 0.8 0.8) (-16 -16 0) (16 16 72)
Recruit
HALF-LIFE: OPPOSING FORCE (1999) ENTITY
Opposing Force Boot-Camp Training
Recruit
...from the Opposing Force Boot-Camp Training
*/

108
src/server/valve/ammo.cpp
View file

@ -67,10 +67,14 @@ void item_ammo::item_ammo(void)
item_ammo::Respawn();
}
/*
* Ammo for the .357 Magnum Revolver.
* A single ammo_357 will provide 6 bullets.
*/
/*QUAKED ammo_357 (0 0 0.8) (-16 -16 0) (16 16 32)
HALF-LIFE (1998) ENTITY
Ammo for the .357 Magnum Revolver.
A single ammo_357 will provide 6 bullets.
*/
class ammo_357:item_ammo
{
void() ammo_357;
@ -96,10 +100,14 @@ void ammo_357::touch(void)
}
}
/*
* Ammo for the 9mm Handgun and the 9mm AR.
* A single ammo_9mmAR will provide 50 bullets.
*/
/*QUAKED ammo_9mmAR (0 0 0.8) (-16 -16 0) (16 16 32)
HALF-LIFE (1998) ENTITY
Ammo for the 9mm Handgun and the 9mm AR.
A single ammo_9mmAR will provide 50 bullets.
*/
class ammo_9mmAR:item_ammo
{
void() ammo_9mmAR;
@ -126,10 +134,14 @@ void ammo_9mmAR::touch(void)
}
CLASSEXPORT(ammo_mp5clip, ammo_9mmAR)
/*
* Ammo for the 9mm Handgun and the 9mm AR.
* A single ammo_9mmbox will provide 200 bullets.
*/
/*QUAKED ammo_9mmbox (0 0 0.8) (-16 -16 0) (16 16 32)
HALF-LIFE (1998) ENTITY
Ammo for the 9mm Handgun and the 9mm AR.
A single ammo_9mmbox will provide 200 bullets.
*/
class ammo_9mmbox:item_ammo
{
void() ammo_9mmbox;
@ -155,10 +167,14 @@ void ammo_9mmbox::touch(void)
}
}
/*
* Ammo for the 9mm Handgun and the 9mm AR.
* A single ammo_9mmclip will provide 17 bullets.
*/
/*QUAKED ammo_9mmclip (0 0 0.8) (-16 -16 0) (16 16 32)
HALF-LIFE (1998) ENTITY
Ammo for the 9mm Handgun and the 9mm AR.
A single ammo_9mmclip will provide 17 bullets.
*/
class ammo_9mmclip:item_ammo
{
void() ammo_9mmclip;
@ -184,10 +200,14 @@ void ammo_9mmclip::touch(void)
}
}
/*
* Ammo for the 9mm AR's secondary fire.
* A single ammo_ARgrenades will provide 2 AR grenades.
*/
/*QUAKED ammo_ARgrenades (0 0 0.8) (-16 -16 0) (16 16 32)
HALF-LIFE (1998) ENTITY
Ammo for the 9mm AR's secondary fire.
A single ammo_ARgrenades will provide 2 AR grenades.
*/
class ammo_ARgrenades:item_ammo
{
void() ammo_ARgrenades;
@ -214,10 +234,14 @@ void ammo_ARgrenades::touch(void)
}
CLASSEXPORT(ammo_mp5grenades, ammo_ARgrenades)
/*
* Ammo for the Shotgun.
* A single ammo_buckshot will provide 12 shells.
*/
/*QUAKED ammo_buckshot (0 0 0.8) (-16 -16 0) (16 16 32)
HALF-LIFE (1998) ENTITY
Ammo for the Shotgun.
A single ammo_buckshot will provide 12 shells.
*/
class ammo_buckshot:item_ammo
{
void() ammo_buckshot;
@ -243,10 +267,14 @@ void ammo_buckshot::touch(void)
}
}
/*
* Ammo for the Crossbow.
* A single ammo_crossbow will provide 5 bolts.
*/
/*QUAKED ammo_crossbow (0 0 0.8) (-16 -16 0) (16 16 32)
HALF-LIFE (1998) ENTITY
Ammo for the Crossbow.
A single ammo_crossbow will provide 5 bolts.
*/
class ammo_crossbow:item_ammo
{
void() ammo_crossbow;
@ -272,10 +300,14 @@ void ammo_crossbow::touch(void)
}
}
/*
* Ammo for the Tau Cannon and the Gluon Gun.
* A single ammo_gaussclip will provide 20 cells.
*/
/*QUAKED ammo_gaussclip (0 0 0.8) (-16 -16 0) (16 16 32)
HALF-LIFE (1998) ENTITY
Ammo for the Tau Cannon and the Gluon Gun.
A single ammo_gaussclip will provide 20 cells.
*/
class ammo_gaussclip:item_ammo
{
void() ammo_gaussclip;
@ -300,10 +332,14 @@ void ammo_gaussclip::touch(void)
}
}
/*
* Ammo for the RPG.
* A single ammo_rpgclip will provide 1 rocket.
*/
/*QUAKED ammo_rpgclip (0 0 0.8) (-16 -16 0) (16 16 32)
HALF-LIFE (1998) ENTITY
Ammo for the RPG.
A single ammo_rpgclip will provide 1 rocket.
*/
class ammo_rpgclip:item_ammo
{
void() ammo_rpgclip;

2
src/server/valve/gamerules.c
View file

@ -110,7 +110,7 @@ Gamerules_Spawn(player pl)
if (cvar("sv_playerslots") == 1 || cvar("coop") == 1) {
if (startspot != "") {
print(sprintf("^3Gamerules_Spawn^7: Startspot is %s\n", startspot));
dprint(sprintf("^3Gamerules_Spawn^7: Startspot is %s\n", startspot));
Gamerules_DecodeChangeParms(pl);
setorigin(pl, Landmark_GetSpot());
} else {

10
src/server/valve/item_battery.cpp
View file

@ -14,6 +14,14 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/*QUAKED item_battery (0 0 0.8) (-16 -16 0) (16 16 36)
HALF-LIFE (1998) ENTITY
HEV Suit energy battery.
Adds 15 of armor/battery-power to the HEV Suit.
*/
class item_battery:CBaseEntity
{
void() item_battery;
@ -54,7 +62,7 @@ void item_battery::Respawn(void)
movetype = MOVETYPE_TOSS;
setmodel(this, m_oldModel);
setsize(this, [-16,-16,0], [16,16,16]);
setsize(this, [-16,-16,0], [16,16,36]);
setorigin(this, m_oldOrigin);
think = __NULL__;

10
src/server/valve/item_healthkit.cpp
View file

@ -14,6 +14,14 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/*QUAKED item_healthkit (0 0 0.8) (-16 -16 0) (16 16 36)
HALF-LIFE (1998) ENTITY
Healthkit item.
Adds 20 of health to the player.
*/
class item_healthkit:CBaseEntity
{
void() item_healthkit;
@ -50,7 +58,7 @@ void item_healthkit::Respawn(void)
setmodel(this, m_oldModel);
setsize(this, [-16,-16,0], [16,16,16]);
setsize(this, [-16,-16,0], [16,16,36]);
setorigin(this, m_oldOrigin);
think = __NULL__;

9
src/server/valve/item_longjump.cpp
View file

@ -14,6 +14,15 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/*QUAKED item_longjump (0 0 0.8) (-16 -16 0) (16 16 36)
HALF-LIFE (1998) ENTITY
Longjump module.
Allows the player to jump longer distance by holding crouch
and pressing jump.
*/
class item_longjump:CBaseTrigger
{
void() item_longjump;

8
src/server/valve/item_suit.cpp
View file

@ -14,6 +14,14 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/*QUAKED item_suit (0 0 0.8) (-16 -16 0) (16 16 36)
HALF-LIFE (1998) ENTITY
HEV Suit
Provides the player with armor, a flashlight and a Heads-Up-Display.
*/
class item_suit:CBaseTrigger
{
void() item_suit;

2
src/server/valve/monster_alien_controller.cpp
View file

@ -16,6 +16,8 @@
/*QUAKED monster_alien_controller (0 0.8 0.8) (-16 -16 0) (16 16 72)
HALF-LIFE (1998) ENTITY
Alien Controller
*/

2
src/server/valve/monster_alien_grunt.cpp
View file

@ -16,6 +16,8 @@
/*QUAKED monster_alien_grunt (0 0.8 0.8) (-32 -32 0) (32 32 64)
HALF-LIFE (1998) ENTITY
Alien Grunt
*/

2
src/server/valve/monster_alien_slave.cpp
View file

@ -16,6 +16,8 @@
/*QUAKED monster_alien_slave (0 0.8 0.8) (-16 -16 0) (16 16 72)
HALF-LIFE (1998) ENTITY
Alien Slave
*/

2
src/server/valve/monster_apache.cpp
View file

@ -16,6 +16,8 @@
/*QUAKED monster_apache (0 0.8 0.8) (-300 -300 -172) (300 300 8)
HALF-LIFE (1998) ENTITY
Boeing AH-64 Apache
*/

2
src/server/valve/monster_babycrab.cpp
View file

@ -16,6 +16,8 @@
/*QUAKED monster_babycrab (0 0.8 0.8) (-16 -16 0) (16 16 36)
HALF-LIFE (1998) ENTITY
Baby Headcrab
*/

2
src/server/valve/monster_barnacle.cpp
View file

@ -16,6 +16,8 @@
/*QUAKED monster_barnacle (0 0.8 0.8) (-16 -16 -36) (16 16 0)
HALF-LIFE (1998) ENTITY
Barnacle
*/

2
src/server/valve/monster_barney.cpp
View file

@ -16,6 +16,8 @@
/*QUAKED monster_barney (0 0.8 0.8) (-16 -16 0) (16 16 72)
HALF-LIFE (1998) ENTITY
Barney Calhoun
*/

2
src/server/valve/monster_barney_dead.cpp
View file

@ -16,6 +16,8 @@
/*QUAKED monster_barney_dead (0 0.8 0.8) (-16 -16 0) (16 16 72)
HALF-LIFE (1998) ENTITY
Barney's corpse
*/

2
src/server/valve/monster_bigmomma.cpp
View file

@ -16,6 +16,8 @@
/*QUAKED monster_bigmomma (0 0.8 0.8) (-95 -95 0) (95 95 190)
HALF-LIFE (1998) ENTITY
Gonarch
*/

2
src/server/valve/monster_bloater.cpp
View file

@ -16,6 +16,8 @@
/*QUAKED monster_bloater (0 0.8 0.8) (-16 -16 0) (16 16 72)
HALF-LIFE (1998) ENTITY
Flocking Floater
*/

2
src/server/valve/monster_bullchicken.cpp
View file

@ -16,6 +16,8 @@
/*QUAKED monster_bullchicken (0 0.8 0.8) (-32 -32 0) (32 32 64)
HALF-LIFE (1998) ENTITY
Bullsquid
*/

2
src/server/valve/monster_cockroach.cpp
View file

@ -16,6 +16,8 @@
/*QUAKED monster_cockroach (0 0.8 0.8) (-4 -4 0) (4 4 4)
HALF-LIFE (1998) ENTITY
Cockroach
*/

2
src/server/valve/monster_flyer_flock.cpp
View file

@ -16,6 +16,8 @@
/*QUAKED monster_flyer_flock (0 0.8 0.8) (-16 -16 0) (16 16 16)
HALF-LIFE (1998) ENTITY
Boid
*/

2
src/server/valve/monster_gargantua.cpp
View file

@ -16,6 +16,8 @@
/*QUAKED monster_gargantua (0 0.8 0.8) (-32 -32 0) (32 32 128)
HALF-LIFE (1998) ENTITY
Gargantua
*/

2
src/server/valve/monster_gman.cpp
View file

@ -16,6 +16,8 @@
/*QUAKED monster_gman (0 0.8 0.8) (-16 -16 0) (16 16 72)
HALF-LIFE (1998) ENTITY
G-Man
*/

2
src/server/valve/monster_headcrab.cpp
View file

@ -16,6 +16,8 @@
/*QUAKED monster_headcrab (0 0.8 0.8) (-16 -16 0) (16 16 36)
HALF-LIFE (1998) ENTITY
Headcrab
*/

2
src/server/valve/monster_hevsuit_dead.cpp
View file

@ -16,6 +16,8 @@
/*QUAKED monster_hevsuit_dead (0 0.8 0.8) (-16 -16 0) (16 16 72)
HALF-LIFE (1998) ENTITY
HEV-Suit/Player's corpse
*/

2
src/server/valve/monster_hgrunt_dead.cpp
View file

@ -16,6 +16,8 @@
/*QUAKED monster_hgrunt_dead (0 0.8 0.8) (-16 -16 0) (16 16 72)
HALF-LIFE (1998) ENTITY
Human Grunt's corpse
*/

2
src/server/valve/monster_houndeye.cpp
View file

@ -16,6 +16,8 @@
/*QUAKED monster_houndeye (0 0.8 0.8) (-16 -16 0) (16 16 36)
HALF-LIFE (1998) ENTITY
Houndeye
*/

2
src/server/valve/monster_human_assassin.cpp
View file

@ -16,6 +16,8 @@
/*QUAKED monster_human_assassin (0 0.8 0.8) (-16 -16 0) (16 16 72)
HALF-LIFE (1998) ENTITY
Black Ops - Assassin
*/

2
src/server/valve/monster_human_grunt.cpp
View file

@ -16,6 +16,8 @@
/*QUAKED monster_human_grunt (0 0.8 0.8) (-16 -16 0) (16 16 72)
HALF-LIFE (1998) ENTITY
HECU - Human Grunt
*/

2
src/server/valve/monster_ichthyosaur.cpp
View file

@ -16,6 +16,8 @@
/*QUAKED monster_ichthyosaur (0 0.8 0.8) (-32 -32 0) (32 32 64)
HALF-LIFE (1998) ENTITY
Ichthyosaur
*/

2
src/server/valve/monster_leech.cpp
View file

@ -16,6 +16,8 @@
/*QUAKED monster_leech (0 0.8 0.8) (-6 -6 0) (6 6 6)
HALF-LIFE (1998) ENTITY
Leech
*/

2
src/server/valve/monster_miniturret.cpp
View file

@ -16,6 +16,8 @@
/*QUAKED monster_miniturret (0 0.8 0.8) (-16 -16 -32) (16 16 32)
HALF-LIFE (1998) ENTITY
Automatic Turret (small)
*/

2
src/server/valve/monster_nihilanth.cpp
View file

@ -16,6 +16,8 @@
/*QUAKED monster_nihilanth (0 0.8 0.8) (-192 -192 0) (192 192 384)
HALF-LIFE (1998) ENTITY
Nihilanth
*/

2
src/server/valve/monster_osprey.cpp
View file

@ -16,6 +16,8 @@
/*QUAKED monster_osprey (0 0.8 0.8) (-480 -480 -112) (480 480 24)
HALF-LIFE (1998) ENTITY
Bell Boeing VV-22 Osprey
*/

2
src/server/valve/monster_rat.cpp
View file

@ -16,6 +16,8 @@
/*QUAKED monster_rat (0 0.8 0.8) (-6 -6 0) (6 6 6)
HALF-LIFE (1998) ENTITY
Rat
*/

2
src/server/valve/monster_scientist.cpp
View file

@ -16,6 +16,8 @@
/*QUAKED monster_scientist (0 0.8 0.8) (-16 -16 0) (16 16 72)
HALF-LIFE (1998) ENTITY
Scientist
*/

2
src/server/valve/monster_scientist_dead.cpp
View file

@ -16,6 +16,8 @@
/*QUAKED monster_scientist_dead (0 0.8 0.8) (-16 -16 0) (16 16 72)
HALF-LIFE (1998) ENTITY
Scientists' corpse
*/

2
src/server/valve/monster_sentry.cpp
View file

@ -16,6 +16,8 @@
/*QUAKED monster_sentry (0 0.8 0.8) (-16 -16 0) (16 16 72)
HALF-LIFE (1998) ENTITY
Sentry Gun
*/

2
src/server/valve/monster_sitting_scientist.cpp
View file

@ -16,6 +16,8 @@
/*QUAKED monster_sitting_scientist (0 0.8 0.8) (-14 -14 0) (14 14 36)
HALF-LIFE (1998) ENTITY
Sitting scientists
*/

2
src/server/valve/monster_tentacle.cpp
View file

@ -16,6 +16,8 @@
/*QUAKED monster_tentacle (0 0.8 0.8) (-32 -32 0) (32 32 64)
HALF-LIFE (1998) ENTITY
Tentacle
*/

2
src/server/valve/monster_turret.cpp
View file

@ -16,6 +16,8 @@
/*QUAKED monster_turret (0 0.8 0.8) (-16 -16 0) (16 16 72)
HALF-LIFE (1998) ENTITY
Automatic Turret (large)
*/

2
src/server/valve/monster_zombie.cpp
View file

@ -16,6 +16,8 @@
/*QUAKED monster_zombie (0 0.8 0.8) (-16 -16 0) (16 16 72)
HALF-LIFE (1998) ENTITY
Zombie
*/

7
src/server/valve/xen_hair.cpp
View file

@ -14,6 +14,13 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/*QUAKED xen_hair (0 0.8 0.8) (-16 -16 0) (16 16 72)
HALF-LIFE (1998) ENTITY
Xen Hair
*/
class xen_hair:CBaseEntity
{
void() xen_hair;

7
src/server/valve/xen_plantlight.cpp
View file

@ -14,6 +14,13 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/*QUAKED xen_plantlight (0 0.8 0.8) (-16 -16 0) (16 16 72)
HALF-LIFE (1998) ENTITY
Xen Plant Light
*/
class xen_plantlight:CBaseEntity
{
void() xen_plantlight;

7
src/server/valve/xen_spore_large.cpp
View file

@ -14,6 +14,13 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/*QUAKED xen_spore_large (0 0.8 0.8) (-16 -16 0) (16 16 72)
HALF-LIFE (1998) ENTITY
Large Xen Spore
*/
class xen_spore_large:CBaseEntity
{
void() xen_spore_large;

7
src/server/valve/xen_spore_medium.cpp
View file

@ -14,6 +14,13 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/*QUAKED xen_spore_medium (0 0.8 0.8) (-16 -16 0) (16 16 72)
HALF-LIFE (1998) ENTITY
Medium Xen Spore
*/
class xen_spore_medium:CBaseEntity
{
void() xen_spore_medium;

7
src/server/valve/xen_spore_small.cpp
View file

@ -14,6 +14,13 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/*QUAKED xen_spore_small (0 0.8 0.8) (-16 -16 0) (16 16 72)
HALF-LIFE (1998) ENTITY
Small Xen Spore
*/
class xen_spore_small:CBaseEntity
{
void() xen_spore_small;

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

@ -183,7 +183,7 @@ w_ak47_hud(void)
HUD_DrawAmmo1();
HUD_DrawAmmo2();
vector aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
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/128], [24/256, 24/128], g_hud_color, pSeat->ammo2_alpha, DRAWFLAG_ADDITIVE);
#endif
}

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

@ -183,7 +183,7 @@ w_aug_hud(void)
HUD_DrawAmmo1();
HUD_DrawAmmo2();
vector aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
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/128], [24/256, 24/128], g_hud_color, pSeat->ammo2_alpha, DRAWFLAG_ADDITIVE);
#endif
}

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

@ -183,7 +183,7 @@ w_awp_hud(void)
HUD_DrawAmmo1();
HUD_DrawAmmo2();
vector aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
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/128], [24/256, 24/128], g_hud_color, pSeat->ammo2_alpha, DRAWFLAG_ADDITIVE);
#endif
}

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

@ -185,7 +185,7 @@ w_deagle_hud(void)
HUD_DrawAmmo1();
HUD_DrawAmmo2();
vector aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
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/128], [24/256, 24/128], g_hud_color, pSeat->ammo2_alpha, DRAWFLAG_ADDITIVE);
#endif
}

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

@ -185,7 +185,7 @@ w_elites_hud(void)
HUD_DrawAmmo1();
HUD_DrawAmmo2();
vector aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
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/128], [24/256, 24/128], g_hud_color, pSeat->ammo2_alpha, DRAWFLAG_ADDITIVE);
#endif
}

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

@ -185,7 +185,7 @@ w_fiveseven_hud(void)
HUD_DrawAmmo1();
HUD_DrawAmmo2();
vector aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
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/128], [24/256, 24/128], g_hud_color, pSeat->ammo2_alpha, DRAWFLAG_ADDITIVE);
#endif
}

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

@ -183,7 +183,7 @@ w_g3sg1_hud(void)
HUD_DrawAmmo1();
HUD_DrawAmmo2();
vector aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
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/128], [24/256, 24/128], g_hud_color, pSeat->ammo2_alpha, DRAWFLAG_ADDITIVE);
#endif
}

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

@ -185,7 +185,7 @@ w_glock18_hud(void)
HUD_DrawAmmo1();
HUD_DrawAmmo2();
vector aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
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/128], [24/256, 24/128], g_hud_color, pSeat->ammo2_alpha, DRAWFLAG_ADDITIVE);
#endif
}

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

@ -183,7 +183,7 @@ w_m3_hud(void)
HUD_DrawAmmo1();
HUD_DrawAmmo2();
vector aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
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/128], [24/256, 24/128], g_hud_color, pSeat->ammo2_alpha, DRAWFLAG_ADDITIVE);
#endif
}

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

@ -183,7 +183,7 @@ w_m4a1_hud(void)
HUD_DrawAmmo1();
HUD_DrawAmmo2();
vector aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
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/128], [24/256, 24/128], g_hud_color, pSeat->ammo2_alpha, DRAWFLAG_ADDITIVE);
#endif
}

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

@ -183,7 +183,7 @@ w_mac10_hud(void)
HUD_DrawAmmo1();
HUD_DrawAmmo2();
vector aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
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/128], [24/256, 24/128], g_hud_color, pSeat->ammo2_alpha, DRAWFLAG_ADDITIVE);
#endif
}

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

@ -183,7 +183,7 @@ w_mp5_hud(void)
HUD_DrawAmmo1();
HUD_DrawAmmo2();
vector aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
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/128], [24/256, 24/128], g_hud_color, pSeat->ammo2_alpha, DRAWFLAG_ADDITIVE);
#endif
}

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

@ -185,7 +185,7 @@ w_p228_hud(void)
HUD_DrawAmmo1();
HUD_DrawAmmo2();
vector aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
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/128], [24/256, 24/128], g_hud_color, pSeat->ammo2_alpha, DRAWFLAG_ADDITIVE);
#endif
}

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

@ -183,7 +183,7 @@ w_p90_hud(void)
HUD_DrawAmmo1();
HUD_DrawAmmo2();
vector aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
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/128], [24/256, 24/128], g_hud_color, pSeat->ammo2_alpha, DRAWFLAG_ADDITIVE);
#endif
}

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

@ -183,7 +183,7 @@ w_para_hud(void)
HUD_DrawAmmo1();
HUD_DrawAmmo2();
vector aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
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/128], [24/256, 24/128], g_hud_color, pSeat->ammo2_alpha, DRAWFLAG_ADDITIVE);
#endif
}

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

@ -183,7 +183,7 @@ w_scout_hud(void)
HUD_DrawAmmo1();
HUD_DrawAmmo2();
vector aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
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/128], [24/256, 24/128], g_hud_color, pSeat->ammo2_alpha, DRAWFLAG_ADDITIVE);
#endif
}

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

@ -183,7 +183,7 @@ w_sg550_hud(void)
HUD_DrawAmmo1();
HUD_DrawAmmo2();
vector aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
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/128], [24/256, 24/128], g_hud_color, pSeat->ammo2_alpha, DRAWFLAG_ADDITIVE);
#endif
}

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

@ -183,7 +183,7 @@ w_sg552_hud(void)
HUD_DrawAmmo1();
HUD_DrawAmmo2();
vector aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
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/128], [24/256, 24/128], g_hud_color, pSeat->ammo2_alpha, DRAWFLAG_ADDITIVE);
#endif
}

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

@ -183,7 +183,7 @@ w_tmp_hud(void)
HUD_DrawAmmo1();
HUD_DrawAmmo2();
vector aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
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/128], [24/256, 24/128], g_hud_color, pSeat->ammo2_alpha, DRAWFLAG_ADDITIVE);
#endif
}

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

@ -183,7 +183,7 @@ w_ump45_hud(void)
HUD_DrawAmmo1();
HUD_DrawAmmo2();
vector aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
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/128], [24/256, 24/128], g_hud_color, pSeat->ammo2_alpha, DRAWFLAG_ADDITIVE);
#endif
}

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

@ -185,7 +185,7 @@ w_usp45_hud(void)
HUD_DrawAmmo1();
HUD_DrawAmmo2();
vector aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
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/128], [24/256, 24/128], g_hud_color, pSeat->ammo2_alpha, DRAWFLAG_ADDITIVE);
#endif
}

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

@ -183,7 +183,7 @@ w_xm1014_hud(void)
HUD_DrawAmmo1();
HUD_DrawAmmo2();
vector aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
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/128], [24/256, 24/128], g_hud_color, pSeat->ammo2_alpha, DRAWFLAG_ADDITIVE);
#endif
}

4
src/shared/gearbox/w_displacer.c
View file

@ -286,8 +286,8 @@ w_displacer_hud(void)
vector cross_pos;
vector aicon_pos;
cross_pos = (video_res / 2) + [-12,-12];
aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
cross_pos = (g_hudres / 2) + [-12,-12];
aicon_pos = g_hudmins + [g_hudres[0] - 48, g_hudres[1] - 42];
drawsubpic(
cross_pos,

6
src/shared/gearbox/w_eagle.c
View file

@ -274,7 +274,7 @@ w_eagle_crosshair(void)
lerp = Math_Lerp(18,6, trace_fraction);
jitter[0] = (random(0,2) - 2) * (1 - trace_fraction);
jitter[1] = (random(0,2) - 2) * (1 - trace_fraction);
cross_pos = (video_res / 2) + ([-lerp,-lerp] / 2);
cross_pos = (g_hudres / 2) + ([-lerp,-lerp] / 2);
drawsubpic(
cross_pos + jitter,
[lerp,lerp],
@ -286,7 +286,7 @@ w_eagle_crosshair(void)
DRAWFLAG_ADDITIVE
);
} else {
cross_pos = (video_res / 2) + [-12,-12];
cross_pos = (g_hudres / 2) + [-12,-12];
drawsubpic(
cross_pos,
[24,24],
@ -304,7 +304,7 @@ w_eagle_crosshair(void)
HUD_DrawAmmo2();
/* ammo icon */
aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
aicon_pos = g_hudmins + [g_hudres[0] - 48, g_hudres[1] - 42];
drawsubpic(
aicon_pos,
[24,24],

4
src/shared/gearbox/w_m249.c
View file

@ -224,7 +224,7 @@ w_m249_crosshair(void)
vector aicon_pos;
/* crosshair */
cross_pos = (video_res / 2) + [-12,-12];
cross_pos = (g_hudres / 2) + [-12,-12];
drawsubpic(
cross_pos,
[24,24],
@ -241,7 +241,7 @@ w_m249_crosshair(void)
HUD_DrawAmmo2();
/* ammo icon */
aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
aicon_pos = g_hudmins + [g_hudres[0] - 48, g_hudres[1] - 42];
drawsubpic(
aicon_pos,
[24,24],

2
src/shared/gearbox/w_penguin.c
View file

@ -306,7 +306,7 @@ w_penguin_hud(void)
{
#ifdef CSQC
HUD_DrawAmmo2();
vector aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
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,72/128], [24/256, 24/128], g_hud_color, pSeat->ammo2_alpha, DRAWFLAG_ADDITIVE);
#endif
}

4
src/shared/gearbox/w_shockrifle.c
View file

@ -218,7 +218,7 @@ w_shockrifle_crosshair(void)
vector aicon_pos;
/* crosshair */
cross_pos = (video_res / 2) + [-12,-12];
cross_pos = (g_hudres / 2) + [-12,-12];
drawsubpic(
cross_pos,
[24,24],
@ -234,7 +234,7 @@ w_shockrifle_crosshair(void)
HUD_DrawAmmo2();
/* ammo icon */
aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
aicon_pos = g_hudmins + [g_hudres[0] - 48, g_hudres[1] - 42];
drawsubpic(
aicon_pos,
[24,24],

6
src/shared/gearbox/w_sniperrifle.c
View file

@ -216,7 +216,7 @@ w_sniperrifle_crosshair(void)
static vector cross_pos;
if (pl.viewzoom == 1.0f) {
cross_pos = video_mins + (video_res / 2) + [-12,-12];
cross_pos = g_hudmins + (g_hudres / 2) + [-12,-12];
drawsubpic(
cross_pos,
[24,24],
@ -228,7 +228,7 @@ w_sniperrifle_crosshair(void)
DRAWFLAG_NORMAL
);
} else {
cross_pos = video_mins + (video_res / 2) + [-128,-128];
cross_pos = g_hudmins + (g_hudres / 2) + [-128,-128];
drawsubpic(
cross_pos,
[256,256],
@ -244,7 +244,7 @@ w_sniperrifle_crosshair(void)
HUD_DrawAmmo1();
HUD_DrawAmmo2();
vector aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
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/128], [24/256, 24/128], g_hud_color, pSeat->ammo2_alpha, DRAWFLAG_ADDITIVE);
#endif
}

4
src/shared/gearbox/w_sporelauncher.c
View file

@ -276,7 +276,7 @@ w_sporelauncher_crosshair(void)
vector aicon_pos;
/* crosshair */
cross_pos = (video_res / 2) + [-12,-12];
cross_pos = (g_hudres / 2) + [-12,-12];
drawsubpic(
cross_pos,
[24,24],
@ -293,7 +293,7 @@ w_sporelauncher_crosshair(void)
HUD_DrawAmmo2();
/* ammo icon */
aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
aicon_pos = g_hudmins + [g_hudres[0] - 48, g_hudres[1] - 42];
drawsubpic(
aicon_pos,
[24,24],

4
src/shared/hunger/w_ap9.c
View file

@ -262,8 +262,8 @@ w_ap9_hud(void)
vector cross_pos;
vector aicon_pos;
cross_pos = (video_res / 2) + [-12,-12];
aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
cross_pos = (g_hudres / 2) + [-12,-12];
aicon_pos = g_hudmins + [g_hudres[0] - 48, g_hudres[1] - 42];
drawsubpic(
cross_pos,

4
src/shared/hunger/w_chaingun.c
View file

@ -229,7 +229,7 @@ w_chaingun_hud(void)
#ifdef CSQC
/* crosshair */
drawsubpic(
video_mins + (video_res / 2) + [-12,-12],
g_hudmins + (g_hudres / 2) + [-12,-12],
[24,24],
"sprites/crosshairs.spr_0.tga",
[24/128,0],
@ -241,7 +241,7 @@ w_chaingun_hud(void)
/* ammo icon */
drawsubpic(
video_mins + [video_res[0] - 48, video_res[1] - 42],
g_hudmins + [g_hudres[0] - 48, g_hudres[1] - 42],
[24,24],
"sprites/640hud7.spr_0.tga",
[0,72/128],

4
src/shared/hunger/w_flame.c
View file

@ -191,10 +191,10 @@ w_flame_crosshair(void)
{
#ifdef CSQC
static vector cross_pos;
cross_pos = video_mins + (video_res / 2) + [-12,-12];
cross_pos = g_hudmins + (g_hudres / 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];
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/128], [24/256, 24/128], g_hud_color, pSeat->ammo2_alpha, DRAWFLAG_ADDITIVE);
#endif
}

4
src/shared/hunger/w_glock.c
View file

@ -269,7 +269,7 @@ w_glock_hud(void)
{
#ifdef CSQC
static vector cross_pos;
cross_pos = (video_res / 2) + [-12,-12];
cross_pos = (g_hudres / 2) + [-12,-12];
drawsubpic(
cross_pos,
[24,24],
@ -281,7 +281,7 @@ w_glock_hud(void)
HUD_DrawAmmo1();
HUD_DrawAmmo2();
vector aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
vector aicon_pos = g_hudmins + [g_hudres[0] - 48, g_hudres[1] - 42];
drawsubpic(
aicon_pos,
[24,24],

2
src/shared/hunger/w_handgrenade.c
View file

@ -177,7 +177,7 @@ void w_handgrenade_hud(void)
{
#ifdef CSQC
HUD_DrawAmmo2();
vector aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
vector aicon_pos = g_hudmins + [g_hudres[0] - 48, g_hudres[1] - 42];
drawsubpic(aicon_pos, [16,24], "sprites/640hud7.spr_0.tga", [48/256,96/128], [24/256, 24/128], g_hud_color, pSeat->ammo2_alpha, DRAWFLAG_ADDITIVE);
#endif
}

2
src/shared/hunger/w_medkit.c
View file

@ -161,7 +161,7 @@ w_medkit_crosshair(void)
#ifdef CSQC
vector aicon_pos;
aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
aicon_pos = g_hudmins + [g_hudres[0] - 48, g_hudres[1] - 42];
HUD_DrawAmmo2();

10
src/shared/hunger/w_sniper.c
View file

@ -236,13 +236,13 @@ w_sniper_crosshair(void)
if (pl.viewzoom < 1.0f) {
drawfill(
video_mins,
video_res,
g_hudmins,
g_hudres,
[0,0.2,0],
1.0f,
DRAWFLAG_ADDITIVE
);
cross_pos = video_mins + (video_res / 2) + [-128,-104];
cross_pos = g_hudmins + (g_hudres / 2) + [-128,-104];
drawpic(
cross_pos,
"sprites/nmxhair2.spr_0.tga",
@ -253,7 +253,7 @@ w_sniper_crosshair(void)
);
} else {
cross_pos = video_mins + (video_res / 2) + [-12,-12];
cross_pos = g_hudmins + (g_hudres / 2) + [-12,-12];
drawsubpic(
cross_pos,
[24,24],
@ -269,7 +269,7 @@ w_sniper_crosshair(void)
HUD_DrawAmmo1();
HUD_DrawAmmo2();
aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
aicon_pos = g_hudmins + [g_hudres[0] - 48, g_hudres[1] - 42];
drawsubpic(
aicon_pos,
[24,24],

10
src/shared/hunger/w_sniper2.c
View file

@ -219,13 +219,13 @@ w_sniper2_crosshair(void)
if (pl.viewzoom < 1.0f) {
drawfill(
video_mins,
video_res,
g_hudmins,
g_hudres,
[0.2,0,0],
1.0f,
DRAWFLAG_ADDITIVE
);
cross_pos = video_mins + (video_res / 2) + [-128,-104];
cross_pos = g_hudmins + (g_hudres / 2) + [-128,-104];
drawpic(
cross_pos,
"sprites/nmxhair2.spr_0.tga",
@ -236,7 +236,7 @@ w_sniper2_crosshair(void)
);
} else {
cross_pos = video_mins + (video_res / 2) + [-12,-12];
cross_pos = g_hudmins + (g_hudres / 2) + [-12,-12];
drawsubpic(
cross_pos,
[24,24],
@ -252,7 +252,7 @@ w_sniper2_crosshair(void)
HUD_DrawAmmo1();
HUD_DrawAmmo2();
aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
aicon_pos = g_hudmins + [g_hudres[0] - 48, g_hudres[1] - 42];
drawsubpic(
aicon_pos,
[24,24],

4
src/shared/hunger/w_taurus.c
View file

@ -229,8 +229,8 @@ w_taurus_hud(void)
vector cross_pos;
vector aicon_pos;
cross_pos = video_mins + (video_res / 2) + [-12,-12];
aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
cross_pos = g_hudmins + (g_hudres / 2) + [-12,-12];
aicon_pos = g_hudmins + [g_hudres[0] - 48, g_hudres[1] - 42];
drawsubpic(
cross_pos,

2
src/shared/poke646/w_pipebomb.c
View file

@ -234,7 +234,7 @@ w_pipebomb_hud(void)
{
#ifdef CSQC
HUD_DrawAmmo2();
vector aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 42];
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/128], [24/256, 24/128], g_hud_color, pSeat->ammo2_alpha, DRAWFLAG_ADDITIVE);
#endif
}

Some files were not shown because too many files have changed in this diff Show more