diff --git a/src/server/gamerules_multiplayer.qc b/src/server/gamerules_multiplayer.qc index 735fdaf..d85e65b 100644 --- a/src/server/gamerules_multiplayer.qc +++ b/src/server/gamerules_multiplayer.qc @@ -92,6 +92,7 @@ HLMultiplayerRules::PlayerDeath(base_player pl) pl.SetSolid(SOLID_NOT); pl.takedamage = DAMAGE_NO; pl.gflags &= ~GF_FLASHLIGHT; + pl.gflags &= ~GF_EGONBEAM; pl.armor = pl.activeweapon = pl.g_items = 0; pl.health = 0; diff --git a/src/shared/w_crossbow.qc b/src/shared/w_crossbow.qc index 698a6ce..b03b345 100644 --- a/src/shared/w_crossbow.qc +++ b/src/shared/w_crossbow.qc @@ -249,7 +249,7 @@ w_crossbow_reload(void) } pl.think = w_crossbow_reload_done; - pl.nextthink = time + 4.5f; + pl.nextthink = time + 4.4f; Sound_Play(pl, CHAN_ITEM, "weapon_crossbow.reload"); #endif diff --git a/src/shared/w_glock.qc b/src/shared/w_glock.qc index 9221096..fc0f158 100644 --- a/src/shared/w_glock.qc +++ b/src/shared/w_glock.qc @@ -262,7 +262,7 @@ w_glock_reload(void) } pl.think = w_glock_reload_done; - pl.nextthink = time + 2.0f; + pl.nextthink = time + 1.9f; #endif pl.w_attack_next = 2.0f; diff --git a/src/shared/w_mp5.qc b/src/shared/w_mp5.qc index 7507c3c..e288f50 100644 --- a/src/shared/w_mp5.qc +++ b/src/shared/w_mp5.qc @@ -253,7 +253,7 @@ w_mp5_reload(void) } pl.think = w_mp5_reload_done; - pl.nextthink = time + 1.5f; + pl.nextthink = time + 1.4f; #endif pl.w_attack_next = 1.5f; diff --git a/src/shared/w_python.qc b/src/shared/w_python.qc index 720fd31..afc4f93 100644 --- a/src/shared/w_python.qc +++ b/src/shared/w_python.qc @@ -210,7 +210,7 @@ w_python_reload(void) } pl.think = w_python_reload_done; - pl.nextthink = time + 3.25f; + pl.nextthink = time + 3.15f; Sound_Play(pl, CHAN_WEAPON, "weapon_357.reload"); #endif diff --git a/src/shared/w_rpg.qc b/src/shared/w_rpg.qc index 379bb4f..aa78e56 100644 --- a/src/shared/w_rpg.qc +++ b/src/shared/w_rpg.qc @@ -195,7 +195,7 @@ void w_rpg_reload(void) } pl.think = w_rpg_reload_done; - pl.nextthink = time + 2.25f; + pl.nextthink = time + 2.15f; #endif pl.w_attack_next = 2.25f;