summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Howard2005-09-24 22:58:01 +0000
committerSimon Howard2005-09-24 22:58:01 +0000
commitaf3ae5978571d1982a09345105be2f9aec3d4928 (patch)
tree096652038bee2cf10689d57446efc1310c5903e8
parentfb63887447b18d2f12dbae6518c5210f90623a02 (diff)
downloadchocolate-doom-af3ae5978571d1982a09345105be2f9aec3d4928.tar.gz
chocolate-doom-af3ae5978571d1982a09345105be2f9aec3d4928.tar.bz2
chocolate-doom-af3ae5978571d1982a09345105be2f9aec3d4928.zip
Commit uac_dead fix
Subversion-branch: /trunk/chocolate-doom Subversion-revision: 127
-rw-r--r--NEWS2
-rw-r--r--src/p_enemy.c23
2 files changed, 21 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index 9668e5eb..2b4d6268 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
Application icon and version info included in Windows .exe files
Fixes for non-x86 architectures
+ Fix uac_dead.wad (platform drop on e1m8 should occur when all
+ bosses die, not just barons)
0.0.3 (2005-09-17):
Mouse acceleration code to emulate the behaviour of old
diff --git a/src/p_enemy.c b/src/p_enemy.c
index 09fb62eb..4bc4d3bd 100644
--- a/src/p_enemy.c
+++ b/src/p_enemy.c
@@ -1,7 +1,7 @@
// Emacs style mode select -*- C++ -*-
//-----------------------------------------------------------------------------
//
-// $Id: p_enemy.c 8 2005-07-23 16:44:57Z fraggle $
+// $Id: p_enemy.c 127 2005-09-24 22:58:01Z fraggle $
//
// Copyright(C) 1993-1996 Id Software, Inc.
// Copyright(C) 2005 Simon Howard
@@ -22,6 +22,9 @@
// 02111-1307, USA.
//
// $Log$
+// Revision 1.3 2005/09/24 22:58:01 fraggle
+// Commit uac_dead fix
+//
// Revision 1.2 2005/07/23 16:44:56 fraggle
// Update copyright to GNU GPL
//
@@ -37,7 +40,7 @@
//-----------------------------------------------------------------------------
static const char
-rcsid[] = "$Id: p_enemy.c 8 2005-07-23 16:44:57Z fraggle $";
+rcsid[] = "$Id: p_enemy.c 127 2005-09-24 22:58:01Z fraggle $";
#include <stdlib.h>
@@ -1643,8 +1646,20 @@ void A_BossDeath (mobj_t* mo)
if (gamemap != 8)
return;
- if (mo->type != MT_BRUISER)
- return;
+ // fraggle: disable this as it breaks uac_dead.wad.
+ // There is at least one version of Doom 1.9 which it is
+ // possible to play uac_dead through on. I think this was
+ // added here for Ultimate Doom.
+ //
+ // See lmps/doom/ultimate/uac_dead.zip in idgames for
+ // an example of a demo which goes out of sync if this
+ // is left in here.
+ //
+ // For the time being, I'm making the assumption that
+ // doing this is not going to break anything else.
+
+ // if (mo->type != MT_BRUISER)
+ // return;
break;
case 2: