diff --git a/docs/rh-log.txt b/docs/rh-log.txt index 3a08c5390..2d5ea9d5d 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 843dffcfe..779316062 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 18e9df4a2..f4361cb2b 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: