Merge branch 'master' into Melanosuchus/minigames

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / nades.qh

diff --git a/qcsrc/common/nades.qh b/qcsrc/common/nades.qh
index 49fad4a5504a41038ba2067cf2c33d60f64ca22a..505e2e2d541085369e74426b890bd9305f3fdc92 100644 (file)
--- a/qcsrc/common/nades.qh
+++ b/qcsrc/common/nades.qh
@@ -1,39 +1,8 @@
 #ifndef NADES_H
 #define NADES_H
 
-#if defined(CSQC)
-       #include "util-pre.qh"
-       #include "../client/sys-pre.qh"
-       #include "../dpdefs/csprogsdefs.qc"
-       #include "../client/sys-post.qh"
-       #include "../client/Defs.qc"
-       #include "../dpdefs/keycodes.qc"
-       #include "constants.qh"
-       #include "stats.qh"
-       #include "../warpzonelib/anglestransform.qh"
-       #include "../warpzonelib/mathlib.qh"
-       #include "../warpzonelib/common.qh"
-       #include "../warpzonelib/client.qh"
-       #include "playerstats.qh"
-       #include "teams.qh"
-       #include "util.qh"
-#elif defined(MENUQC)
-#elif defined(SVQC)
-       #include "util-pre.qh"
-    #include "../server/sys-pre.qh"
-    #include "../dpdefs/progsdefs.qc"
-    #include "../dpdefs/dpextensions.qc"
-    #include "../server/sys-post.qh"
-    #include "../warpzonelib/anglestransform.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/util_server.qh"
-    #include "../warpzonelib/server.qh"
-    #include "constants.qh"
-    #include "stats.qh"
-    #include "teams.qh"
-    #include "util.qh"
-#endif
+.float healer_lifetime;
+.float healer_radius;
 
 // use slots 70-100
 const int PROJECTILE_NADE = 71;
@@ -130,12 +99,16 @@ string Nade_TrailEffect(float proj, float nade_team)
                case PROJECTILE_NADE_MONSTER: return "nade_red";
                case PROJECTILE_NADE_MONSTER_BURN: return "nade_red_burn";
        }
-       
+
        return "";
 }
 
+#ifdef SVQC
+float healer_send(entity to, int sf);
+#endif
+
 #ifdef CSQC
 // misc functions
 void ent_healer();
 #endif // CSQC
-#endif
\ No newline at end of file
+#endif