OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'master' of https://github.com/rheit/zdoom

Browse source
This commit is contained in:
Christoph Oelckers 2016-01-06 17:16:06 +01:00
commit 1b20a06ec4
35 changed files with 1190 additions and 1042 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/p_3dfloors.cpp
View file

@ -345,8 +345,7 @@ void P_PlayerOnSpecial3DFloor(player_t* player)
}
// Apply sector specials
if (rover->model->special || rover->model->damageamount)
P_PlayerInSpecialSector(player, rover->model);
P_PlayerInSpecialSector(player, rover->model);
// Apply flat specials (using the ceiling!)
P_PlayerOnSpecialFlat(