stop using IT_SUPERWEAPON in weapon ammo flags

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index 9d2a8efc916fd2db240179605da7008017cde43c..1d0ad220022b8f1cf33cbb6282d01863cd303c59 100644 (file)
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -1090,6 +1090,10 @@ void HUD_Powerups(void)
 
                if (getstati(STAT_ITEMS, 0, 24) & IT_UNLIMITED_SUPERWEAPONS)
                        superweapons_time = 99; // force max
+
+               // prevent stuff to show up on mismatch that will be fixed next frame
+               if (!(getstati(STAT_ITEMS, 0, 24) & IT_SUPERWEAPON))
+                       superweapons_time = 0;
        }
        else
        {

diff --git a/qcsrc/common/items.qh b/qcsrc/common/items.qh
index 23a94e4f96b435e87aba316d0a7db4a6ada1cd24..07a7625345dcddeb80745a044bebbaf9b57536a1 100644 (file)
--- a/qcsrc/common/items.qh
+++ b/qcsrc/common/items.qh
@@ -2,53 +2,53 @@ float BOT_PICKUP_RATING_LOW   = 2500;
 float BOT_PICKUP_RATING_MID    = 5000;
 float BOT_PICKUP_RATING_HIGH   = 10000;
 
-float WEP_TYPE_OTHER       = 0x00;     // e.g: Hook, Port-o-launch, etc
-float WEP_TYPE_SPLASH      = 0x01;
-float WEP_TYPE_HITSCAN     = 0x02;
-float WEP_TYPEMASK          = 0x0F;
-float WEP_FLAG_CANCLIMB     = 0x10;
-float WEP_FLAG_NORMAL       = 0x20;
-float WEP_FLAG_HIDDEN       = 0x40;
-float WEP_FLAG_RELOADABLE   = 0x80;
+float WEP_TYPE_OTHER       =  0x00;    // e.g: Hook, Port-o-launch, etc
+float WEP_TYPE_SPLASH      =  0x01;
+float WEP_TYPE_HITSCAN     =  0x02;
+float WEP_TYPEMASK          =  0x0F;
+float WEP_FLAG_CANCLIMB     =  0x10;
+float WEP_FLAG_NORMAL       =  0x20;
+float WEP_FLAG_HIDDEN       =  0x40;
+float WEP_FLAG_RELOADABLE   =  0x80;
+float WEP_FLAG_SUPERWEAPON  = 0x100;
 
-float  IT_UNLIMITED_WEAPON_AMMO  = 1;
+float  IT_UNLIMITED_WEAPON_AMMO     = 1;
 // when this bit is set, using a weapon does not reduce ammo. Checkpoints can give this powerup.
-float  IT_UNLIMITED_SUPERWEAPONS = 2;
-// when this bit is set, using a superweapon does not throw it away. Checkpoints can give this powerup.
-float  IT_CTF_SHIELDED           = 4; // set for the flag shield
-// using jetpack
-float   IT_USING_JETPACK          = 8; // confirmation that button is pressed
-float   IT_JETPACK                = 16; // actual item
-float  IT_FUEL_REGEN             = 32; // fuel regeneration trigger
-float  IT_SHELLS                               = 256;
-float  IT_NAILS                                = 512;
-float  IT_ROCKETS                              = 1024;
-float  IT_CELLS                                = 2048;
-float  IT_SUPERWEAPON                  = 4096;
-float  IT_FUEL                                 = 128;
-float  IT_STRENGTH                             = 8192;
-float  IT_INVINCIBLE                   = 16384;
-float  IT_HEALTH                               = 32768;
+float  IT_UNLIMITED_SUPERWEAPONS    = 2;
+// when this bit is set, superweapons don't expire. Checkpoints can give this powerup.
+float   IT_CTF_SHIELDED              = 4; // set for the flag shield
+float   IT_USING_JETPACK             = 8; // confirmation that button is pressed
+float   IT_JETPACK                   = 16; // actual item
+float   IT_FUEL_REGEN                = 32; // fuel regeneration trigger
+float   IT_SHELLS                    = 256;
+float   IT_NAILS                     = 512;
+float   IT_ROCKETS                   = 1024;
+float   IT_CELLS                     = 2048;
+float   IT_SUPERWEAPON               = 4096;
+float   IT_FUEL                      = 128;
+float   IT_STRENGTH                  = 8192;
+float   IT_INVINCIBLE                = 16384;
+float   IT_HEALTH                    = 32768;
 // union:
-       // for items:
-       float   IT_KEY1                                 = 131072;
-       float   IT_KEY2                                 = 262144;
-       // for players:
-       float   IT_RED_FLAG_TAKEN               = 32768;
-       float   IT_RED_FLAG_LOST                = 65536;
-       float   IT_RED_FLAG_CARRING             = 98304;
-       float   IT_BLUE_FLAG_TAKEN              = 131072;
-       float   IT_BLUE_FLAG_LOST               = 262144;
-       float   IT_BLUE_FLAG_CARRING    = 393216;
+        // for items:
+        float   IT_KEY1              = 131072;
+        float   IT_KEY2              = 262144;
+        // for players:
+        float   IT_RED_FLAG_TAKEN    = 32768;
+        float   IT_RED_FLAG_LOST     = 65536;
+        float   IT_RED_FLAG_CARRING  = 98304;
+        float   IT_BLUE_FLAG_TAKEN   = 131072;
+        float   IT_BLUE_FLAG_LOST    = 262144;
+        float   IT_BLUE_FLAG_CARRING = 393216;
 // end
-float  IT_5HP                                  = 524288;
-float  IT_25HP                                 = 1048576;
-float  IT_ARMOR_SHARD                  = 2097152;
-float  IT_ARMOR                                = 4194304;
+float   IT_5HP                       = 524288;
+float   IT_25HP                      = 1048576;
+float   IT_ARMOR_SHARD               = 2097152;
+float   IT_ARMOR                     = 4194304;
 
-float  IT_AMMO                                 = 3968; // IT_SHELLS | IT_NAILS | IT_ROCKETS | IT_CELLS | IT_FUEL;
-float  IT_PICKUPMASK           = 51; // IT_FUEL_REGEN | IT_JETPACK | IT_UNLIMITED_AMMO; // strength and invincible are handled separately
-float  IT_UNLIMITED_AMMO       = 3; // IT_UNLIMITED_SUPERWEAPONS | IT_UNLIMITED_WEAPON_AMMO;
+float   IT_AMMO                      = 3968; // IT_SHELLS | IT_NAILS | IT_ROCKETS | IT_CELLS | IT_FUEL;
+float   IT_PICKUPMASK                = 51; // IT_FUEL_REGEN | IT_JETPACK | IT_UNLIMITED_AMMO; // strength and invincible are handled separately
+float   IT_UNLIMITED_AMMO            = 3; // IT_UNLIMITED_SUPERWEAPONS | IT_UNLIMITED_WEAPON_AMMO;
 
 float AMMO_COUNT = 4; // amount of ammo types to show in the inventory panel
 
@@ -103,7 +103,7 @@ float WEPBIT_SUPERWEAPONS;
        { \
                WEP_LAST = (id = WEP_FIRST + WEP_COUNT); \
                WEPBIT_ALL |= (bit = power2of(WEP_COUNT)); \
-               WEPBIT_SUPERWEAPONS |= (bit = power2of(WEP_COUNT)) * !!(ammotype & IT_SUPERWEAPON); \
+               WEPBIT_SUPERWEAPONS |= (bit = power2of(WEP_COUNT)) * !!(weapontype & WEP_FLAG_SUPERWEAPON); \
                ++WEP_COUNT; \
                register_weapon(id,func,ammotype,i,weapontype,pickupbasevalue,modelname,shortname,wname); \
        } \

diff --git a/qcsrc/server/mutators/mutator_nix.qc b/qcsrc/server/mutators/mutator_nix.qc
index 519d51daa2510edd8f23ecef335e454127bd4f9c..28bb8446902b29249d375d94e953886da444961c 100644 (file)
--- a/qcsrc/server/mutators/mutator_nix.qc
+++ b/qcsrc/server/mutators/mutator_nix.qc
@@ -228,6 +228,7 @@ MUTATOR_HOOKFUNCTION(nix_PlayerSpawn)
 {
        self.nix_lastchange_id = -1;
        NIX_GiveCurrentWeapon(); // overrides the weapons you got when spawning
+       self.items |= IT_UNLIMITED_SUPERWEAPONS;
        return 0;
 }
 

diff --git a/qcsrc/server/w_fireball.qc b/qcsrc/server/w_fireball.qc
index 1732d9c048fe6556fb5962a7bd95686fd96634c4..02463c2c007444ec0b3305b55fd1c7b6cf1b222e 100644 (file)
--- a/qcsrc/server/w_fireball.qc
+++ b/qcsrc/server/w_fireball.qc
@@ -1,5 +1,5 @@
 #ifdef REGISTER_WEAPON
-REGISTER_WEAPON(FIREBALL, w_fireball, IT_FUEL | IT_SUPERWEAPON, 9, WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH, BOT_PICKUP_RATING_MID, "fireball", "fireball", _("Fireball"));
+REGISTER_WEAPON(FIREBALL, w_fireball, IT_FUEL, 9, WEP_FLAG_RELOADABLE | WEP_FLAG_SUPERWEAPON | WEP_TYPE_SPLASH, BOT_PICKUP_RATING_MID, "fireball", "fireball", _("Fireball"));
 #else
 #ifdef SVQC
 .float bot_primary_fireballmooth; // whatever a mooth is

diff --git a/qcsrc/server/w_minstanex.qc b/qcsrc/server/w_minstanex.qc
index ae71b2d9e688f5e499603d4c21888be0079b2215..f688219bd32b0a350a3a052faf58b7f9d68d5b09 100644 (file)
--- a/qcsrc/server/w_minstanex.qc
+++ b/qcsrc/server/w_minstanex.qc
@@ -1,5 +1,5 @@
 #ifdef REGISTER_WEAPON
-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"))
+REGISTER_WEAPON(MINSTANEX, w_minstanex, IT_CELLS, 7, WEP_FLAG_HIDDEN | WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_FLAG_SUPERWEAPON | WEP_TYPE_HITSCAN, BOT_PICKUP_RATING_HIGH, "minstanex", "minstanex", _("MinstaNex"))
 #else
 #ifdef SVQC
 .float minstanex_lasthit;