From 6d23fc5683a0440a40f1fdda91167239fcaf4f41 Mon Sep 17 00:00:00 2001
From: Andrei Drexler <makro@rq3.com>
Date: Wed, 15 May 2002 13:58:35 +0000
Subject: [PATCH] Health for movers

---
 reaction/game/g_combat.c |  5 +++++
 reaction/game/game.plg   | 12 ++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/reaction/game/g_combat.c b/reaction/game/g_combat.c
index 28305b40..921a160d 100644
--- a/reaction/game/g_combat.c
+++ b/reaction/game/g_combat.c
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.74  2002/05/15 13:58:35  makro
+// Health for movers
+//
 // Revision 1.73  2002/05/15 05:38:36  niceass
 // Knife fix and disabled new headshot code
 //
@@ -1892,6 +1895,8 @@ void G_Damage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker,
 	}
 
 	if (targ->s.eType == ET_MOVER && targ->health <= 0) {
+		//Makro - added
+		if (targ->use) targ->use(targ, inflictor, attacker);
 		return;
 	}
 
diff --git a/reaction/game/game.plg b/reaction/game/game.plg
index cddadeee..4a8c14c1 100644
--- a/reaction/game/game.plg
+++ b/reaction/game/game.plg
@@ -6,13 +6,13 @@
 --------------------Configuration: game - Win32 Release--------------------
 </h3>
 <h3>Command Lines</h3>
-Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP536.tmp" with contents
+Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP54D.tmp" with contents
 [
 /nologo /G6 /ML /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FR"c:\reactionoutput/" /Fp"c:\reactionoutput/game.pch" /YX /Fo"c:\reactionoutput/" /Fd"c:\reactionoutput/" /FD /c 
-"C:\Games\Quake3\rq3source\reaction\game\g_mover.c"
+"C:\Games\Quake3\rq3source\reaction\game\g_combat.c"
 ]
-Creating command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP536.tmp" 
-Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP537.tmp" with contents
+Creating command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP54D.tmp" 
+Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP54E.tmp" with contents
 [
 kernel32.lib user32.lib winmm.lib /nologo /base:"0x20000000" /subsystem:windows /dll /incremental:no /pdb:"c:\reactionoutput/qagamex86.pdb" /map:"c:\reactionoutput/qagamex86.map" /machine:I386 /def:".\game.def" /out:"..\Release/qagamex86.dll" /implib:"c:\reactionoutput/qagamex86.lib" 
 \reactionoutput\ai_chat.obj
@@ -55,10 +55,10 @@ kernel32.lib user32.lib winmm.lib /nologo /base:"0x20000000" /subsystem:windows
 \reactionoutput\zcam.obj
 \reactionoutput\zcam_target.obj
 ]
-Creating command line "link.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP537.tmp"
+Creating command line "link.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP54E.tmp"
 <h3>Output Window</h3>
 Compiling...
-g_mover.c
+g_combat.c
 Linking...
    Creating library c:\reactionoutput/qagamex86.lib and object c:\reactionoutput/qagamex86.exp