OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge remote-tracking branch 'remotes/zdoom/master'

Browse source
This commit is contained in:
Christoph Oelckers 2016-01-19 10:46:59 +01:00
commit 069889c5ce
10 changed files with 86 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/p_3dfloors.cpp
View file

@ -340,7 +340,7 @@ void P_PlayerOnSpecial3DFloor(player_t* player)
{
//Water and DEATH FOG!!! heh
if (player->mo->Z() > rover->top.plane->ZatPoint(player->mo) ||
(player->mo->Z() + player->mo->height) < rover->bottom.plane->ZatPoint(player->mo))
player->mo->Top() < rover->bottom.plane->ZatPoint(player->mo))
continue;
}