Merge branch 'fruitiex/balance' into fruitiex/ctsfix

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

diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index 445c5eb38df8e554cea13b9780cd99c2e8d8d131..225a3453f397e35496e9cb955930cc329ed3e85e 100644 (file)
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -880,8 +880,10 @@ float want_weapon(string cvarprefix, entity weaponinfo, float allguns)
                        t = (weaponinfo.spawnflags & WEP_FLAG_NORMAL);
                else if(t < -1)
                        t = 0;
                        t = (weaponinfo.spawnflags & WEP_FLAG_NORMAL);
                else if(t < -1)
                        t = 0;

-               else if (g_race || g_cts)
-                       t = (i == WEP_LASER);
+               else if (g_race)
+                       t = (i == WEP_LASER || i == WEP_SHOTGUN);
+               else if (g_cts)
+                       t = (i == WEP_SHOTGUN);

                else if (g_nexball)
                        t = 0; // weapon is set a few lines later
                else
                else if (g_nexball)
                        t = 0; // weapon is set a few lines later
                else


@@ -1214,6 +1216,8 @@ void readlevelcvars(void)
        sv_gentle = cvar("sv_gentle");
        sv_foginterval = cvar("sv_foginterval");
        g_cloaked = cvar("g_cloaked");
        sv_gentle = cvar("sv_gentle");
        sv_foginterval = cvar("sv_foginterval");
        g_cloaked = cvar("g_cloaked");

+    if(g_cts)
+        g_cloaked = 1; // always enable cloak in CTS

        g_jump_grunt = cvar("g_jump_grunt");
        g_footsteps = cvar("g_footsteps");
        g_grappling_hook = cvar("g_grappling_hook");
        g_jump_grunt = cvar("g_jump_grunt");
        g_footsteps = cvar("g_footsteps");
        g_grappling_hook = cvar("g_grappling_hook");


@@ -1752,6 +1756,14 @@ void objerror(string s)
     objerror_builtin(s);
 }
 
     objerror_builtin(s);
 }
 

+.float remove_except_protected_forbidden;
+void remove_except_protected(entity e)
+{
+       if(e.remove_except_protected_forbidden)
+               error("not allowed to remove this at this point");
+       remove_builtin(e);
+}
+

 void remove_unsafely(entity e)
 {
     remove_builtin(e);
 void remove_unsafely(entity e)
 {
     remove_builtin(e);


@@ -1802,6 +1814,11 @@ void InitializeEntitiesRun()
     entity startoflist;
     startoflist = initialize_entity_first;
     initialize_entity_first = world;
     entity startoflist;
     startoflist = initialize_entity_first;
     initialize_entity_first = world;

+    remove = remove_except_protected;
+    for (self = startoflist; self; self = self.initialize_entity_next)
+    {
+       self.remove_except_protected_forbidden = 1;
+    }

     for (self = startoflist; self; )
     {
         entity e;
     for (self = startoflist; self; )
     {
         entity e;


@@ -1811,6 +1828,7 @@ void InitializeEntitiesRun()
         self.initialize_entity_order = 0;
         self.initialize_entity = func_null;
         self.initialize_entity_next = world;
         self.initialize_entity_order = 0;
         self.initialize_entity = func_null;
         self.initialize_entity_next = world;

+       self.remove_except_protected_forbidden = 0;

         if (self.classname == "initialize_entity")
         {
             entity e_old;
         if (self.classname == "initialize_entity")
         {
             entity e_old;


@@ -1819,9 +1837,16 @@ void InitializeEntitiesRun()
             self = e_old;
         }
         //dprint("Delayed initialization: ", self.classname, "\n");
             self = e_old;
         }
         //dprint("Delayed initialization: ", self.classname, "\n");

-        func();
+        if(func != func_null)
+            func();
+        else
+        {
+            eprint(self);
+            backtrace(strcat("Null function in: ", self.classname, "\n"));
+        }

         self = e;
     }
         self = e;
     }

+    remove = remove_unsafely;

 }
 
 .float uncustomizeentityforclient_set;
 }
 
 .float uncustomizeentityforclient_set;