diff options
| author | Simon Howard | 2005-10-24 18:50:39 +0000 |
|---|---|---|
| committer | Simon Howard | 2005-10-24 18:50:39 +0000 |
| commit | 9f358870161c4866526cd85b04ffa1d2f3188899 (patch) | |
| tree | e14196dba8b4a11168c19f5792dd8edb9ed4ed74 /src/p_telept.c | |
| parent | b9be9f99ef4b050650018a9eee4478077255c9e8 (diff) | |
| download | chocolate-doom-9f358870161c4866526cd85b04ffa1d2f3188899.tar.gz chocolate-doom-9f358870161c4866526cd85b04ffa1d2f3188899.tar.bz2 chocolate-doom-9f358870161c4866526cd85b04ffa1d2f3188899.zip | |
Allow the game version to emulate to be specified from the command line
and set compatibility options accordingly.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 223
Diffstat (limited to 'src/p_telept.c')
| -rw-r--r-- | src/p_telept.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/p_telept.c b/src/p_telept.c index 4ccef8ab..5202246f 100644 --- a/src/p_telept.c +++ b/src/p_telept.c @@ -1,7 +1,7 @@ // Emacs style mode select -*- C++ -*- //----------------------------------------------------------------------------- // -// $Id: p_telept.c 78 2005-09-06 21:15:08Z fraggle $ +// $Id: p_telept.c 223 2005-10-24 18:50:39Z fraggle $ // // Copyright(C) 1993-1996 Id Software, Inc. // Copyright(C) 2005 Simon Howard @@ -22,6 +22,10 @@ // 02111-1307, USA. // // $Log$ +// Revision 1.6 2005/10/24 18:50:39 fraggle +// Allow the game version to emulate to be specified from the command line +// and set compatibility options accordingly. +// // Revision 1.5 2005/09/06 21:15:08 fraggle // Silly me - i misread cph's patch and got the logic backwards // @@ -44,7 +48,7 @@ //----------------------------------------------------------------------------- static const char -rcsid[] = "$Id: p_telept.c 78 2005-09-06 21:15:08Z fraggle $"; +rcsid[] = "$Id: p_telept.c 223 2005-10-24 18:50:39Z fraggle $"; @@ -129,7 +133,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 (gameversion >= exe_final) thing->z = thing->floorz; if (thing->player) |