From 004c622ee6e95ccc2f4e8835bcef421110dea364 Mon Sep 17 00:00:00 2001
From: Andrei Drexler <makro@rq3.com>
Date: Wed, 15 May 2002 17:13:22 +0000
Subject: [PATCH] Restored Q3A code for movers with health

---
 reaction/game/g_combat.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/reaction/game/g_combat.c b/reaction/game/g_combat.c
index 921a160d..accd0e51 100644
--- a/reaction/game/g_combat.c
+++ b/reaction/game/g_combat.c
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.75  2002/05/15 17:13:22  makro
+// Restored Q3A code for movers with health
+//
 // Revision 1.74  2002/05/15 13:58:35  makro
 // Health for movers
 //
@@ -1894,10 +1897,20 @@ void G_Damage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker,
 		attacker = &g_entities[ENTITYNUM_WORLD];
 	}
 
+	/* old code
 	if (targ->s.eType == ET_MOVER && targ->health <= 0) {
 		//Makro - added
 		if (targ->use) targ->use(targ, inflictor, attacker);
 		return;
+	}*/
+
+	// Makro - pasted back from the original code
+	// shootable doors / buttons don't actually have any health
+	if ( targ->s.eType == ET_MOVER ) {
+		if ( targ->use && targ->moverState == MOVER_POS1 ) {
+			targ->use( targ, inflictor, attacker );
+		}
+		return;
 	}
 
 	//Elder: from action source