Merge branch 'master' into Mario/vaporizer_damage

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

diff --git a/qcsrc/common/buffs.qc b/qcsrc/common/buffs.qc
index cbb40d13de0e37fdd32c843b199ecff0c49aa374..612255dbb59588aa0b4351f79c73222946f0c8d4 100644 (file)
--- a/qcsrc/common/buffs.qc
+++ b/qcsrc/common/buffs.qc
@@ -1,74 +1,10 @@
 #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
+#include "buffs.qh"
 
-vector Buff_Color(int buff_id)
-{
-       entity e;
-       for(e = Buff_Type_first; e; e = e.enemy)
-               if(buff_id == e.items)
-                       return e.colormod;
-       return '1 1 1';
-}
-
-string Buff_PrettyName(int buff_id)
-{
-       entity e;
-       for(e = Buff_Type_first; e; e = e.enemy)
-               if(buff_id == e.items)
-                       return e.message;
-       return "";
-}
-
-string Buff_Name(int buff_id)
-{
-       entity e;
-       for(e = Buff_Type_first; e; e = e.enemy)
-               if(buff_id == e.items)
-                       return e.netname;
-       return "";
-}
-
-int Buff_Type_FromName(string buff_name)
-{
-       entity e;
-       for(e = Buff_Type_first; e; e = e.enemy)
-               if(buff_name == e.netname)
-                       return e.items;
-       return 0;
-}
-
-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)
-               if(buff_id == e.items)
-                       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 "";
-}