Light refactoring: rename module roots to `all` for consistency

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

diff --git a/qcsrc/server/weapons/spawning.qc b/qcsrc/server/weapons/spawning.qc
index 409dbfe07e09345d362075c4fe5036af0face583..9096b2f9c72d9ff3e54063ec33a1d0be7cbcd0bb 100644 (file)
--- a/qcsrc/server/weapons/spawning.qc
+++ b/qcsrc/server/weapons/spawning.qc
@@ -1,3 +1,11 @@
+#include "spawning.qh"
+#include "../_all.qh"
+
+#include "weaponsystem.qh"
+#include "../mutators/mutators_include.qh"
+#include "../t_items.qh"
+#include "../../common/weapons/all.qh"
+
 string W_Apply_Weaponreplace(string in)
 {
        float n = tokenize_console(in);
@@ -8,7 +16,7 @@ string W_Apply_Weaponreplace(string in)
        {
                replacement = "";
                s = argv(i);
-               
+
                for(j = WEP_FIRST; j <= WEP_LAST; ++j)
                {
                        e = get_weaponinfo(j);
@@ -33,7 +41,7 @@ void weapon_defaultspawnfunc(float wpn)
        string s;
        entity oldself;
        float i, j;
-       float f;
+       int f;
 
        if(self.classname != "droppedweapon" && self.classname != "replacedweapon")
        {
@@ -42,7 +50,7 @@ void weapon_defaultspawnfunc(float wpn)
                if(e.spawnflags & WEP_FLAG_MUTATORBLOCKED)
                {
                        objerror("Attempted to spawn a mutator-blocked weapon rejected");
-                       startitem_failed = TRUE;
+                       startitem_failed = true;
                        return;
                }
 
@@ -54,7 +62,7 @@ void weapon_defaultspawnfunc(float wpn)
                if(s == "")
                {
                        remove(self);
-                       startitem_failed = TRUE;
+                       startitem_failed = true;
                        return;
                }
                t = tokenize_console(s);
@@ -105,7 +113,7 @@ void weapon_defaultspawnfunc(float wpn)
                if(wpn == 0)
                {
                        remove(self);
-                       startitem_failed = TRUE;
+                       startitem_failed = true;
                        return;
                }
        }
@@ -139,11 +147,12 @@ void weapon_defaultspawnfunc(float wpn)
                        case ammo_nails:   self.ammo_nails   = cvar("g_pickup_nails_weapon");   break;
                        case ammo_rockets: self.ammo_rockets = cvar("g_pickup_rockets_weapon"); break;
                        case ammo_cells:   self.ammo_cells   = cvar("g_pickup_cells_weapon");   break;
+                       case ammo_plasma:  self.ammo_plasma  = cvar("g_pickup_plasma_weapon");  break;
                        case ammo_fuel:    self.ammo_fuel    = cvar("g_pickup_fuel_weapon");    break;
                }
        }
 
-       #if 0
+       #if 0 // WEAPONTODO
        if(e.items)
        {
                for(i = 0, j = 1; i < 24; ++i, j *= 2)
@@ -160,7 +169,7 @@ void weapon_defaultspawnfunc(float wpn)
 
        // pickup anyway
        if(g_pickup_weapons_anyway)
-               self.pickup_anyway = TRUE;
+               self.pickup_anyway = true;
 
        f = FL_WEAPON;
 
@@ -173,6 +182,8 @@ void weapon_defaultspawnfunc(float wpn)
                f |= FL_NO_WEAPON_STAY;
 
        StartItem(e.model, "weapons/weaponpickup.wav", self.respawntime, self.respawntimejitter, e.message, 0, e.weapon, f, weapon_pickupevalfunc, e.bot_pickupbasevalue);
+       #if 0 // WEAPONTODO
        if (self.modelindex) // don't precache if self was removed
                WEP_ACTION(e.weapon, WR_INIT);
+       #endif
 }