zdoom
/
gzdoom-gles
mirror of https://github.com/ZDoom/gzdoom-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- fixed: The Floor_RaiseAndCrush types in Doom wait if blocked, therefore need Hexen crush mode. 

- fixed: Angle conversion in P_SpawnMapThing did not work for negative values due to use of an unsigned multiplication.


SVN r3053 (trunk)
This commit is contained in:
Christoph Oelckers 2010-12-16 14:39:17 +00:00
parent 6d614af4f4
commit 42de20a7e4
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/p_mobj.cpp
View File

@ -4336,7 +4336,7 @@ AActor *P_SpawnMapThing (FMapThing *mthing, int position)
mobj->tid = mthing->thingid;
mobj->AddToHash ();
mobj->PrevAngle = mobj->angle = (DWORD)((mthing->angle * UCONST64(0x100000000)) / 360);
mobj->PrevAngle = mobj->angle = (DWORD)((mthing->angle * CONST64(0x100000000)) / 360);
// Check if this actor's mapthing has a conversation defined
if (mthing->Conversation > 0)

8
wadsrc/static/xlat/base.txt
View File

@ -54,8 +54,8 @@ include "xlat/defines.i"
52 = WALK, Exit_Normal (0)
53 = WALK, Plat_PerpetualRaiseLip (tag, P_SLOW, PLATWAIT, 0)
54 = WALK, Plat_Stop (tag)
55 = USE, Floor_RaiseAndCrush (tag, F_SLOW, 10)
56 = WALK, Floor_RaiseAndCrush (tag, F_SLOW, 10)
55 = USE, Floor_RaiseAndCrush (tag, F_SLOW, 10, 2)
56 = WALK, Floor_RaiseAndCrush (tag, F_SLOW, 10, 2)
57 = WALK, Ceiling_CrushStop (tag)
58 = WALK, Floor_RaiseByValue (tag, F_SLOW, 24)
59 = WALK, Floor_RaiseByValueTxTy (tag, F_SLOW, 24)
@ -64,7 +64,7 @@ include "xlat/defines.i"
62 = USE|REP, Plat_DownWaitUpStayLip (tag, P_FAST, PLATWAIT, 0)
63 = USE|REP, Door_Raise (tag, D_SLOW, VDOORWAIT)
64 = USE|REP, Floor_RaiseToLowestCeiling (tag, F_SLOW)
65 = USE|REP, Floor_RaiseAndCrush (tag, F_SLOW, 10)
65 = USE|REP, Floor_RaiseAndCrush (tag, F_SLOW, 10, 2)
66 = USE|REP, Plat_UpByValueStayTx (tag, P_SLOW/2, 3)
67 = USE|REP, Plat_UpByValueStayTx (tag, P_SLOW/2, 4)
68 = USE|REP, Plat_RaiseAndStayTx0 (tag, P_SLOW/2)
@ -93,7 +93,7 @@ include "xlat/defines.i"
91 = WALK|REP, Floor_RaiseToLowestCeiling (tag, F_SLOW)
92 = WALK|REP, Floor_RaiseByValue (tag, F_SLOW, 24)
93 = WALK|REP, Floor_RaiseByValueTxTy (tag, F_SLOW, 24)
94 = WALK|REP, Floor_RaiseAndCrush (tag, F_SLOW, 10)
94 = WALK|REP, Floor_RaiseAndCrush (tag, F_SLOW, 10, 2)
95 = WALK|REP, Plat_RaiseAndStayTx0 (tag, P_SLOW/2)
96 = WALK|REP, Floor_RaiseByTexture (tag, F_SLOW)
97 = WALK|REP|MONST, Teleport (0, tag)