summaryrefslogtreecommitdiff
path: root/src/strife/p_setup.c
diff options
context:
space:
mode:
authorJames Haley2010-09-05 23:28:16 +0000
committerJames Haley2010-09-05 23:28:16 +0000
commitf7768ad7dcfbefce525d846ce2f565dacf99f546 (patch)
tree8e5e071d261338984f90d901ff63cb10cf684f4e /src/strife/p_setup.c
parentcb79caae119fe361d0c5835ae91a9a1f0bf8147f (diff)
downloadchocolate-doom-f7768ad7dcfbefce525d846ce2f565dacf99f546.tar.gz
chocolate-doom-f7768ad7dcfbefce525d846ce2f565dacf99f546.tar.bz2
chocolate-doom-f7768ad7dcfbefce525d846ce2f565dacf99f546.zip
Corrections to some of Kaiser's previous commits. Also, significant work
on dialog engine, p_enemy code, and support for all new mapthing_t flag values in P_SpawnMapThing. Subversion-branch: /branches/strife-branch Subversion-revision: 2015
Diffstat (limited to 'src/strife/p_setup.c')
-rw-r--r--src/strife/p_setup.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/strife/p_setup.c b/src/strife/p_setup.c
index eeefe2dc..652d86df 100644
--- a/src/strife/p_setup.c
+++ b/src/strife/p_setup.c
@@ -342,6 +342,7 @@ void P_LoadThings (int lump)
// Do not spawn cool, new monsters if !commercial
// STRIFE-TODO: replace with isregistered stuff
+ /*
if (gamemode != commercial)
{
switch (SHORT(mt->type))
@@ -362,6 +363,7 @@ void P_LoadThings (int lump)
}
if (spawn == false)
break;
+ */
// Do spawn all other stuff.
spawnthing.x = SHORT(mt->x);