diff options
author | Simon Howard | 2005-08-23 09:54:23 +0000 |
---|---|---|
committer | Simon Howard | 2005-08-23 09:54:23 +0000 |
commit | c04c42706a8f60711a716cf883f23bcf104591ea (patch) | |
tree | 494a369a41a9ca6f20630f5d4cc4c48e762043b1 | |
parent | dd39af700d1d726e96b386b07a29e09cb2c9825a (diff) | |
download | chocolate-doom-c04c42706a8f60711a716cf883f23bcf104591ea.tar.gz chocolate-doom-c04c42706a8f60711a716cf883f23bcf104591ea.tar.bz2 chocolate-doom-c04c42706a8f60711a716cf883f23bcf104591ea.zip |
Demo sync problem with teleports and final doom
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 54
-rw-r--r-- | src/p_telept.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/p_telept.c b/src/p_telept.c index 1d1f7197..d8e3b659 100644 --- a/src/p_telept.c +++ b/src/p_telept.c @@ -1,7 +1,7 @@ // Emacs style mode select -*- C++ -*- //----------------------------------------------------------------------------- // -// $Id: p_telept.c 8 2005-07-23 16:44:57Z fraggle $ +// $Id: p_telept.c 54 2005-08-23 09:54:23Z 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/08/23 09:54:23 fraggle +// Demo sync problem with teleports and final doom +// // Revision 1.2 2005/07/23 16:44:56 fraggle // Update copyright to GNU GPL // @@ -35,7 +38,7 @@ //----------------------------------------------------------------------------- static const char -rcsid[] = "$Id: p_telept.c 8 2005-07-23 16:44:57Z fraggle $"; +rcsid[] = "$Id: p_telept.c 54 2005-08-23 09:54:23Z fraggle $"; @@ -116,7 +119,12 @@ EV_Teleport if (!P_TeleportMove (thing, m->x, m->y)) return 0; - thing->z = thing->floorz; //fixme: not needed? + // fraggle: this was changed in final doom, + // problem between normal doom2 1.9 and final doom + + if (gamemission == pack_tnt || gamemission == pack_plutonia) + thing->z = thing->floorz; + if (thing->player) thing->player->viewz = thing->z+thing->player->viewheight; |