Declare more ints as ints

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / buffs.qc

diff --git a/qcsrc/common/buffs.qc b/qcsrc/common/buffs.qc
index f9075d05a5c5e63f880ffeb09d638318a614acf1..cbb40d13de0e37fdd32c843b199ecff0c49aa374 100644 (file)
--- a/qcsrc/common/buffs.qc
+++ b/qcsrc/common/buffs.qc
@@ -1,4 +1,15 @@
-vector Buff_Color(float buff_id)
+#if defined(CSQC)
+       #include "../dpdefs/csprogsdefs.qh"
+       #include "../client/defs.qh"
+       #include "buffs.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/progsdefs.qh"
+    #include "../dpdefs/dpextensions.qh"
+    #include "buffs.qh"
+#endif
+
+vector Buff_Color(int buff_id)
 {
        entity e;
        for(e = Buff_Type_first; e; e = e.enemy)
@@ -7,7 +18,7 @@ vector Buff_Color(float buff_id)
        return '1 1 1';
 }
 
-string Buff_PrettyName(float buff_id)
+string Buff_PrettyName(int buff_id)
 {
        entity e;
        for(e = Buff_Type_first; e; e = e.enemy)
@@ -16,7 +27,7 @@ string Buff_PrettyName(float buff_id)
        return "";
 }
 
-string Buff_Name(float buff_id)
+string Buff_Name(int buff_id)
 {
        entity e;
        for(e = Buff_Type_first; e; e = e.enemy)
@@ -25,7 +36,7 @@ string Buff_Name(float buff_id)
        return "";
 }
 
-float Buff_Type_FromName(string buff_name)
+int Buff_Type_FromName(string buff_name)
 {
        entity e;
        for(e = Buff_Type_first; e; e = e.enemy)
@@ -34,7 +45,17 @@ float Buff_Type_FromName(string buff_name)
        return 0;
 }
 
-float Buff_Skin(float buff_id)
+int Buff_Type_FromSprite(string buff_sprite)
+{
+       entity e;
+       for(e = Buff_Type_first; e; e = e.enemy)
+               if(buff_sprite == e.model2)
+                       return e.items;
+       return 0;
+}
+
+
+int Buff_Skin(float buff_id)
 {
        entity e;
        for(e = Buff_Type_first; e; e = e.enemy)
@@ -42,3 +63,12 @@ float Buff_Skin(float buff_id)
                        return e.skin;
        return 0;
 }
+
+string Buff_Sprite(int buff_id)
+{
+       entity e;
+       for(e = Buff_Type_first; e; e = e.enemy)
+               if(buff_id == e.items)
+                       return e.model2;
+       return "";
+}