ref: be2a2fb2dcef2423a4d140a7e4198ba30848a2b1
parent: 42d8c02ca47eda7ab9273dcc6ed83a269befbfdd
author: Simon Howard <[email protected]>
date: Sun Jan 29 10:05:05 EST 2006
Allow map things of type <= 0 - these are ignored by Vanilla Doom. Provides compatibility with plutonia.wad map12. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 354
--- 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 354 2006-01-29 15:05:05Z fraggle $
//
// Copyright(C) 1993-1996 Id Software, Inc.
// Copyright(C) 2005 Simon Howard
@@ -22,6 +22,9 @@
// 02111-1307, USA.
//
// $Log$
+// Revision 1.6 2006/01/29 15:05:05 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 354 2006-01-29 15:05:05Z fraggle $";
#include "i_system.h"
#include "z_zone.h"
@@ -778,6 +781,14 @@
deathmatch_p++;
}
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