diff --git a/docs/rh-log.txt b/docs/rh-log.txt index ac7efb8d9..b94d2010d 100644 --- a/docs/rh-log.txt +++ b/docs/rh-log.txt @@ -1,3 +1,8 @@ +July 8, 2006 (Changes by Graf Zahl) +- Fixed: Specifying 'strifefallingdamage' in MAPINFO cleared all other flags. +- Fixed: maxstepheight and maxdropoffheight were stored as ints instead of + fixed_t's by the DECORATE parser. + July 7, 2006 - Added actor replacement for DECORATE. This works at a higher level than using duplicate DoomEdNums and will affect all attempts to spawn the diff --git a/src/g_level.cpp b/src/g_level.cpp index d448f565d..86e99edfe 100644 --- a/src/g_level.cpp +++ b/src/g_level.cpp @@ -335,7 +335,7 @@ MapHandlers[] = { MITYPE_SCFLAGS, LEVEL_FALLDMG_HX, ~LEVEL_FALLDMG_ZD }, { MITYPE_SCFLAGS, LEVEL_FALLDMG_ZD, ~LEVEL_FALLDMG_HX }, { MITYPE_SCFLAGS, LEVEL_FALLDMG_ZD, ~LEVEL_FALLDMG_HX }, - { MITYPE_SCFLAGS, LEVEL_FALLDMG_ZD|LEVEL_FALLDMG_HX, 0 }, + { MITYPE_SETFLAG, LEVEL_FALLDMG_ZD|LEVEL_FALLDMG_HX, 0 }, { MITYPE_SCFLAGS, 0, ~(LEVEL_FALLDMG_ZD|LEVEL_FALLDMG_HX) }, { MITYPE_SETFLAG, LEVEL_NOALLIES, 0 }, { MITYPE_INT, lioffset(cdtrack), 0 }, diff --git a/src/thingdef.cpp b/src/thingdef.cpp index 31baecea8..cce554d4d 100644 --- a/src/thingdef.cpp +++ b/src/thingdef.cpp @@ -2986,7 +2986,7 @@ static void ActorDecal (AActor *defaults, Baggage &bag) static void ActorMaxStepHeight (AActor *defaults, Baggage &bag) { SC_MustGetNumber (); - defaults->MaxStepHeight=sc_Number; + defaults->MaxStepHeight=sc_Number * FRACUNIT; } //========================================================================== @@ -2995,7 +2995,7 @@ static void ActorMaxStepHeight (AActor *defaults, Baggage &bag) static void ActorMaxDropoffHeight (AActor *defaults, Baggage &bag) { SC_MustGetNumber (); - defaults->MaxDropOffHeight=sc_Number; + defaults->MaxDropOffHeight=sc_Number * FRACUNIT; } //==========================================================================