summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Howard2005-09-06 21:15:08 +0000
committerSimon Howard2005-09-06 21:15:08 +0000
commit49cdaa04c2ecc626650bfb3826242234e138b1ea (patch)
tree46d4a017cfbbdd32317dad23478675d084c6dbf2
parent126b5a4c8d5ea4ad895110b5b0a25427fb98f73c (diff)
downloadchocolate-doom-49cdaa04c2ecc626650bfb3826242234e138b1ea.tar.gz
chocolate-doom-49cdaa04c2ecc626650bfb3826242234e138b1ea.tar.bz2
chocolate-doom-49cdaa04c2ecc626650bfb3826242234e138b1ea.zip
Silly me - i misread cph's patch and got the logic backwards
Subversion-branch: /trunk/chocolate-doom Subversion-revision: 78
-rw-r--r--src/p_telept.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/p_telept.c b/src/p_telept.c
index ff70e5e2..4ccef8ab 100644
--- a/src/p_telept.c
+++ b/src/p_telept.c
@@ -1,7 +1,7 @@
// Emacs style mode select -*- C++ -*-
//-----------------------------------------------------------------------------
//
-// $Id: p_telept.c 56 2005-08-29 22:00:04Z fraggle $
+// $Id: p_telept.c 78 2005-09-06 21:15:08Z fraggle $
//
// Copyright(C) 1993-1996 Id Software, Inc.
// Copyright(C) 2005 Simon Howard
@@ -22,6 +22,9 @@
// 02111-1307, USA.
//
// $Log$
+// Revision 1.5 2005/09/06 21:15:08 fraggle
+// Silly me - i misread cph's patch and got the logic backwards
+//
// Revision 1.4 2005/08/29 22:00:04 fraggle
// Add missing header to fix build
//
@@ -41,7 +44,7 @@
//-----------------------------------------------------------------------------
static const char
-rcsid[] = "$Id: p_telept.c 56 2005-08-29 22:00:04Z fraggle $";
+rcsid[] = "$Id: p_telept.c 78 2005-09-06 21:15:08Z fraggle $";
@@ -126,7 +129,7 @@ EV_Teleport
// fraggle: this was changed in final doom,
// problem between normal doom2 1.9 and final doom
- if (gamemission == pack_tnt || gamemission == pack_plut)
+ if (gamemission != pack_tnt && gamemission != pack_plut)
thing->z = thing->floorz;
if (thing->player)