diff --git a/src/client/progs.src b/src/client/progs.src index 86071c3..e27050d 100644 --- a/src/client/progs.src +++ b/src/client/progs.src @@ -33,6 +33,8 @@ init.qc ../../../valve/src/client/view.qc ../../../valve/src/client/obituary.qc ../../../valve/src/client/hud_ammonotify.qc +../../../valve/src/client/hud_dmgnotify.qc +../../../valve/src/client/hud_itemnotify.qc ../../../valve/src/client/hud.qc hud_weaponselect.qc ../../../valve/src/client/scoreboard.qc diff --git a/src/server/server.qc b/src/server/server.qc index fd1c23d..1285f54 100644 --- a/src/server/server.qc +++ b/src/server/server.qc @@ -36,4 +36,5 @@ Game_Worldspawn(void) precache_model("models/w_weaponbox.mdl"); Weapons_Init(); Player_Precache(); + FX_Corpse_Init(); } diff --git a/src/shared/player.qc b/src/shared/player.qc index ffce2b3..6850015 100644 --- a/src/shared/player.qc +++ b/src/shared/player.qc @@ -120,6 +120,7 @@ class player:base_player #ifdef CLIENT void Weapons_AmmoUpdate(entity); void HUD_AmmoNotify_Check(player pl); +void HUD_ItemNotify_Check(player pl); /* ================= player::ReceiveEntity @@ -192,12 +193,24 @@ player::ReceiveEntity(float new, float fl) mode_m249 = readbyte(); } + setorigin(this, origin); + + /* these only concern the current player */ + CSQC_UpdateSeat(); + if (this != pSeat->m_ePlayer) + return; + + /* do not notify us of updates when spawning initially */ + if (fl == UPDATE_ALL) + PredictPreFrame(); + if (fl & PLAYER_AMMO1 || fl & PLAYER_AMMO2 || fl & PLAYER_AMMO3) { Weapons_AmmoUpdate(this); HUD_AmmoNotify_Check(this); } - setorigin(this, origin); + if (fl & PLAYER_ITEMS || fl & PLAYER_HEALTH || fl & PLAYER_ARMOR) + HUD_ItemNotify_Check(this); } /*