dprint a warning if we skip initialization

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

diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index 8e052e8377a0688a3b143abaf181375b6090274b..a9b829937e2a1f3f46905c13f1ae10b27bf0192f 100644 (file)
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -881,7 +881,7 @@ float want_weapon(string cvarprefix, entity weaponinfo, float allguns)
                else if(t < -1)
                        t = 0;
                else if (g_race || g_cts)
-                       t = (i == WEP_LASER);
+                       t = (i == WEP_SHOTGUN);
                else if (g_nexball)
                        t = 0; // weapon is set a few lines later
                else
@@ -1810,7 +1810,10 @@ void InitializeEntitiesRun()
             self = e_old;
         }
         //dprint("Delayed initialization: ", self.classname, "\n");
-        func();
+        if(func != func_null)
+            func();
+        else
+            dprint("^1WARNING: Skipped initialization: ", self.classname, "\n");
         self = e;
     }
 }