summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJames Haley2010-08-30 02:59:05 +0000
committerJames Haley2010-08-30 02:59:05 +0000
commit47ef09e20e7933491572e46cebc296db822205b8 (patch)
tree1bec3accc33bb6a1dfb0f82bcb33ec630dd40ad8 /src
parenta1497b9f334e35cb9214891a62a08fdb6137b82c (diff)
downloadchocolate-doom-47ef09e20e7933491572e46cebc296db822205b8.tar.gz
chocolate-doom-47ef09e20e7933491572e46cebc296db822205b8.tar.bz2
chocolate-doom-47ef09e20e7933491572e46cebc296db822205b8.zip
Temporarily disable I_Error in P_SpawnMapThing to allow testing with
Strife IWAD. Subversion-branch: /branches/strife-branch Subversion-revision: 1976
Diffstat (limited to 'src')
-rw-r--r--src/strife/p_mobj.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/src/strife/p_mobj.c b/src/strife/p_mobj.c
index a2cc227a..98ed031b 100644
--- a/src/strife/p_mobj.c
+++ b/src/strife/p_mobj.c
@@ -801,11 +801,16 @@ void P_SpawnMapThing (mapthing_t* mthing)
for (i=0 ; i< NUMMOBJTYPES ; i++)
if (mthing->type == mobjinfo[i].doomednum)
break;
-
+
+ /*
if (i==NUMMOBJTYPES)
- I_Error ("P_SpawnMapThing: Unknown type %i at (%i, %i)",
- mthing->type,
- mthing->x, mthing->y);
+ I_Error ("P_SpawnMapThing: Unknown type %i at (%i, %i)",
+ mthing->type,
+ mthing->x, mthing->y);
+ */
+ // haleyjd 08/29/10: STRIFE-FIXME: Temporarily disabled I_Error for testing purposes
+ if (i == NUMMOBJTYPES)
+ return;
// don't spawn keycards and players in deathmatch
if (deathmatch && mobjinfo[i].flags & MF_NOTDMATCH)