]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
also make minstanex a superweapon
authorRudolf Polzer <divverent@alientrap.org>
Thu, 12 Jan 2012 13:53:53 +0000 (14:53 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 12 Jan 2012 13:53:53 +0000 (14:53 +0100)
qcsrc/server/cl_client.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/w_minstanex.qc

index fa2acdd9b63270ab84fb3883c676ff90c54d679f..40b82224b02966f8d78c5902c2ea0ad4571e58fc 100644 (file)
@@ -751,7 +751,7 @@ void PutClientInServer (void)
                        self.weapons = start_weapons;
                }
 
-               if(self.weapons & WEPBIT_SUPERWEAPONS)
+               if(self.weapons & WEPBIT_SUPERWEAPONS) // exception for minstagib, as minstanex is a superweapon
                        self.superweapons_finished = time + autocvar_g_balance_superweapons_time;
                else
                        self.superweapons_finished = 0;
index 7c6c28bf5b361ef6c511ba1702a9ade5e04d6d08..4b19730adcd3d15f9708bebbe7846a608598ea77 100644 (file)
@@ -908,6 +908,7 @@ void readplayerstartcvars()
                start_weapons = WEPBIT_MINSTANEX;
                weapon_action(WEP_MINSTANEX, WR_PRECACHE);
                g_minstagib_invis_alpha = cvar("g_minstagib_invis_alpha");
+               start_items |= IT_UNLIMITED_SUPERWEAPONS;
 
                if (g_minstagib_invis_alpha <= 0)
                        g_minstagib_invis_alpha = -1;
index 34c71cf50935508902626903d48a75cad3369c44..ae71b2d9e688f5e499603d4c21888be0079b2215 100644 (file)
@@ -1,5 +1,5 @@
 #ifdef REGISTER_WEAPON
-REGISTER_WEAPON(MINSTANEX, w_minstanex, IT_CELLS, 7, WEP_FLAG_HIDDEN | WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_TYPE_HITSCAN, BOT_PICKUP_RATING_HIGH, "minstanex", "minstanex", _("MinstaNex"))
+REGISTER_WEAPON(MINSTANEX, w_minstanex, IT_CELLS | IT_SUPERWEAPON, 7, WEP_FLAG_HIDDEN | WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_TYPE_HITSCAN, BOT_PICKUP_RATING_HIGH, "minstanex", "minstanex", _("MinstaNex"))
 #else
 #ifdef SVQC
 .float minstanex_lasthit;