[chocolate-doom] 20/26: Allow map things of type <= 0 - these are ignored by Vanilla Doom. Provides compatibility with plutonia.wad map12.

[Jonathan Dowland]

This is an automated email from the git hooks/post-receive script.

jmtd pushed a commit to annotated tag chocolate-doom-0.1.4
in repository chocolate-doom.

commit 05bdef84eba66103a7d1eacfa0c26e2a43dfecad
Author: Simon Howard <fraggle at gmail.com>
Date:   Sun Jan 29 15:05:11 2006 +0000

    Allow map things of type <= 0 - these are ignored by Vanilla Doom.
    Provides compatibility with plutonia.wad map12.
    
    Subversion-branch: /branches/CHOCOLATE_DOOM_0_1/chocolate-doom
    Subversion-revision: 355
---
 src/p_mobj.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/p_mobj.c b/src/p_mobj.c
index 5a0d41c..7cbf208 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*- 
 //-----------------------------------------------------------------------------
 //
-// $Id: p_mobj.c 223 2005-10-24 18:50:39Z fraggle $
+// $Id: p_mobj.c 355 2006-01-29 15:05:11Z fraggle $
 //
 // Copyright(C) 1993-1996 Id Software, Inc.
 // Copyright(C) 2005 Simon Howard
@@ -22,6 +22,9 @@
 // 02111-1307, USA.
 //
 // $Log$
+// Revision 1.5.2.1  2006/01/29 15:05:11  fraggle
+// Allow map things of type <= 0 - these are ignored by Vanilla Doom.  Provides compatibility with plutonia.wad map12.
+//
 // Revision 1.5  2005/10/24 18:50:39  fraggle
 // Allow the game version to emulate to be specified from the command line
 // and set compatibility options accordingly.
@@ -45,7 +48,7 @@
 //-----------------------------------------------------------------------------
 
 static const char
-rcsid[] = "$Id: p_mobj.c 223 2005-10-24 18:50:39Z fraggle $";
+rcsid[] = "$Id: p_mobj.c 355 2006-01-29 15:05:11Z fraggle $";
 
 #include "i_system.h"
 #include "z_zone.h"
@@ -779,6 +782,14 @@ void P_SpawnMapThing (mapthing_t* mthing)
 	}
 	return;
     }
+
+    if (mthing->type <= 0)
+    {
+        // Thing type 0 is actually "player -1 start".  
+        // For some reason, Vanilla Doom accepts/ignores this.
+
+        return;
+    }
 	
     // check for players specially
     if (mthing->type <= 4)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/chocolate-doom.git