From bbfc149bd742f076d21564070fe368a5c95e56a1 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Wed, 20 Sep 2006 08:09:00 +0000
Subject: [PATCH] - Fixed: Summoned friendly monsters added to the total kill
 count.

SVN r334 (trunk)
---
 docs/rh-log.txt | 3 +++
 src/d_net.cpp   | 4 ++++
 src/r_data.h    | 2 --
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index 3a08c53906..2d5ea9d5db 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,3 +1,6 @@
+September 20, 2006 (Changes by Graf Zahl)
+- Fixed: Summoned friendly monsters added to the total kill count.
+
 September 19, 2006
 - Added a dialog that gives the user the chance to fix things if the config
   could not be saved for some reason.
diff --git a/src/d_net.cpp b/src/d_net.cpp
index 843dffcfe1..779316062e 100644
--- a/src/d_net.cpp
+++ b/src/d_net.cpp
@@ -2128,6 +2128,10 @@ void Net_DoCommand (int type, BYTE **stream, int player)
 							source->z + 8 * FRACUNIT, ALLOW_REPLACE);
 						if (spawned != NULL && type == DEM_SUMMONFRIEND)
 						{
+							if (spawned->CountsAsKill()) 
+							{
+								level.total_monsters--;
+							}
 							spawned->FriendPlayer = player + 1;
 							spawned->flags |= MF_FRIENDLY;
 							spawned->LastHeard = players[player].mo;
diff --git a/src/r_data.h b/src/r_data.h
index 18e9df4a21..f4361cb2b3 100644
--- a/src/r_data.h
+++ b/src/r_data.h
@@ -348,8 +348,6 @@ struct TGAHeader
 
 #pragma pack()
 
-struct TGAHeader;
-
 class FTGATexture : public FTexture
 {
 public: