X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmapobjects%2Fplatforms.qc;h=aae20894d36a6e4bb39b3ff5aaf421f7617c9d8f;hb=d44927502027bfa3ccd6ccc98d9b7d6285c182c3;hp=4747877314a3ac52f78c30c06233ec3f63dcf170;hpb=e51ce3d45d2852ca793118fc73da9c25f789101f;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/mapobjects/platforms.qc b/qcsrc/common/mapobjects/platforms.qc
index 474787731..aae20894d 100644
--- a/qcsrc/common/mapobjects/platforms.qc
+++ b/qcsrc/common/mapobjects/platforms.qc
@@ -93,7 +93,7 @@ void plat_center_touch(entity this, entity toucher)
 	if (!toucher.iscreature)
 		return;
 
-	if (toucher.health <= 0)
+	if (GetResource(toucher, RES_HEALTH) <= 0)
 		return;
 #elif defined(CSQC)
 	if (!IS_PLAYER(toucher))
@@ -114,7 +114,7 @@ void plat_outside_touch(entity this, entity toucher)
 	if (!toucher.iscreature)
 		return;
 
-	if (toucher.health <= 0)
+	if (GetResource(toucher, RES_HEALTH) <= 0)
 		return;
 #elif defined(CSQC)
 	if (!IS_PLAYER(toucher))
@@ -179,7 +179,7 @@ void plat_use(entity this, entity actor, entity trigger)
 
 void plat_reset(entity this)
 {
-	IFTARGETED
+	if(this.targetname && this.targetname != "")
 	{
 		setorigin(this, this.pos1);
 		this.state = STATE_UP;