Merge branch 'master' into floatcvt

This commit is contained in:
Christoph Oelckers 2016-03-24 18:32:47 +01:00
commit 4874fe2361
3 changed files with 4 additions and 2 deletions

View file

@ -1207,7 +1207,7 @@ void P_InitSectorSpecial(sector_t *sector, int special, bool nothinkers)
break;
case dSector_DoorRaiseIn5Mins:
new DDoor (sector, DDoor::doorWaitRaise, 2*FRACUNIT, TICRATE*30/7, 5*60*TICRATE, 0);
new DDoor (sector, DDoor::doorWaitRaise, 2*FRACUNIT, TICRATE*30/7, 0, 5*60*TICRATE);
break;
case dFriction_Low: