From 6e198e034bf8f4fe91968d5f558189751000a94c Mon Sep 17 00:00:00 2001 From: Randy Heit Date: Wed, 14 Jun 2006 23:22:14 +0000 Subject: [PATCH] - Removed my "backwards compatibility fix" for APROP_Speed. It turns out that in all the public versions where monster speed is not fixed point, you couldn't modify the monster's speed due to a bug in P_Move() anyway. So there's nothing to be backward compatible with. SVN r190 (trunk) --- docs/rh-log.txt | 8 ++++++++ src/g_level.cpp | 6 ------ src/p_acs.cpp | 4 ---- src/p_setup.cpp | 5 +++++ 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/docs/rh-log.txt b/docs/rh-log.txt index 29ea577a3..f16699900 100644 --- a/docs/rh-log.txt +++ b/docs/rh-log.txt @@ -1,3 +1,9 @@ +June 14, 2006 +- Removed my "backwards compatibility fix" for APROP_Speed. It turns out that + in all the public versions where monster speed is not fixed point, you + couldn't modify the monster's speed due to a bug in P_Move() anyway. So + there's nothing to be backward compatible with. + June 14, 2006 (Changes by Graf Zahl) - Fixed: Saving on maps that don't contain a MAPINFO definition didn't work. - Fixed: The Zip loader loaded all WADs inside a Zip into the lump directory. @@ -24,6 +30,8 @@ June 12-14, 2006 (Changes by Graf Zahl) loading of non-map data. June 13, 2006 +- Moved level scroller information out of G_InitLevelLocals() and into + P_FreeLevelData() so that it also gets performed at shutdown. - Fixed: In the past, ZDoom worked like Doom and used integral values for monster speeds. Now it uses fixed point so that an actor's speed property can always be considered is always fixed point. So DoSetActorProperty() diff --git a/src/g_level.cpp b/src/g_level.cpp index 2ca0aa5a2..466e997b9 100644 --- a/src/g_level.cpp +++ b/src/g_level.cpp @@ -2228,12 +2228,6 @@ void G_InitLevelLocals () compatflags.Callback(); NormalLight.ChangeFade (level.fadeto); - - if (level.Scrolls != NULL) - { - delete[] level.Scrolls; - level.Scrolls = NULL; - } } char *CalcMapName (int episode, int level) diff --git a/src/p_acs.cpp b/src/p_acs.cpp index b8179c9bd..57aee2a3a 100644 --- a/src/p_acs.cpp +++ b/src/p_acs.cpp @@ -2004,10 +2004,6 @@ void DLevelScript::DoSetActorProperty (AActor *actor, int property, int value) break; case APROP_Speed: - if (abs(value) < 128) - { // Backwards compatibility: Older ZDooms didn't use fixed point in A_Chase. - value <<= FRACBITS; - } actor->Speed = value; break; diff --git a/src/p_setup.cpp b/src/p_setup.cpp index 1cf3c4769..ff7ec8c1c 100644 --- a/src/p_setup.cpp +++ b/src/p_setup.cpp @@ -3257,6 +3257,11 @@ void P_FreeLevelData () zones = NULL; } P_FreeStrifeConversations (); + if (level.Scrolls != NULL) + { + delete[] level.Scrolls; + level.Scrolls = NULL; + } } extern msecnode_t *headsecnode;