diff options
author | Simon Howard | 2011-10-22 18:33:37 +0000 |
---|---|---|
committer | Simon Howard | 2011-10-22 18:33:37 +0000 |
commit | d64626ff417323e05a479caeee02168c1eafd798 (patch) | |
tree | 277e45c43d42875fb6cb3e3570224977bbc3a48c /src/doom/p_telept.c | |
parent | cfd1a3f8f739b049af04b9e637db9a51758cef27 (diff) | |
parent | 71d316afb2ae7191a4ef6fac2d757238ae3616e1 (diff) | |
download | chocolate-doom-d64626ff417323e05a479caeee02168c1eafd798.tar.gz chocolate-doom-d64626ff417323e05a479caeee02168c1eafd798.tar.bz2 chocolate-doom-d64626ff417323e05a479caeee02168c1eafd798.zip |
Merge from trunk.
Subversion-branch: /branches/v2-branch
Subversion-revision: 2458
Diffstat (limited to 'src/doom/p_telept.c')
-rw-r--r-- | src/doom/p_telept.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/doom/p_telept.c b/src/doom/p_telept.c index abd307c5..73c3e9b5 100644 --- a/src/doom/p_telept.c +++ b/src/doom/p_telept.c @@ -104,19 +104,18 @@ EV_Teleport if (!P_TeleportMove (thing, m->x, m->y)) return 0; - - // fraggle: this was changed in final doom, - // problem between normal doom2 1.9 and final doom - // - // Note that although chex.exe is based on Final Doom, - // it does not have this quirk. - if (gameversion < exe_final || gameversion == exe_chex) + // The first Final Doom executable does not set thing->z + // when teleporting. This quirk is unique to this + // particular version; the later version included in + // some versions of the Id Anthology fixed this. + + if (gameversion != exe_final) thing->z = thing->floorz; - + if (thing->player) thing->player->viewz = thing->z+thing->player->viewheight; - + // spawn teleport fog at source and destination fog = P_SpawnMobj (oldx, oldy, oldz, MT_TFOG); S_StartSound (fog, sfx_telept); |