Merge branch 'master' into z411/bai-server

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / weapons / weaponsystem.qc

diff --git a/qcsrc/server/weapons/weaponsystem.qc b/qcsrc/server/weapons/weaponsystem.qc
index fc2c3979c2b15226d5242fc95fdc641ad658b53e..03d15be2e406b0066ed445e78ec3629f524e323a 100644 (file)
--- a/qcsrc/server/weapons/weaponsystem.qc
+++ b/qcsrc/server/weapons/weaponsystem.qc
@@ -6,6 +6,7 @@
 #include <common/mapobjects/platforms.qh>
 #include <common/monsters/_mod.qh>
 #include <common/mutators/mutator/status_effects/_mod.qh>
+#include <common/ent_cs.qh>
 #include <common/net_linked.qh>
 #include <common/notifications/all.qh>
 #include <common/resources/sv_resources.qh>
@@ -427,7 +428,7 @@ bool weaponLocked(entity player)
 {
        if (time < game_starttime && !sv_ready_restart_after_countdown) return true;
        if (player.player_blocked) return true;
-       if (game_stopped) return true;
+       if (game_stopped || game_timeout) return true;
        if (STAT(FROZEN, player)) return true;
        if (MUTATOR_CALLHOOK(LockWeapon, player)) return true;
        return false;
@@ -536,6 +537,7 @@ void W_WeaponFrame(Player actor, .entity weaponentity)
                                this.m_weapon = newwep;
                                this.weaponname = newwep.mdl;
                                this.bulletcounter = 0;
+                               actor.activewepid = newwep.m_id; // z411
                                newwep.wr_setup(newwep, actor, weaponentity);
                                this.state = WS_RAISE;