Merge branch 'master' into terencehill/translate_colors_2

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / miscfunctions.qh

diff --git a/qcsrc/client/miscfunctions.qh b/qcsrc/client/miscfunctions.qh
index 3066fc6c642c8f7c5530732352911222e61bc18b..32563598b3f79ad2189aa2f2b48d54c9ea0e3b24 100644 (file)
--- a/qcsrc/client/miscfunctions.qh
+++ b/qcsrc/client/miscfunctions.qh
@@ -1,5 +1,4 @@
-#ifndef CLIENT_MISCFUNCTIONS_H
-#define CLIENT_MISCFUNCTIONS_H
+#pragma once
 
 entity players;
 entity teams;
@@ -35,6 +34,9 @@ float PreviewExists(string name);
 vector rotate(vector v, float a);
 
 
+#define IS_DEAD(s) (((s).classname == "csqcmodel") ? (s).csqcmodel_isdead : ((s).health <= 0))
+
+
 // decolorizes and team colors the player name when needed
 string playername(string thename, float teamid);
 
@@ -152,5 +154,3 @@ void Accuracy_LoadLevels();
 void Accuracy_LoadColors();
 
 vector Accuracy_GetColor(float accuracy);
-
-#endif