From af53ab36ef9b8a5851ad573d98c5b735121ef00e Mon Sep 17 00:00:00 2001 From: Marco Hladik Date: Wed, 1 Apr 2020 18:43:09 +0200 Subject: [PATCH] Improved entity documentation, added cl_hudaspect variable so that you can control how close the elements are to the center of the screen. --- src/client/chat.c | 8 +- src/client/cstrike/hud.c | 16 +-- src/client/cstrike/hud_weaponselect.c | 4 +- src/client/defs.h | 1 + src/client/gearbox/hud_weaponselect.c | 4 +- src/client/obituary.c | 4 +- src/client/rewolf/hud.c | 14 +-- src/client/rewolf/hud_weaponselect.c | 4 +- src/client/text.c | 8 +- src/client/valve/defs.h | 2 + src/client/valve/hud.c | 16 +-- src/client/valve/hud_weaponselect.c | 4 +- src/client/view.c | 11 ++ src/server/gearbox/ammo_op4.cpp | 42 ++++--- src/server/gearbox/monster_drillsergeant.cpp | 5 +- src/server/gearbox/monster_recruit.cpp | 5 +- src/server/valve/ammo.cpp | 108 ++++++++++++------ src/server/valve/gamerules.c | 2 +- src/server/valve/item_battery.cpp | 10 +- src/server/valve/item_healthkit.cpp | 10 +- src/server/valve/item_longjump.cpp | 9 ++ src/server/valve/item_suit.cpp | 8 ++ src/server/valve/monster_alien_controller.cpp | 2 + src/server/valve/monster_alien_grunt.cpp | 2 + src/server/valve/monster_alien_slave.cpp | 2 + src/server/valve/monster_apache.cpp | 2 + src/server/valve/monster_babycrab.cpp | 2 + src/server/valve/monster_barnacle.cpp | 2 + src/server/valve/monster_barney.cpp | 2 + src/server/valve/monster_barney_dead.cpp | 2 + src/server/valve/monster_bigmomma.cpp | 2 + src/server/valve/monster_bloater.cpp | 2 + src/server/valve/monster_bullchicken.cpp | 2 + src/server/valve/monster_cockroach.cpp | 2 + src/server/valve/monster_flyer_flock.cpp | 2 + src/server/valve/monster_gargantua.cpp | 2 + src/server/valve/monster_gman.cpp | 2 + src/server/valve/monster_headcrab.cpp | 2 + src/server/valve/monster_hevsuit_dead.cpp | 2 + src/server/valve/monster_hgrunt_dead.cpp | 2 + src/server/valve/monster_houndeye.cpp | 2 + src/server/valve/monster_human_assassin.cpp | 2 + src/server/valve/monster_human_grunt.cpp | 2 + src/server/valve/monster_ichthyosaur.cpp | 2 + src/server/valve/monster_leech.cpp | 2 + src/server/valve/monster_miniturret.cpp | 2 + src/server/valve/monster_nihilanth.cpp | 2 + src/server/valve/monster_osprey.cpp | 2 + src/server/valve/monster_rat.cpp | 2 + src/server/valve/monster_scientist.cpp | 2 + src/server/valve/monster_scientist_dead.cpp | 2 + src/server/valve/monster_sentry.cpp | 2 + .../valve/monster_sitting_scientist.cpp | 2 + src/server/valve/monster_tentacle.cpp | 2 + src/server/valve/monster_turret.cpp | 2 + src/server/valve/monster_zombie.cpp | 2 + src/server/valve/xen_hair.cpp | 7 ++ src/server/valve/xen_plantlight.cpp | 7 ++ src/server/valve/xen_spore_large.cpp | 7 ++ src/server/valve/xen_spore_medium.cpp | 7 ++ src/server/valve/xen_spore_small.cpp | 7 ++ src/shared/cstrike/w_ak47.c | 2 +- src/shared/cstrike/w_aug.c | 2 +- src/shared/cstrike/w_awp.c | 2 +- src/shared/cstrike/w_deagle.c | 2 +- src/shared/cstrike/w_elites.c | 2 +- src/shared/cstrike/w_fiveseven.c | 2 +- src/shared/cstrike/w_g3sg1.c | 2 +- src/shared/cstrike/w_glock18.c | 2 +- src/shared/cstrike/w_m3.c | 2 +- src/shared/cstrike/w_m4a1.c | 2 +- src/shared/cstrike/w_mac10.c | 2 +- src/shared/cstrike/w_mp5.c | 2 +- src/shared/cstrike/w_p228.c | 2 +- src/shared/cstrike/w_p90.c | 2 +- src/shared/cstrike/w_para.c | 2 +- src/shared/cstrike/w_scout.c | 2 +- src/shared/cstrike/w_sg550.c | 2 +- src/shared/cstrike/w_sg552.c | 2 +- src/shared/cstrike/w_tmp.c | 2 +- src/shared/cstrike/w_ump45.c | 2 +- src/shared/cstrike/w_usp45.c | 2 +- src/shared/cstrike/w_xm1014.c | 2 +- src/shared/gearbox/w_displacer.c | 4 +- src/shared/gearbox/w_eagle.c | 6 +- src/shared/gearbox/w_m249.c | 4 +- src/shared/gearbox/w_penguin.c | 2 +- src/shared/gearbox/w_shockrifle.c | 4 +- src/shared/gearbox/w_sniperrifle.c | 6 +- src/shared/gearbox/w_sporelauncher.c | 4 +- src/shared/hunger/w_ap9.c | 4 +- src/shared/hunger/w_chaingun.c | 4 +- src/shared/hunger/w_flame.c | 4 +- src/shared/hunger/w_glock.c | 4 +- src/shared/hunger/w_handgrenade.c | 2 +- src/shared/hunger/w_medkit.c | 2 +- src/shared/hunger/w_sniper.c | 10 +- src/shared/hunger/w_sniper2.c | 10 +- src/shared/hunger/w_taurus.c | 4 +- src/shared/poke646/w_pipebomb.c | 2 +- src/shared/poke646/w_shotgun.c | 4 +- src/shared/rewolf/w_beamgun.c | 4 +- src/shared/rewolf/w_chemicalgun.c | 4 +- src/shared/rewolf/w_dml.c | 6 +- src/shared/rewolf/w_gausspistol.c | 6 +- src/shared/rewolf/w_grenade.c | 2 +- src/shared/rewolf/w_minigun.c | 4 +- src/shared/rewolf/w_shotgun.c | 6 +- src/shared/scihunt/w_cannon.c | 4 +- src/shared/tfc/w_dbs.c | 4 +- src/shared/tfc/w_sbs.c | 4 +- src/shared/valve/animations.c | 6 +- src/shared/valve/w_crossbow.c | 4 +- src/shared/valve/w_egon.c | 4 +- src/shared/valve/w_gauss.c | 4 +- src/shared/valve/w_glock.c | 4 +- src/shared/valve/w_handgrenade.c | 2 +- src/shared/valve/w_hornetgun.c | 4 +- src/shared/valve/w_mp5.c | 6 +- src/shared/valve/w_python.c | 4 +- src/shared/valve/w_rpg.c | 6 +- src/shared/valve/w_satchel.c | 2 +- src/shared/valve/w_shotgun.c | 4 +- src/shared/valve/w_snark.c | 2 +- src/shared/valve/w_tripmine.c | 2 +- 125 files changed, 410 insertions(+), 210 deletions(-) diff --git a/src/client/chat.c b/src/client/chat.c index 31ce72cd..9c5e17fa 100644 --- a/src/client/chat.c +++ b/src/client/chat.c @@ -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; diff --git a/src/client/cstrike/hud.c b/src/client/cstrike/hud.c index 52a0cd60..f1696531 100644 --- a/src/client/cstrike/hud.c +++ b/src/client/cstrike/hud.c @@ -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; } diff --git a/src/client/cstrike/hud_weaponselect.c b/src/client/cstrike/hud_weaponselect.c index 6e89ae47..8800e722 100644 --- a/src/client/cstrike/hud_weaponselect.c +++ b/src/client/cstrike/hud_weaponselect.c @@ -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++) { diff --git a/src/client/defs.h b/src/client/defs.h index d8d6566f..39aee21a 100644 --- a/src/client/defs.h +++ b/src/client/defs.h @@ -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; diff --git a/src/client/gearbox/hud_weaponselect.c b/src/client/gearbox/hud_weaponselect.c index 89ea3d4d..d9af1ff3 100644 --- a/src/client/gearbox/hud_weaponselect.c +++ b/src/client/gearbox/hud_weaponselect.c @@ -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++) { diff --git a/src/client/obituary.c b/src/client/obituary.c index 1e72da63..c573e988 100644 --- a/src/client/obituary.c +++ b/src/client/obituary.c @@ -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++) { diff --git a/src/client/rewolf/hud.c b/src/client/rewolf/hud.c index 481e71b2..33eec70c 100644 --- a/src/client/rewolf/hud.c +++ b/src/client/rewolf/hud.c @@ -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) { diff --git a/src/client/rewolf/hud_weaponselect.c b/src/client/rewolf/hud_weaponselect.c index e0a518fb..8331ccc9 100644 --- a/src/client/rewolf/hud_weaponselect.c +++ b/src/client/rewolf/hud_weaponselect.c @@ -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++) { diff --git a/src/client/text.c b/src/client/text.c index 77c3e128..9d28ac67 100644 --- a/src/client/text.c +++ b/src/client/text.c @@ -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; diff --git a/src/client/valve/defs.h b/src/client/valve/defs.h index b8e1f7b6..bf013593 100644 --- a/src/client/valve/defs.h +++ b/src/client/valve/defs.h @@ -17,6 +17,8 @@ var int autocvar_cl_autoweaponswitch = TRUE; vector g_hud_color; +vector g_hudmins; +vector g_hudres; struct { diff --git a/src/client/valve/hud.c b/src/client/valve/hud.c index 74bc2854..5f65b491 100644 --- a/src/client/valve/hud.c +++ b/src/client/valve/hud.c @@ -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; } diff --git a/src/client/valve/hud_weaponselect.c b/src/client/valve/hud_weaponselect.c index 19ac44e3..2e44b3f8 100644 --- a/src/client/valve/hud_weaponselect.c +++ b/src/client/valve/hud_weaponselect.c @@ -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++) { diff --git a/src/client/view.c b/src/client/view.c index 00e22912..726ac9f2 100644 --- a/src/client/view.c +++ b/src/client/view.c @@ -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 diff --git a/src/server/gearbox/ammo_op4.cpp b/src/server/gearbox/ammo_op4.cpp index efd5479e..52d91f08 100644 --- a/src/server/gearbox/ammo_op4.cpp +++ b/src/server/gearbox/ammo_op4.cpp @@ -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; diff --git a/src/server/gearbox/monster_drillsergeant.cpp b/src/server/gearbox/monster_drillsergeant.cpp index c273c445..2a8d30d2 100644 --- a/src/server/gearbox/monster_drillsergeant.cpp +++ b/src/server/gearbox/monster_drillsergeant.cpp @@ -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 */ diff --git a/src/server/gearbox/monster_recruit.cpp b/src/server/gearbox/monster_recruit.cpp index 925b21ff..20630229 100644 --- a/src/server/gearbox/monster_recruit.cpp +++ b/src/server/gearbox/monster_recruit.cpp @@ -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 */ diff --git a/src/server/valve/ammo.cpp b/src/server/valve/ammo.cpp index 2ca6f9d6..b66396f4 100644 --- a/src/server/valve/ammo.cpp +++ b/src/server/valve/ammo.cpp @@ -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; diff --git a/src/server/valve/gamerules.c b/src/server/valve/gamerules.c index 4e3c19c8..5c8f62a8 100644 --- a/src/server/valve/gamerules.c +++ b/src/server/valve/gamerules.c @@ -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 { diff --git a/src/server/valve/item_battery.cpp b/src/server/valve/item_battery.cpp index 2a2fa1b5..f5b035cc 100644 --- a/src/server/valve/item_battery.cpp +++ b/src/server/valve/item_battery.cpp @@ -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__; diff --git a/src/server/valve/item_healthkit.cpp b/src/server/valve/item_healthkit.cpp index 59be2115..c6f84c22 100644 --- a/src/server/valve/item_healthkit.cpp +++ b/src/server/valve/item_healthkit.cpp @@ -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__; diff --git a/src/server/valve/item_longjump.cpp b/src/server/valve/item_longjump.cpp index 38809997..0f962106 100644 --- a/src/server/valve/item_longjump.cpp +++ b/src/server/valve/item_longjump.cpp @@ -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; diff --git a/src/server/valve/item_suit.cpp b/src/server/valve/item_suit.cpp index 221969c8..a268c2f0 100644 --- a/src/server/valve/item_suit.cpp +++ b/src/server/valve/item_suit.cpp @@ -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; diff --git a/src/server/valve/monster_alien_controller.cpp b/src/server/valve/monster_alien_controller.cpp index 5774a26f..80b26f06 100644 --- a/src/server/valve/monster_alien_controller.cpp +++ b/src/server/valve/monster_alien_controller.cpp @@ -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 */ diff --git a/src/server/valve/monster_alien_grunt.cpp b/src/server/valve/monster_alien_grunt.cpp index 162678f7..8a864d84 100644 --- a/src/server/valve/monster_alien_grunt.cpp +++ b/src/server/valve/monster_alien_grunt.cpp @@ -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 */ diff --git a/src/server/valve/monster_alien_slave.cpp b/src/server/valve/monster_alien_slave.cpp index 8f773401..9d7fed32 100644 --- a/src/server/valve/monster_alien_slave.cpp +++ b/src/server/valve/monster_alien_slave.cpp @@ -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 */ diff --git a/src/server/valve/monster_apache.cpp b/src/server/valve/monster_apache.cpp index 6f4b45e6..60072501 100644 --- a/src/server/valve/monster_apache.cpp +++ b/src/server/valve/monster_apache.cpp @@ -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 */ diff --git a/src/server/valve/monster_babycrab.cpp b/src/server/valve/monster_babycrab.cpp index a2228b34..4c7febba 100644 --- a/src/server/valve/monster_babycrab.cpp +++ b/src/server/valve/monster_babycrab.cpp @@ -16,6 +16,8 @@ /*QUAKED monster_babycrab (0 0.8 0.8) (-16 -16 0) (16 16 36) +HALF-LIFE (1998) ENTITY + Baby Headcrab */ diff --git a/src/server/valve/monster_barnacle.cpp b/src/server/valve/monster_barnacle.cpp index d7bb44f9..93150cd8 100644 --- a/src/server/valve/monster_barnacle.cpp +++ b/src/server/valve/monster_barnacle.cpp @@ -16,6 +16,8 @@ /*QUAKED monster_barnacle (0 0.8 0.8) (-16 -16 -36) (16 16 0) +HALF-LIFE (1998) ENTITY + Barnacle */ diff --git a/src/server/valve/monster_barney.cpp b/src/server/valve/monster_barney.cpp index 86b591d3..35411ae3 100644 --- a/src/server/valve/monster_barney.cpp +++ b/src/server/valve/monster_barney.cpp @@ -16,6 +16,8 @@ /*QUAKED monster_barney (0 0.8 0.8) (-16 -16 0) (16 16 72) +HALF-LIFE (1998) ENTITY + Barney Calhoun */ diff --git a/src/server/valve/monster_barney_dead.cpp b/src/server/valve/monster_barney_dead.cpp index 13781a8f..352ad208 100644 --- a/src/server/valve/monster_barney_dead.cpp +++ b/src/server/valve/monster_barney_dead.cpp @@ -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 */ diff --git a/src/server/valve/monster_bigmomma.cpp b/src/server/valve/monster_bigmomma.cpp index d52ae0a4..d027488b 100644 --- a/src/server/valve/monster_bigmomma.cpp +++ b/src/server/valve/monster_bigmomma.cpp @@ -16,6 +16,8 @@ /*QUAKED monster_bigmomma (0 0.8 0.8) (-95 -95 0) (95 95 190) +HALF-LIFE (1998) ENTITY + Gonarch */ diff --git a/src/server/valve/monster_bloater.cpp b/src/server/valve/monster_bloater.cpp index 0c2d4338..071c54f9 100644 --- a/src/server/valve/monster_bloater.cpp +++ b/src/server/valve/monster_bloater.cpp @@ -16,6 +16,8 @@ /*QUAKED monster_bloater (0 0.8 0.8) (-16 -16 0) (16 16 72) +HALF-LIFE (1998) ENTITY + Flocking Floater */ diff --git a/src/server/valve/monster_bullchicken.cpp b/src/server/valve/monster_bullchicken.cpp index 0e53de33..a6612933 100644 --- a/src/server/valve/monster_bullchicken.cpp +++ b/src/server/valve/monster_bullchicken.cpp @@ -16,6 +16,8 @@ /*QUAKED monster_bullchicken (0 0.8 0.8) (-32 -32 0) (32 32 64) +HALF-LIFE (1998) ENTITY + Bullsquid */ diff --git a/src/server/valve/monster_cockroach.cpp b/src/server/valve/monster_cockroach.cpp index 3daa1b9c..42f57cdc 100644 --- a/src/server/valve/monster_cockroach.cpp +++ b/src/server/valve/monster_cockroach.cpp @@ -16,6 +16,8 @@ /*QUAKED monster_cockroach (0 0.8 0.8) (-4 -4 0) (4 4 4) +HALF-LIFE (1998) ENTITY + Cockroach */ diff --git a/src/server/valve/monster_flyer_flock.cpp b/src/server/valve/monster_flyer_flock.cpp index 4b30de23..c077ca36 100644 --- a/src/server/valve/monster_flyer_flock.cpp +++ b/src/server/valve/monster_flyer_flock.cpp @@ -16,6 +16,8 @@ /*QUAKED monster_flyer_flock (0 0.8 0.8) (-16 -16 0) (16 16 16) +HALF-LIFE (1998) ENTITY + Boid */ diff --git a/src/server/valve/monster_gargantua.cpp b/src/server/valve/monster_gargantua.cpp index 58b55ead..a409e1fb 100644 --- a/src/server/valve/monster_gargantua.cpp +++ b/src/server/valve/monster_gargantua.cpp @@ -16,6 +16,8 @@ /*QUAKED monster_gargantua (0 0.8 0.8) (-32 -32 0) (32 32 128) +HALF-LIFE (1998) ENTITY + Gargantua */ diff --git a/src/server/valve/monster_gman.cpp b/src/server/valve/monster_gman.cpp index 3d8ce914..ffc174d1 100644 --- a/src/server/valve/monster_gman.cpp +++ b/src/server/valve/monster_gman.cpp @@ -16,6 +16,8 @@ /*QUAKED monster_gman (0 0.8 0.8) (-16 -16 0) (16 16 72) +HALF-LIFE (1998) ENTITY + G-Man */ diff --git a/src/server/valve/monster_headcrab.cpp b/src/server/valve/monster_headcrab.cpp index 30b45748..d344e866 100644 --- a/src/server/valve/monster_headcrab.cpp +++ b/src/server/valve/monster_headcrab.cpp @@ -16,6 +16,8 @@ /*QUAKED monster_headcrab (0 0.8 0.8) (-16 -16 0) (16 16 36) +HALF-LIFE (1998) ENTITY + Headcrab */ diff --git a/src/server/valve/monster_hevsuit_dead.cpp b/src/server/valve/monster_hevsuit_dead.cpp index da4e48dd..04e6791c 100644 --- a/src/server/valve/monster_hevsuit_dead.cpp +++ b/src/server/valve/monster_hevsuit_dead.cpp @@ -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 */ diff --git a/src/server/valve/monster_hgrunt_dead.cpp b/src/server/valve/monster_hgrunt_dead.cpp index 7ab81542..f89a3688 100644 --- a/src/server/valve/monster_hgrunt_dead.cpp +++ b/src/server/valve/monster_hgrunt_dead.cpp @@ -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 */ diff --git a/src/server/valve/monster_houndeye.cpp b/src/server/valve/monster_houndeye.cpp index 63fde866..1615421f 100644 --- a/src/server/valve/monster_houndeye.cpp +++ b/src/server/valve/monster_houndeye.cpp @@ -16,6 +16,8 @@ /*QUAKED monster_houndeye (0 0.8 0.8) (-16 -16 0) (16 16 36) +HALF-LIFE (1998) ENTITY + Houndeye */ diff --git a/src/server/valve/monster_human_assassin.cpp b/src/server/valve/monster_human_assassin.cpp index f0e69c3b..28961ae5 100644 --- a/src/server/valve/monster_human_assassin.cpp +++ b/src/server/valve/monster_human_assassin.cpp @@ -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 */ diff --git a/src/server/valve/monster_human_grunt.cpp b/src/server/valve/monster_human_grunt.cpp index 9edb6fa5..b0c0181e 100644 --- a/src/server/valve/monster_human_grunt.cpp +++ b/src/server/valve/monster_human_grunt.cpp @@ -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 */ diff --git a/src/server/valve/monster_ichthyosaur.cpp b/src/server/valve/monster_ichthyosaur.cpp index 4255957d..efd28bae 100644 --- a/src/server/valve/monster_ichthyosaur.cpp +++ b/src/server/valve/monster_ichthyosaur.cpp @@ -16,6 +16,8 @@ /*QUAKED monster_ichthyosaur (0 0.8 0.8) (-32 -32 0) (32 32 64) +HALF-LIFE (1998) ENTITY + Ichthyosaur */ diff --git a/src/server/valve/monster_leech.cpp b/src/server/valve/monster_leech.cpp index db7a19b3..e715f1a1 100644 --- a/src/server/valve/monster_leech.cpp +++ b/src/server/valve/monster_leech.cpp @@ -16,6 +16,8 @@ /*QUAKED monster_leech (0 0.8 0.8) (-6 -6 0) (6 6 6) +HALF-LIFE (1998) ENTITY + Leech */ diff --git a/src/server/valve/monster_miniturret.cpp b/src/server/valve/monster_miniturret.cpp index c737dad2..a656ed50 100644 --- a/src/server/valve/monster_miniturret.cpp +++ b/src/server/valve/monster_miniturret.cpp @@ -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) */ diff --git a/src/server/valve/monster_nihilanth.cpp b/src/server/valve/monster_nihilanth.cpp index 38ad2bfa..21012218 100644 --- a/src/server/valve/monster_nihilanth.cpp +++ b/src/server/valve/monster_nihilanth.cpp @@ -16,6 +16,8 @@ /*QUAKED monster_nihilanth (0 0.8 0.8) (-192 -192 0) (192 192 384) +HALF-LIFE (1998) ENTITY + Nihilanth */ diff --git a/src/server/valve/monster_osprey.cpp b/src/server/valve/monster_osprey.cpp index 8e3613fc..42d51e1d 100644 --- a/src/server/valve/monster_osprey.cpp +++ b/src/server/valve/monster_osprey.cpp @@ -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 */ diff --git a/src/server/valve/monster_rat.cpp b/src/server/valve/monster_rat.cpp index 1c5a248f..fad63e2c 100644 --- a/src/server/valve/monster_rat.cpp +++ b/src/server/valve/monster_rat.cpp @@ -16,6 +16,8 @@ /*QUAKED monster_rat (0 0.8 0.8) (-6 -6 0) (6 6 6) +HALF-LIFE (1998) ENTITY + Rat */ diff --git a/src/server/valve/monster_scientist.cpp b/src/server/valve/monster_scientist.cpp index d226b513..9d9c35f3 100644 --- a/src/server/valve/monster_scientist.cpp +++ b/src/server/valve/monster_scientist.cpp @@ -16,6 +16,8 @@ /*QUAKED monster_scientist (0 0.8 0.8) (-16 -16 0) (16 16 72) +HALF-LIFE (1998) ENTITY + Scientist */ diff --git a/src/server/valve/monster_scientist_dead.cpp b/src/server/valve/monster_scientist_dead.cpp index 89942d93..d8e745a1 100644 --- a/src/server/valve/monster_scientist_dead.cpp +++ b/src/server/valve/monster_scientist_dead.cpp @@ -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 */ diff --git a/src/server/valve/monster_sentry.cpp b/src/server/valve/monster_sentry.cpp index 0e526599..1a1161e5 100644 --- a/src/server/valve/monster_sentry.cpp +++ b/src/server/valve/monster_sentry.cpp @@ -16,6 +16,8 @@ /*QUAKED monster_sentry (0 0.8 0.8) (-16 -16 0) (16 16 72) +HALF-LIFE (1998) ENTITY + Sentry Gun */ diff --git a/src/server/valve/monster_sitting_scientist.cpp b/src/server/valve/monster_sitting_scientist.cpp index 446b9fca..4e2f5d85 100644 --- a/src/server/valve/monster_sitting_scientist.cpp +++ b/src/server/valve/monster_sitting_scientist.cpp @@ -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 */ diff --git a/src/server/valve/monster_tentacle.cpp b/src/server/valve/monster_tentacle.cpp index d06340ee..da66dea0 100644 --- a/src/server/valve/monster_tentacle.cpp +++ b/src/server/valve/monster_tentacle.cpp @@ -16,6 +16,8 @@ /*QUAKED monster_tentacle (0 0.8 0.8) (-32 -32 0) (32 32 64) +HALF-LIFE (1998) ENTITY + Tentacle */ diff --git a/src/server/valve/monster_turret.cpp b/src/server/valve/monster_turret.cpp index 103de730..3e3c2862 100644 --- a/src/server/valve/monster_turret.cpp +++ b/src/server/valve/monster_turret.cpp @@ -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) */ diff --git a/src/server/valve/monster_zombie.cpp b/src/server/valve/monster_zombie.cpp index 44fb485a..47e67eeb 100644 --- a/src/server/valve/monster_zombie.cpp +++ b/src/server/valve/monster_zombie.cpp @@ -16,6 +16,8 @@ /*QUAKED monster_zombie (0 0.8 0.8) (-16 -16 0) (16 16 72) +HALF-LIFE (1998) ENTITY + Zombie */ diff --git a/src/server/valve/xen_hair.cpp b/src/server/valve/xen_hair.cpp index b2a46f8f..b0848fef 100644 --- a/src/server/valve/xen_hair.cpp +++ b/src/server/valve/xen_hair.cpp @@ -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; diff --git a/src/server/valve/xen_plantlight.cpp b/src/server/valve/xen_plantlight.cpp index ae1f1b8f..acf08057 100644 --- a/src/server/valve/xen_plantlight.cpp +++ b/src/server/valve/xen_plantlight.cpp @@ -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; diff --git a/src/server/valve/xen_spore_large.cpp b/src/server/valve/xen_spore_large.cpp index 057abb44..3dd0aacf 100644 --- a/src/server/valve/xen_spore_large.cpp +++ b/src/server/valve/xen_spore_large.cpp @@ -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; diff --git a/src/server/valve/xen_spore_medium.cpp b/src/server/valve/xen_spore_medium.cpp index 88fc9340..adc1ac3a 100644 --- a/src/server/valve/xen_spore_medium.cpp +++ b/src/server/valve/xen_spore_medium.cpp @@ -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; diff --git a/src/server/valve/xen_spore_small.cpp b/src/server/valve/xen_spore_small.cpp index 6b496d78..8a9ecb87 100644 --- a/src/server/valve/xen_spore_small.cpp +++ b/src/server/valve/xen_spore_small.cpp @@ -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; diff --git a/src/shared/cstrike/w_ak47.c b/src/shared/cstrike/w_ak47.c index aab12c22..f316eb33 100644 --- a/src/shared/cstrike/w_ak47.c +++ b/src/shared/cstrike/w_ak47.c @@ -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 } diff --git a/src/shared/cstrike/w_aug.c b/src/shared/cstrike/w_aug.c index 25c739d0..2a782d58 100644 --- a/src/shared/cstrike/w_aug.c +++ b/src/shared/cstrike/w_aug.c @@ -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 } diff --git a/src/shared/cstrike/w_awp.c b/src/shared/cstrike/w_awp.c index a4f729e4..e37212eb 100644 --- a/src/shared/cstrike/w_awp.c +++ b/src/shared/cstrike/w_awp.c @@ -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 } diff --git a/src/shared/cstrike/w_deagle.c b/src/shared/cstrike/w_deagle.c index 560ff103..e518f131 100644 --- a/src/shared/cstrike/w_deagle.c +++ b/src/shared/cstrike/w_deagle.c @@ -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 } diff --git a/src/shared/cstrike/w_elites.c b/src/shared/cstrike/w_elites.c index 391a2f46..894efdb1 100644 --- a/src/shared/cstrike/w_elites.c +++ b/src/shared/cstrike/w_elites.c @@ -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 } diff --git a/src/shared/cstrike/w_fiveseven.c b/src/shared/cstrike/w_fiveseven.c index 998d67dc..9beb0c96 100644 --- a/src/shared/cstrike/w_fiveseven.c +++ b/src/shared/cstrike/w_fiveseven.c @@ -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 } diff --git a/src/shared/cstrike/w_g3sg1.c b/src/shared/cstrike/w_g3sg1.c index c79fdbd8..6a2f39d9 100644 --- a/src/shared/cstrike/w_g3sg1.c +++ b/src/shared/cstrike/w_g3sg1.c @@ -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 } diff --git a/src/shared/cstrike/w_glock18.c b/src/shared/cstrike/w_glock18.c index cb337f1e..bc71df00 100644 --- a/src/shared/cstrike/w_glock18.c +++ b/src/shared/cstrike/w_glock18.c @@ -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 } diff --git a/src/shared/cstrike/w_m3.c b/src/shared/cstrike/w_m3.c index 35bbd999..7fe9485b 100644 --- a/src/shared/cstrike/w_m3.c +++ b/src/shared/cstrike/w_m3.c @@ -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 } diff --git a/src/shared/cstrike/w_m4a1.c b/src/shared/cstrike/w_m4a1.c index 36b6ec2c..9cc7aeea 100644 --- a/src/shared/cstrike/w_m4a1.c +++ b/src/shared/cstrike/w_m4a1.c @@ -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 } diff --git a/src/shared/cstrike/w_mac10.c b/src/shared/cstrike/w_mac10.c index b9558a74..cb83cf17 100644 --- a/src/shared/cstrike/w_mac10.c +++ b/src/shared/cstrike/w_mac10.c @@ -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 } diff --git a/src/shared/cstrike/w_mp5.c b/src/shared/cstrike/w_mp5.c index f9a44257..53062497 100644 --- a/src/shared/cstrike/w_mp5.c +++ b/src/shared/cstrike/w_mp5.c @@ -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 } diff --git a/src/shared/cstrike/w_p228.c b/src/shared/cstrike/w_p228.c index 5c6a7fe1..b2b43b96 100644 --- a/src/shared/cstrike/w_p228.c +++ b/src/shared/cstrike/w_p228.c @@ -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 } diff --git a/src/shared/cstrike/w_p90.c b/src/shared/cstrike/w_p90.c index f669868f..26787790 100644 --- a/src/shared/cstrike/w_p90.c +++ b/src/shared/cstrike/w_p90.c @@ -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 } diff --git a/src/shared/cstrike/w_para.c b/src/shared/cstrike/w_para.c index c3e51ef2..1517d8eb 100644 --- a/src/shared/cstrike/w_para.c +++ b/src/shared/cstrike/w_para.c @@ -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 } diff --git a/src/shared/cstrike/w_scout.c b/src/shared/cstrike/w_scout.c index 876e05cc..8d37d9ef 100644 --- a/src/shared/cstrike/w_scout.c +++ b/src/shared/cstrike/w_scout.c @@ -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 } diff --git a/src/shared/cstrike/w_sg550.c b/src/shared/cstrike/w_sg550.c index 400fb7bd..3869a413 100644 --- a/src/shared/cstrike/w_sg550.c +++ b/src/shared/cstrike/w_sg550.c @@ -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 } diff --git a/src/shared/cstrike/w_sg552.c b/src/shared/cstrike/w_sg552.c index 058bf27c..4d059fff 100644 --- a/src/shared/cstrike/w_sg552.c +++ b/src/shared/cstrike/w_sg552.c @@ -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 } diff --git a/src/shared/cstrike/w_tmp.c b/src/shared/cstrike/w_tmp.c index b10c0b6e..e857ab21 100644 --- a/src/shared/cstrike/w_tmp.c +++ b/src/shared/cstrike/w_tmp.c @@ -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 } diff --git a/src/shared/cstrike/w_ump45.c b/src/shared/cstrike/w_ump45.c index ec078f2d..98838824 100644 --- a/src/shared/cstrike/w_ump45.c +++ b/src/shared/cstrike/w_ump45.c @@ -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 } diff --git a/src/shared/cstrike/w_usp45.c b/src/shared/cstrike/w_usp45.c index 96168722..b87d5d2c 100644 --- a/src/shared/cstrike/w_usp45.c +++ b/src/shared/cstrike/w_usp45.c @@ -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 } diff --git a/src/shared/cstrike/w_xm1014.c b/src/shared/cstrike/w_xm1014.c index 9053a8fd..38ec8cc0 100644 --- a/src/shared/cstrike/w_xm1014.c +++ b/src/shared/cstrike/w_xm1014.c @@ -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 } diff --git a/src/shared/gearbox/w_displacer.c b/src/shared/gearbox/w_displacer.c index 51fa5175..128ea0c2 100644 --- a/src/shared/gearbox/w_displacer.c +++ b/src/shared/gearbox/w_displacer.c @@ -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, diff --git a/src/shared/gearbox/w_eagle.c b/src/shared/gearbox/w_eagle.c index 21d1b34d..d6631ff4 100644 --- a/src/shared/gearbox/w_eagle.c +++ b/src/shared/gearbox/w_eagle.c @@ -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], diff --git a/src/shared/gearbox/w_m249.c b/src/shared/gearbox/w_m249.c index 45c61fc7..49ca9cb9 100644 --- a/src/shared/gearbox/w_m249.c +++ b/src/shared/gearbox/w_m249.c @@ -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], diff --git a/src/shared/gearbox/w_penguin.c b/src/shared/gearbox/w_penguin.c index c31640bb..99d4d968 100644 --- a/src/shared/gearbox/w_penguin.c +++ b/src/shared/gearbox/w_penguin.c @@ -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 } diff --git a/src/shared/gearbox/w_shockrifle.c b/src/shared/gearbox/w_shockrifle.c index 53345d6d..5a2f4616 100644 --- a/src/shared/gearbox/w_shockrifle.c +++ b/src/shared/gearbox/w_shockrifle.c @@ -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], diff --git a/src/shared/gearbox/w_sniperrifle.c b/src/shared/gearbox/w_sniperrifle.c index 750d8605..2a389e4a 100644 --- a/src/shared/gearbox/w_sniperrifle.c +++ b/src/shared/gearbox/w_sniperrifle.c @@ -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 } diff --git a/src/shared/gearbox/w_sporelauncher.c b/src/shared/gearbox/w_sporelauncher.c index aa1f7cd9..aedb6522 100644 --- a/src/shared/gearbox/w_sporelauncher.c +++ b/src/shared/gearbox/w_sporelauncher.c @@ -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], diff --git a/src/shared/hunger/w_ap9.c b/src/shared/hunger/w_ap9.c index 91bf79ae..b2c6326e 100644 --- a/src/shared/hunger/w_ap9.c +++ b/src/shared/hunger/w_ap9.c @@ -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, diff --git a/src/shared/hunger/w_chaingun.c b/src/shared/hunger/w_chaingun.c index 5d975710..995562a9 100644 --- a/src/shared/hunger/w_chaingun.c +++ b/src/shared/hunger/w_chaingun.c @@ -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], diff --git a/src/shared/hunger/w_flame.c b/src/shared/hunger/w_flame.c index 05ace313..d661071f 100644 --- a/src/shared/hunger/w_flame.c +++ b/src/shared/hunger/w_flame.c @@ -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 } diff --git a/src/shared/hunger/w_glock.c b/src/shared/hunger/w_glock.c index c2248c2e..e39eb01d 100644 --- a/src/shared/hunger/w_glock.c +++ b/src/shared/hunger/w_glock.c @@ -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], diff --git a/src/shared/hunger/w_handgrenade.c b/src/shared/hunger/w_handgrenade.c index 9125ce3d..dae1d860 100644 --- a/src/shared/hunger/w_handgrenade.c +++ b/src/shared/hunger/w_handgrenade.c @@ -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 } diff --git a/src/shared/hunger/w_medkit.c b/src/shared/hunger/w_medkit.c index 836b5564..e18bce8e 100644 --- a/src/shared/hunger/w_medkit.c +++ b/src/shared/hunger/w_medkit.c @@ -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(); diff --git a/src/shared/hunger/w_sniper.c b/src/shared/hunger/w_sniper.c index c72cd9b1..cb5f5a8a 100644 --- a/src/shared/hunger/w_sniper.c +++ b/src/shared/hunger/w_sniper.c @@ -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], diff --git a/src/shared/hunger/w_sniper2.c b/src/shared/hunger/w_sniper2.c index 7dd836f5..d60e48fa 100644 --- a/src/shared/hunger/w_sniper2.c +++ b/src/shared/hunger/w_sniper2.c @@ -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], diff --git a/src/shared/hunger/w_taurus.c b/src/shared/hunger/w_taurus.c index e28fca04..57b38f2e 100644 --- a/src/shared/hunger/w_taurus.c +++ b/src/shared/hunger/w_taurus.c @@ -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, diff --git a/src/shared/poke646/w_pipebomb.c b/src/shared/poke646/w_pipebomb.c index 9c1974de..03ad343e 100644 --- a/src/shared/poke646/w_pipebomb.c +++ b/src/shared/poke646/w_pipebomb.c @@ -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 } diff --git a/src/shared/poke646/w_shotgun.c b/src/shared/poke646/w_shotgun.c index 94fd6aee..38bfa2f0 100644 --- a/src/shared/poke646/w_shotgun.c +++ b/src/shared/poke646/w_shotgun.c @@ -218,11 +218,11 @@ void w_shotgun_crosshair(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], "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]; + 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/128], [24/256, 24/128], g_hud_color, pSeat->ammo2_alpha, DRAWFLAG_ADDITIVE); #endif } diff --git a/src/shared/rewolf/w_beamgun.c b/src/shared/rewolf/w_beamgun.c index c5903947..9639ce23 100644 --- a/src/shared/rewolf/w_beamgun.c +++ b/src/shared/rewolf/w_beamgun.c @@ -193,7 +193,7 @@ w_beamgun_hud(void) txt2 = sprintf("POWER: %s", pmodes[getstati(47)]); txt3 = sprintf("ACCURACY: %s", amodes[getstati(47)]); txt4 = sprintf("LIGHTNING: %s", lmodes[getstati(48)]); - pos = video_mins + (video_res / 2) + [-80,-48]; + pos = g_hudmins + (g_hudres / 2) + [-80,-48]; drawfont = FONT_20; drawstring(pos, txt1, [20,20], col1, 1.0f, @@ -210,7 +210,7 @@ w_beamgun_hud(void) return; } - pos = video_mins + (video_res / 2) + [-15,-15]; + pos = g_hudmins + (g_hudres / 2) + [-15,-15]; drawsubpic( pos, [31,31], diff --git a/src/shared/rewolf/w_chemicalgun.c b/src/shared/rewolf/w_chemicalgun.c index 599c28cf..5e55cbd2 100644 --- a/src/shared/rewolf/w_chemicalgun.c +++ b/src/shared/rewolf/w_chemicalgun.c @@ -251,7 +251,7 @@ w_chemicalgun_hud(void) vector pos; player pl = (player)self; - pos = video_mins + [video_res[0] - 125, video_res[1] - 42]; + pos = g_hudmins + [g_hudres[0] - 125, g_hudres[1] - 42]; for (int i = 0; i < 3; i++) { drawpic( pos, @@ -291,7 +291,7 @@ w_chemicalgun_hud(void) txt2 = "NEUTRAL:"; txt3 = "BASE:"; txt4 = "PRESSURE:"; - pos = video_mins + (video_res / 2) + [-128,-96]; + pos = g_hudmins + (g_hudres / 2) + [-128,-96]; drawfont = FONT_20; drawstring(pos + [0,8], txt1, [20,20], col1, 1.0f, diff --git a/src/shared/rewolf/w_dml.c b/src/shared/rewolf/w_dml.c index 2352ab3a..b38e398a 100644 --- a/src/shared/rewolf/w_dml.c +++ b/src/shared/rewolf/w_dml.c @@ -263,7 +263,7 @@ w_dml_hud(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); - pos = (video_res / 2) + ([-lerp,-lerp] / 2); + pos = (g_hudres / 2) + ([-lerp,-lerp] / 2); drawsubpic( pos + jitter, [lerp,lerp], @@ -300,7 +300,7 @@ w_dml_hud(void) txt2 = sprintf("FLIGHTPATH: %s", fmodes[getstati(43)]); txt3 = sprintf("DETONATE: %s", dmodes[getstati(44)]); txt4 = sprintf("PAYLOAD: %s", pmodes[getstati(45)]); - pos = video_mins + (video_res / 2) + [-80,-48]; + pos = g_hudmins + (g_hudres / 2) + [-80,-48]; drawfont = FONT_20; drawstring(pos, txt1, [20,20], col1, 1.0f, @@ -317,7 +317,7 @@ w_dml_hud(void) return; } - pos = video_mins + (video_res / 2) + [-32,-15]; + pos = g_hudmins + (g_hudres / 2) + [-32,-15]; drawsubpic( pos, [63,31], diff --git a/src/shared/rewolf/w_gausspistol.c b/src/shared/rewolf/w_gausspistol.c index a2839ff2..4e21407f 100644 --- a/src/shared/rewolf/w_gausspistol.c +++ b/src/shared/rewolf/w_gausspistol.c @@ -218,7 +218,7 @@ w_gausspistol_hud(void) vector pos; player pl = (player)self; - pos = video_mins + [video_res[0] - 125, video_res[1] - 42]; + pos = g_hudmins + [g_hudres[0] - 125, g_hudres[1] - 42]; for (int i = 0; i < 3; i++) { drawpic( pos, @@ -235,7 +235,7 @@ w_gausspistol_hud(void) /* menu */ if (pl.a_ammo1 > 0) { - pos = video_mins + (video_res / 2) + [-96,-72]; + pos = g_hudmins + (g_hudres / 2) + [-96,-72]; /* far left */ if (pl.a_ammo3 == GM_SINGLE) { @@ -317,7 +317,7 @@ w_gausspistol_hud(void) return; } - pos = video_mins + (video_res / 2) + [-15,-15]; + pos = g_hudmins + (g_hudres / 2) + [-15,-15]; drawsubpic( pos, [31,31], diff --git a/src/shared/rewolf/w_grenade.c b/src/shared/rewolf/w_grenade.c index 8e372464..0aeac54f 100644 --- a/src/shared/rewolf/w_grenade.c +++ b/src/shared/rewolf/w_grenade.c @@ -179,7 +179,7 @@ w_grenade_hud(void) txt1 = sprintf("DETONATE: %s", dmodes[getstati(49)]); txt2 = sprintf("PAYLOAD: %s", pmodes[getstati(50)]); - pos = video_mins + (video_res / 2) + [-48,-16]; + pos = g_hudmins + (g_hudres / 2) + [-48,-16]; drawfont = FONT_20; drawstring(pos, txt1, [20,20], col1, 1.0f, diff --git a/src/shared/rewolf/w_minigun.c b/src/shared/rewolf/w_minigun.c index c3d4d182..801d9b66 100644 --- a/src/shared/rewolf/w_minigun.c +++ b/src/shared/rewolf/w_minigun.c @@ -214,7 +214,7 @@ w_minigun_hud(void) { #ifdef CSQC vector pos; - pos = video_mins + (video_res / 2) + [-23,-15]; + pos = g_hudmins + (g_hudres / 2) + [-23,-15]; drawsubpic( pos, @@ -227,7 +227,7 @@ w_minigun_hud(void) DRAWFLAG_NORMAL ); - pos = video_mins + [video_res[0] - 125, video_res[1] - 42]; + pos = g_hudmins + [g_hudres[0] - 125, g_hudres[1] - 42]; for (int i = 0; i < 3; i++) { drawpic( pos, diff --git a/src/shared/rewolf/w_shotgun.c b/src/shared/rewolf/w_shotgun.c index 42aec83c..2de84687 100644 --- a/src/shared/rewolf/w_shotgun.c +++ b/src/shared/rewolf/w_shotgun.c @@ -240,7 +240,7 @@ w_shotgun_hud(void) vector pos; player pl = (player)self; - pos = video_mins + [video_res[0] - 125, video_res[1] - 42]; + pos = g_hudmins + [g_hudres[0] - 125, g_hudres[1] - 42]; for (int i = 0; i < 3; i++) { drawpic( pos, @@ -272,7 +272,7 @@ w_shotgun_hud(void) shellstr = sprintf("SHELLS: %i", getstati(40)); spreadstr = sprintf("SPREAD: %s", gsmodes[getstati(41)]); - pos = video_mins + (video_res / 2) + [-48,-16]; + pos = g_hudmins + (g_hudres / 2) + [-48,-16]; drawfont = FONT_20; drawstring(pos, shellstr, [20,20], col1, 1.0f, @@ -283,7 +283,7 @@ w_shotgun_hud(void) } /* crosshair */ - pos = video_mins + (video_res / 2) + [-15,-15]; + pos = g_hudmins + (g_hudres / 2) + [-15,-15]; drawsubpic( pos, [31,31], diff --git a/src/shared/scihunt/w_cannon.c b/src/shared/scihunt/w_cannon.c index 156e9f4e..c71e9a6e 100644 --- a/src/shared/scihunt/w_cannon.c +++ b/src/shared/scihunt/w_cannon.c @@ -203,11 +203,11 @@ void w_cannon_crosshair(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], "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]; + 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/128], [24/256, 24/128], g_hud_color, pSeat->ammo2_alpha, DRAWFLAG_ADDITIVE); #endif } diff --git a/src/shared/tfc/w_dbs.c b/src/shared/tfc/w_dbs.c index ac4094c3..fc79ebed 100644 --- a/src/shared/tfc/w_dbs.c +++ b/src/shared/tfc/w_dbs.c @@ -222,11 +222,11 @@ w_dbs_crosshair(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], "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]; + 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/128], [24/256, 24/128], g_hud_color, pSeat->ammo2_alpha, DRAWFLAG_ADDITIVE); #endif } diff --git a/src/shared/tfc/w_sbs.c b/src/shared/tfc/w_sbs.c index 307b76c6..f8605d69 100644 --- a/src/shared/tfc/w_sbs.c +++ b/src/shared/tfc/w_sbs.c @@ -221,11 +221,11 @@ w_sbs_crosshair(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], "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]; + 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/128], [24/256, 24/128], g_hud_color, pSeat->ammo2_alpha, DRAWFLAG_ADDITIVE); #endif } diff --git a/src/shared/valve/animations.c b/src/shared/valve/animations.c index f3e58ae1..c812eead 100755 --- a/src/shared/valve/animations.c +++ b/src/shared/valve/animations.c @@ -53,8 +53,10 @@ void Animation_PlayerUpdate( void ) { self.frame = Weapons_GetAim(pl.activeweapon); self.frame_old = self.frame; } - - if ( !( self.flags & FL_ONGROUND ) ) { + + /* in order to appear jumping, we want to not be on ground, + * but also make sure we're not just going down a ramp */ + if ( !( self.flags & FL_ONGROUND ) && (self.velocity[2] > 0 || self.baseframe == ANIM_JUMP) ) { self.baseframe = ANIM_JUMP; } else if ( vlen( self.velocity ) == 0 ) { if ( self.flags & FL_CROUCHING ) { diff --git a/src/shared/valve/w_crossbow.c b/src/shared/valve/w_crossbow.c index e9bbe410..58f2be02 100644 --- a/src/shared/valve/w_crossbow.c +++ b/src/shared/valve/w_crossbow.c @@ -295,7 +295,7 @@ w_crossbow_crosshair(void) vector cross_pos; vector aicon_pos; - cross_pos = video_mins + (video_res / 2) + [-12,-12]; + cross_pos = g_hudmins + (g_hudres / 2) + [-12,-12]; drawsubpic( cross_pos, [24,24], @@ -310,7 +310,7 @@ w_crossbow_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], diff --git a/src/shared/valve/w_egon.c b/src/shared/valve/w_egon.c index aeb9b05a..0e67e995 100644 --- a/src/shared/valve/w_egon.c +++ b/src/shared/valve/w_egon.c @@ -152,10 +152,10 @@ void w_egon_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 } diff --git a/src/shared/valve/w_gauss.c b/src/shared/valve/w_gauss.c index 7fcd819a..e1c05dfa 100644 --- a/src/shared/valve/w_gauss.c +++ b/src/shared/valve/w_gauss.c @@ -357,8 +357,8 @@ void w_gauss_crosshair(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, diff --git a/src/shared/valve/w_glock.c b/src/shared/valve/w_glock.c index 0cc33e06..dfdcd96c 100644 --- a/src/shared/valve/w_glock.c +++ b/src/shared/valve/w_glock.c @@ -266,8 +266,8 @@ w_glock_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, diff --git a/src/shared/valve/w_handgrenade.c b/src/shared/valve/w_handgrenade.c index 5f78d1c1..8ef507b6 100644 --- a/src/shared/valve/w_handgrenade.c +++ b/src/shared/valve/w_handgrenade.c @@ -171,7 +171,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, [24,24], "sprites/640hud7.spr_0.tga", [48/256,96/128], [24/256, 24/128], g_hud_color, pSeat->ammo2_alpha, DRAWFLAG_ADDITIVE); #endif } diff --git a/src/shared/valve/w_hornetgun.c b/src/shared/valve/w_hornetgun.c index d521b502..5b2bd00f 100644 --- a/src/shared/valve/w_hornetgun.c +++ b/src/shared/valve/w_hornetgun.c @@ -256,8 +256,8 @@ w_hornetgun_crosshair(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, diff --git a/src/shared/valve/w_mp5.c b/src/shared/valve/w_mp5.c index c7debf37..df06d13e 100644 --- a/src/shared/valve/w_mp5.c +++ b/src/shared/valve/w_mp5.c @@ -270,7 +270,7 @@ w_mp5_crosshair(void) vector cross_pos; vector aicon_pos; - cross_pos = video_mins + (video_res / 2) + [-12,-12]; + cross_pos = g_hudmins + (g_hudres / 2) + [-12,-12]; drawsubpic( cross_pos, @@ -287,7 +287,7 @@ w_mp5_crosshair(void) HUD_DrawAmmo2(); HUD_DrawAmmo3(); - 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], @@ -299,7 +299,7 @@ w_mp5_crosshair(void) DRAWFLAG_ADDITIVE ); - aicon_pos = video_mins + [video_res[0] - 48, video_res[1] - 74]; + aicon_pos = g_hudmins + [g_hudres[0] - 48, g_hudres[1] - 74]; drawsubpic( aicon_pos, [24,24], diff --git a/src/shared/valve/w_python.c b/src/shared/valve/w_python.c index 62b4d994..fb6bb3f5 100644 --- a/src/shared/valve/w_python.c +++ b/src/shared/valve/w_python.c @@ -247,7 +247,7 @@ w_python_crosshair(void) vector cross_pos; vector aicon_pos; - cross_pos = video_mins + (video_res / 2) + [-12,-12]; + cross_pos = g_hudmins + (g_hudres / 2) + [-12,-12]; drawsubpic( cross_pos, [24,24], @@ -262,7 +262,7 @@ w_python_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], diff --git a/src/shared/valve/w_rpg.c b/src/shared/valve/w_rpg.c index b8cc4335..3b1b936a 100644 --- a/src/shared/valve/w_rpg.c +++ b/src/shared/valve/w_rpg.c @@ -283,7 +283,7 @@ void w_rpg_hud(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_mins + (video_res / 2) + ([-lerp,-lerp] / 2); + cross_pos = g_hudmins + (g_hudres / 2) + ([-lerp,-lerp] / 2); drawsubpic( cross_pos + jitter, [lerp,lerp], @@ -295,7 +295,7 @@ void w_rpg_hud(void) DRAWFLAG_ADDITIVE ); } else { - cross_pos = video_mins + (video_res / 2) + [-12,-12]; + cross_pos = g_hudmins + (g_hudres / 2) + [-12,-12]; drawsubpic( cross_pos, [24,24], @@ -313,7 +313,7 @@ void w_rpg_hud(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], diff --git a/src/shared/valve/w_satchel.c b/src/shared/valve/w_satchel.c index 96a643d4..d575272b 100644 --- a/src/shared/valve/w_satchel.c +++ b/src/shared/valve/w_satchel.c @@ -248,7 +248,7 @@ void w_satchel_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 } diff --git a/src/shared/valve/w_shotgun.c b/src/shared/valve/w_shotgun.c index df3b3998..985c8d67 100644 --- a/src/shared/valve/w_shotgun.c +++ b/src/shared/valve/w_shotgun.c @@ -260,11 +260,11 @@ void w_shotgun_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", [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]; + 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/128], [24/256, 24/128], g_hud_color, pSeat->ammo2_alpha, DRAWFLAG_ADDITIVE); #endif } diff --git a/src/shared/valve/w_snark.c b/src/shared/valve/w_snark.c index 124e0d97..4979866f 100644 --- a/src/shared/valve/w_snark.c +++ b/src/shared/valve/w_snark.c @@ -276,7 +276,7 @@ void w_snark_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", [96/256,96/128], [24/256, 24/128], g_hud_color, pSeat->ammo2_alpha, DRAWFLAG_ADDITIVE); #endif } diff --git a/src/shared/valve/w_tripmine.c b/src/shared/valve/w_tripmine.c index 5275a484..05a3f803 100644 --- a/src/shared/valve/w_tripmine.c +++ b/src/shared/valve/w_tripmine.c @@ -309,7 +309,7 @@ void w_tripmine_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", [120/256,96/128], [24/256, 24/128], g_hud_color, pSeat->ammo2_alpha, DRAWFLAG_ADDITIVE); #endif }