Merge remote-tracking branch 'origin/master' into terencehill/cursormode

[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 6978496802d1d61585b46ea45bb3d937e32db1f8..9be5745cb5e4ec24afbde80bee85c4e58bf94097 100644 (file)
--- a/qcsrc/server/mutators/base.qc
+++ b/qcsrc/server/mutators/base.qc
@@ -59,6 +59,7 @@ float CallbackChain_Remove(entity cb, float() func)
        entity e;
        float n;
        n = 0;
+       order = 0;
        for(e = cb; e.cbc_next; e = e.cbc_next)
        {
                while(e.cbc_next.cbc_func == func)
@@ -83,7 +84,10 @@ 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
 }