zdoom/gzdoom-last-svn
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-last-svn.git synced 2025-06-04 11:10:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update to ZDoom r4129:

Browse source 
Fixed: Hexen's Floor_RaiseAndCrush is not the same action as the one used by Doom and which was used by ZDoom before r4053. Restored the old code and gave it a new special 99:Floor_RaiseAndCrushDoom.
    Fixed: Strife's slow Ceiling_CrushAndRaise lines do no actual damage.
    Fixed translations of Heretic linetype's that perform Floor_LowerToHighest with an offset.
    Added compatibility option for Claustrophobia 1024, map 01.


git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@1525 b0f79afe-0144-0410-b225-9a4edf0717df
This commit is contained in:
Christoph Oelckers 2013-02-10 09:17:26 +00:00
parent 9be6797076
commit b029b903b5
8 changed files with 34 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/p_floor.cpp
View file

@ -373,13 +373,18 @@ manual_floor:
floor->m_Direction = (floor->m_FloorDestDist > sec->floorplane.d) ? -1 : 1;
break;
case DFloor::floorRaiseAndCrushDoom:
floor->m_Crush = crush;
case DFloor::floorRaiseToLowestCeiling:
floor->m_Direction = 1;
newheight = sec->FindLowestCeilingSurrounding (&spot);
if (floortype == DFloor::floorRaiseAndCrushDoom)
newheight -= 8 * FRACUNIT;
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, ceilingheight);
floor->m_FloorDestDist = sec->floorplane.PointToDist (spot2,
floortype == DFloor::floorRaiseAndCrushDoom ? ceilingheight - 8*FRACUNIT : ceilingheight);
break;
case DFloor::floorRaiseToHighest: