diff --git a/src/p_lnspec.cpp b/src/p_lnspec.cpp index 3b99ae44b8..24b7b4fa2b 100644 --- a/src/p_lnspec.cpp +++ b/src/p_lnspec.cpp @@ -622,19 +622,19 @@ FUNC(LS_Pillar_Open) } FUNC(LS_Ceiling_LowerByValue) -// Ceiling_LowerByValue (tag, speed, height, change) +// Ceiling_LowerByValue (tag, speed, height, change, crush) { - return EV_DoCeiling (DCeiling::ceilLowerByValue, ln, arg0, SPEED(arg1), 0, arg2*FRACUNIT, -1, 0, CHANGE(arg3), false); + return EV_DoCeiling (DCeiling::ceilLowerByValue, ln, arg0, SPEED(arg1), 0, arg2*FRACUNIT, CRUSH(arg4), 0, CHANGE(arg3), false); } FUNC(LS_Ceiling_RaiseByValue) // Ceiling_RaiseByValue (tag, speed, height, change) { - return EV_DoCeiling (DCeiling::ceilRaiseByValue, ln, arg0, SPEED(arg1), 0, arg2*FRACUNIT, -1, 0, CHANGE(arg3), false); + return EV_DoCeiling (DCeiling::ceilRaiseByValue, ln, arg0, SPEED(arg1), 0, arg2*FRACUNIT, CRUSH(arg4), 0, CHANGE(arg3), false); } FUNC(LS_Ceiling_LowerByValueTimes8) -// Ceiling_LowerByValueTimes8 (tag, speed, height, change) +// Ceiling_LowerByValueTimes8 (tag, speed, height, change, crush) { return EV_DoCeiling (DCeiling::ceilLowerByValue, ln, arg0, SPEED(arg1), 0, arg2*FRACUNIT*8, -1, 0, CHANGE(arg3), false); } diff --git a/src/p_spec.cpp b/src/p_spec.cpp index 0a2891faf8..136f628d34 100644 --- a/src/p_spec.cpp +++ b/src/p_spec.cpp @@ -1193,7 +1193,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*FRACUNIT, 0); + new DDoor (sector, DDoor::doorWaitRaise, 2*FRACUNIT, TICRATE*30/7, 5*60*TICRATE, 0); break; case dFriction_Low: