]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Apply a temporary fix for superweapons
authorMario <mario@smbclan.net>
Wed, 2 Dec 2015 11:47:22 +0000 (21:47 +1000)
committerMario <mario@smbclan.net>
Wed, 2 Dec 2015 11:47:22 +0000 (21:47 +1000)
qcsrc/server/weapons/spawning.qc

index 244f6a5e6d768bfcc8d47ce357836f45cf805bac..923c2aa4ad30867be0671acca2ac51180454fb02 100644 (file)
@@ -111,7 +111,7 @@ void weapon_defaultspawnfunc(entity this, Weapon e)
 
        if (!this.respawntime)
        {
-               if (e.weapons & WEPSET_SUPERWEAPONS)
+               if (e.spawnflags & WEP_FLAG_SUPERWEAPON)
                {
                        this.respawntime = g_pickup_respawntime_superweapon;
                        this.respawntimejitter = g_pickup_respawntimejitter_superweapon;
@@ -123,9 +123,12 @@ void weapon_defaultspawnfunc(entity this, Weapon e)
                }
        }
 
-       if (e.weapons & WEPSET_SUPERWEAPONS)
+       if (e.spawnflags & WEP_FLAG_SUPERWEAPON)
                if (!this.superweapons_finished)
+               {
                        this.superweapons_finished = autocvar_g_balance_superweapons_time;
+                       LOG_INFO("Setting it to ", ftos(this.superweapons_finished), " on ", e.mdl, "\n");
+               }
 
        // if we don't already have ammo, give us some ammo
        if (!this.(e.ammo_field))