diff --git a/src/menu/menu.cpp b/src/menu/menu.cpp index 5e5124b2ab..7e938230e7 100644 --- a/src/menu/menu.cpp +++ b/src/menu/menu.cpp @@ -717,7 +717,11 @@ void M_Drawer (void) if (DMenu::CurrentMenu != NULL && menuactive != MENU_Off) { - if (DMenu::CurrentMenu->DimAllowed()) screen->Dim(fade); + if (DMenu::CurrentMenu->DimAllowed()) + { + screen->Dim(fade); + V_SetBorderNeedRefresh(); + } DMenu::CurrentMenu->Drawer(); } } diff --git a/src/p_floor.cpp b/src/p_floor.cpp index 8d09ea2d52..62479e3404 100644 --- a/src/p_floor.cpp +++ b/src/p_floor.cpp @@ -342,7 +342,7 @@ bool P_CreateFloor(sector_t *sec, DFloor::EFloor floortype, line_t *line, ceilingheight = sec->FindLowestCeilingPoint(&spot2); floor->m_FloorDestDist = sec->floorplane.PointToDist(spot, newheight); if (sec->floorplane.ZatPointDist(spot2, floor->m_FloorDestDist) > ceilingheight) - floor->m_FloorDestDist = sec->floorplane.PointToDist(spot2, floortype == ceilingheight - height); + floor->m_FloorDestDist = sec->floorplane.PointToDist(spot2, ceilingheight - height); break; case DFloor::floorRaiseToHighest: diff --git a/src/s_sound.cpp b/src/s_sound.cpp index 866af965a1..06df0dbad4 100644 --- a/src/s_sound.cpp +++ b/src/s_sound.cpp @@ -753,8 +753,8 @@ static void CalcPosVel(int type, const AActor *actor, const sector_t *sector, if (type == SOURCE_Actor && actor != NULL) { vel->X = float(actor->Vel.X * TICRATE); - vel->Y = float(actor->Vel.Y * TICRATE); - vel->Z = float(actor->Vel.Z * TICRATE); + vel->Y = float(actor->Vel.Z * TICRATE); + vel->Z = float(actor->Vel.Y * TICRATE); } else { diff --git a/wadsrc/static/filter/game-heretic/sndinfo.txt b/wadsrc/static/filter/game-heretic/sndinfo.txt index b9f1fd7c3c..53017a49a8 100644 --- a/wadsrc/static/filter/game-heretic/sndinfo.txt +++ b/wadsrc/static/filter/game-heretic/sndinfo.txt @@ -151,6 +151,7 @@ $alias switches/exitbutn switches/normbutn // Heretic has no special exit button plats/pt1_strt pstart plats/pt1_stop pstop plats/pt1_mid dormov +plats/pt2_mid stnmov // // Door Sounds diff --git a/wadsrc/static/filter/game-heretic/sndseq.txt b/wadsrc/static/filter/game-heretic/sndseq.txt new file mode 100644 index 0000000000..405ebc8fbf --- /dev/null +++ b/wadsrc/static/filter/game-heretic/sndseq.txt @@ -0,0 +1,5 @@ +:Platform + playuntildone plats/pt1_strt + playrepeat plats/pt2_mid + stopsound plats/pt1_stop +end