zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-29 15:22:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed: Specifying 'strifefallingdamage' in MAPINFO cleared all other flags.

Browse source 
- Fixed: maxstepheight and maxdropoffheight were stored as ints instead of 
  fixed_t's by the DECORATE parser.


SVN r239 (trunk)
This commit is contained in:
Christoph Oelckers 2006-07-08 20:17:52 +00:00
parent 6695e255ce
commit 5541dc69f1
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
docs/rh-log.txt
View file

@ -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 July 7, 2006
- Added actor replacement for DECORATE. This works at a higher level than - Added actor replacement for DECORATE. This works at a higher level than
using duplicate DoomEdNums and will affect all attempts to spawn the using duplicate DoomEdNums and will affect all attempts to spawn the

2
src/g_level.cpp
View file

@ -335,7 +335,7 @@ MapHandlers[] =
{ MITYPE_SCFLAGS, LEVEL_FALLDMG_HX, ~LEVEL_FALLDMG_ZD }, { 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 }, { 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_SCFLAGS, 0, ~(LEVEL_FALLDMG_ZD|LEVEL_FALLDMG_HX) },
{ MITYPE_SETFLAG, LEVEL_NOALLIES, 0 }, { MITYPE_SETFLAG, LEVEL_NOALLIES, 0 },
{ MITYPE_INT, lioffset(cdtrack), 0 }, { MITYPE_INT, lioffset(cdtrack), 0 },

4
src/thingdef.cpp
View file

@ -2986,7 +2986,7 @@ static void ActorDecal (AActor *defaults, Baggage &bag)
static void ActorMaxStepHeight (AActor *defaults, Baggage &bag) static void ActorMaxStepHeight (AActor *defaults, Baggage &bag)
{ {
SC_MustGetNumber (); 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) static void ActorMaxDropoffHeight (AActor *defaults, Baggage &bag)
{ {
SC_MustGetNumber (); SC_MustGetNumber ();
defaults->MaxDropOffHeight=sc_Number; defaults->MaxDropOffHeight=sc_Number * FRACUNIT;
} }
//========================================================================== //==========================================================================