also make minstanex a superweapon

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

diff --git a/qcsrc/server/mutators/base.qc b/qcsrc/server/mutators/base.qc
index 8c0c9439cdb3c7a2a06f6b46178817aa02f2d486..fdf24edb75a399a526e085a7f28c11b6791c349c 100644 (file)
--- a/qcsrc/server/mutators/base.qc
+++ b/qcsrc/server/mutators/base.qc
@@ -83,21 +83,24 @@ float CallbackChain_Call(entity cb)
        entity e;
        r = 0;
        for(e = cb; e.cbc_next; e = e.cbc_next)
+       {
+               CallbackChain_ReturnValue = r;
                r |= e.cbc_next.cbc_func();
+       }
        return r; // callbacks return an error status, so 0 is default return value
 }
 
 #define MAX_MUTATORS 8
-float(float) mutators[MAX_MUTATORS];
-float Mutator_Add(float(float) func)
+string loaded_mutators[MAX_MUTATORS];
+float Mutator_Add(mutatorfunc_t func, string name)
 {
        float i, j;
        j = -1;
        for(i = 0; i < MAX_MUTATORS; ++i)
        {
-               if(func == mutators[i])
+               if(name == loaded_mutators[i])
                        return 1; // already added
-               if(func == func_null)
+               if(!loaded_mutators[i])
                        j = i;
        }
        if(j < 0)
@@ -105,7 +108,7 @@ float Mutator_Add(float(float) func)
                backtrace("WARNING: too many mutators, cannot add any more\n");
                return 0;
        }
-       mutators[j] = func;
+       loaded_mutators[j] = name;
 
        if(func(MUTATOR_ADDING) == 0)
        {
@@ -113,21 +116,21 @@ float Mutator_Add(float(float) func)
                return 1;
        }
        backtrace("WARNING: when adding mutator: adding failed\n");
-       Mutator_Remove(func);
+       Mutator_Remove(func, name);
        return 0;
 }
-void Mutator_Remove(float(float) func)
+void Mutator_Remove(float(float) func, string name)
 {
        float i;
        for(i = 0; i < MAX_MUTATORS; ++i)
-               if(func == mutators[i])
+               if(name == loaded_mutators[i])
                        break;
        if(i >= MAX_MUTATORS)
        {
                backtrace("WARNING: removing not-added mutator\n");
-               return 0;
+               return;
        }
-       mutators[i] = func_null;
+       loaded_mutators[i] = string_null;
 
        if(func(MUTATOR_REMOVING) != 0)
        {