zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-13 16:07:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Christoph Oelckers 2016-09-28 08:27:55 +02:00
commit d5e31aff1b
5 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/menu/menu.cpp
View file

@ -717,7 +717,11 @@ void M_Drawer (void)
if (DMenu::CurrentMenu != NULL && menuactive != MENU_Off) 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(); DMenu::CurrentMenu->Drawer();
} }
} }

2
src/p_floor.cpp
View file

@ -342,7 +342,7 @@ bool P_CreateFloor(sector_t *sec, DFloor::EFloor floortype, line_t *line,
ceilingheight = sec->FindLowestCeilingPoint(&spot2); ceilingheight = sec->FindLowestCeilingPoint(&spot2);
floor->m_FloorDestDist = sec->floorplane.PointToDist(spot, newheight); floor->m_FloorDestDist = sec->floorplane.PointToDist(spot, newheight);
if (sec->floorplane.ZatPointDist(spot2, floor->m_FloorDestDist) > ceilingheight) 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; break;
case DFloor::floorRaiseToHighest: case DFloor::floorRaiseToHighest:

4
src/s_sound.cpp
View file

@ -753,8 +753,8 @@ static void CalcPosVel(int type, const AActor *actor, const sector_t *sector,
if (type == SOURCE_Actor && actor != NULL) if (type == SOURCE_Actor && actor != NULL)
{ {
vel->X = float(actor->Vel.X * TICRATE); vel->X = float(actor->Vel.X * TICRATE);
vel->Y = float(actor->Vel.Y * TICRATE); vel->Y = float(actor->Vel.Z * TICRATE);
vel->Z = float(actor->Vel.Z * TICRATE); vel->Z = float(actor->Vel.Y * TICRATE);
} }
else else
{ {

1
wadsrc/static/filter/game-heretic/sndinfo.txt
View file

@ -151,6 +151,7 @@ $alias switches/exitbutn switches/normbutn // Heretic has no special exit button
plats/pt1_strt pstart plats/pt1_strt pstart
plats/pt1_stop pstop plats/pt1_stop pstop
plats/pt1_mid dormov plats/pt1_mid dormov
plats/pt2_mid stnmov
// //
// Door Sounds // Door Sounds

5
wadsrc/static/filter/game-heretic/sndseq.txt Normal file
View file

@ -0,0 +1,5 @@
:Platform
playuntildone plats/pt1_strt
playrepeat plats/pt2_mid
stopsound plats/pt1_stop
end