Merge branch 'zmaster'

This commit is contained in:
Christoph Oelckers 2016-01-05 16:49:00 +01:00
commit ea6c498470
12 changed files with 134 additions and 33 deletions

View file

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