]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/blobdiff - qcsrc/server/resources.qc
Merge branch 'master' into terencehill/glowmod_color_fix
[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / resources.qc
index 6e63b2e3ee687a8750836eca16b643b175bb52ab..cc301130ef2cf3c7285093c90135639de36291e5 100644 (file)
@@ -5,8 +5,9 @@
 /// \author Lyberta
 /// \copyright GNU GPLv2 or any later version.
 
-#include "autocvars.qh"
-#include "miscfunctions.qh"
+#include <server/autocvars.qh>
+#include <server/mutators/_mod.qh>
+#include <server/world.qh>
 
 float GetResourceLimit(entity e, int res_type)
 {
@@ -230,30 +231,6 @@ void TakeResourceWithLimit(entity receiver, int res_type, float amount, float li
        TakeResource(receiver, res_type, amount);
 }
 
-void GiveOrTakeResource(entity receiver, int res_type, float amount)
-{
-       if(amount < 0)
-       {
-               TakeResource(receiver, res_type, amount * -1);
-       }
-       else
-       {
-               GiveResource(receiver, res_type, amount);
-       }
-}
-
-void GiveOrTakeResourceWithLimit(entity receiver, int res_type, float amount, float limit)
-{
-       if(amount < 0)
-       {
-               TakeResourceWithLimit(receiver, res_type, amount * -1, limit);
-       }
-       else
-       {
-               GiveResourceWithLimit(receiver, res_type, amount, limit);
-       }
-}
-
 int GetResourceType(.float res_field)
 {
        switch (res_field)