X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2Fmiscfunctions.qh;h=d259efe66036ed21404fac890ca60b32b9d28787;hp=f23a3976b55c6fcaba36a0ec2d5301f80ab0ba8f;hb=991de5e6922cd3c283de56c3249624f0f1bfe767;hpb=7e474d576080259e21690de30778b17029b5c0f2

diff --git a/qcsrc/client/miscfunctions.qh b/qcsrc/client/miscfunctions.qh
index f23a3976b5..d259efe660 100644
--- a/qcsrc/client/miscfunctions.qh
+++ b/qcsrc/client/miscfunctions.qh
@@ -34,7 +34,7 @@ float PreviewExists(string name);
 vector Rotate(vector v, float a);
 
 
-#define IS_DEAD(s) (((s).classname == "csqcmodel") ? (s).csqcmodel_isdead : ((s).health <= 0))
+#define IS_DEAD(s) (((s).classname == "csqcmodel") ? (s).csqcmodel_isdead : (GetResource((s), RES_HEALTH) <= 0))
 
 
 // decolorizes and team colors the player name when needed
@@ -110,7 +110,7 @@ vector _drawpic_sz;
 float _drawpic_oldsz;
 string _drawpic_picpath;
 #define drawpic_aspect(pos,pic,mySize,color,theAlpha,drawflag)\
-	MACRO_BEGIN {\
+	MACRO_BEGIN \
 		_drawpic_imgsize = draw_getimagesize(pic);\
 		if(_drawpic_imgsize != '0 0 0') {\
 			_drawpic_imgaspect = _drawpic_imgsize.x/_drawpic_imgsize.y;\
@@ -127,35 +127,35 @@ string _drawpic_picpath;
 					drawpic(pos + eY * 0.5 * (_drawpic_oldsz - _drawpic_sz.y), pic, _drawpic_sz, color, theAlpha, drawflag);\
 			}\
 		}\
-	} MACRO_END
+	MACRO_END
 
 // draw HUD element with image from gfx/hud/hud_skin/foo.tga if it exists, otherwise gfx/hud/default/foo.tga
 #define drawpic_aspect_skin(pos,pic,sz,color,theAlpha,drawflag)\
-	MACRO_BEGIN {\
+	MACRO_BEGIN \
 		_drawpic_picpath = strcat(hud_skin_path, "/", pic);\
 		if(precache_pic(_drawpic_picpath) == "") {\
 			_drawpic_picpath = strcat("gfx/hud/default/", pic);\
 		}\
 		drawpic_aspect(pos, _drawpic_picpath, sz, color, theAlpha, drawflag);\
 		_drawpic_picpath = string_null;\
-	} MACRO_END
+	MACRO_END
 
 // draw HUD element with image from gfx/hud/hud_skin/foo.tga if it exists, otherwise gfx/hud/default/foo.tga
 #define drawpic_skin(pos,pic,sz,color,theAlpha,drawflag)\
-	MACRO_BEGIN {\
+	MACRO_BEGIN \
 		_drawpic_picpath = strcat(hud_skin_path, "/", pic);\
 		if(precache_pic(_drawpic_picpath) == "") {\
 			_drawpic_picpath = strcat("gfx/hud/default/", pic);\
 		}\
 		drawpic(pos, _drawpic_picpath, sz, color, theAlpha, drawflag);\
 		_drawpic_picpath = string_null;\
-	} MACRO_END
+	MACRO_END
 
 void drawpic_aspect_skin_expanding(vector position, string pic, vector theScale, vector rgb, float theAlpha, float flag, float fadelerp);
 
 void drawpic_aspect_skin_expanding_two(vector position, string pic, vector theScale, vector rgb, float theAlpha, float flag, float fadelerp);
 
-#define SET_POS_AND_SZ_Y_ASPECT(allow_colors) MACRO_BEGIN {															\
+#define SET_POS_AND_SZ_Y_ASPECT(allow_colors) MACRO_BEGIN															\
 	float textaspect, oldsz;																						\
 	vector dfs = drawfontscale; \
 	drawfontscale = '1 1 0'; \
@@ -170,7 +170,7 @@ void drawpic_aspect_skin_expanding_two(vector position, string pic, vector theSc
 		sz.y = sz.x / textaspect; 																					\
 		pos.y += (oldsz - sz.y) * 0.5;																				\
 	}																												\
-} MACRO_END
+MACRO_END
 
 // drawstring wrapper to draw a string as large as possible with preserved aspect ratio into a box
 void drawstring_aspect(vector pos, string text, vector sz, vector color, float theAlpha, float drawflag);