From 58259026371923e2aac7592b75f20432ab1109d2 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Wed, 23 Feb 2011 20:55:13 +0100 Subject: [PATCH] fix more issues... still doesn't compile --- qcsrc/server/mutators/base.qc | 6 +++--- qcsrc/server/mutators/base.qh | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/qcsrc/server/mutators/base.qc b/qcsrc/server/mutators/base.qc index 8c0c9439c..6f42ff8e9 100644 --- a/qcsrc/server/mutators/base.qc +++ b/qcsrc/server/mutators/base.qc @@ -88,8 +88,8 @@ float CallbackChain_Call(entity cb) } #define MAX_MUTATORS 8 -float(float) mutators[MAX_MUTATORS]; -float Mutator_Add(float(float) func) +var mutatorfunc_t mutators[MAX_MUTATORS]; +float Mutator_Add(mutatorfunc_t func) { float i, j; j = -1; @@ -125,7 +125,7 @@ void Mutator_Remove(float(float) func) if(i >= MAX_MUTATORS) { backtrace("WARNING: removing not-added mutator\n"); - return 0; + return; } mutators[i] = func_null; diff --git a/qcsrc/server/mutators/base.qh b/qcsrc/server/mutators/base.qh index aa581228b..f150d1ea9 100644 --- a/qcsrc/server/mutators/base.qh +++ b/qcsrc/server/mutators/base.qh @@ -16,8 +16,9 @@ float CallbackChain_Call(entity cb); #define MUTATOR_REMOVING 0 #define MUTATOR_ADDING 1 -float Mutator_Add(float(float) func); -void Mutator_Remove(float(float) func); // calls error() on fail +typedef float(float) mutatorfunc_t; +float Mutator_Add(mutatorfunc_t func); +void Mutator_Remove(mutatorfunc_t func); // calls error() on fail #define MUTATOR_ADD(name) Mutator_Add(MUTATOR_##name) #define MUTATOR_REMOVE(name) Mutator_Remove(MUTATOR_##name) -- 2.39.2