From 1971f97fd63e043cf7d2571f7a9d25c097f01298 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Thu, 18 May 2006 15:03:35 +0000 Subject: [PATCH] - Fixed: In case the path to strife1.wad didn't contain any '/' an incorrect path was created for voices.wad. - Fixed: The code building the path for Strife's voices.wad called the wrong FString constructor. - Fixed: LS_Thing_SetGoal set MF5_CHASEGOAL in flags, not flags5. SVN r128 (trunk) --- docs/rh-log.txt | 7 +++++++ src/d_main.cpp | 4 ++-- src/p_lnspec.cpp | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/docs/rh-log.txt b/docs/rh-log.txt index 529bac529..8174813cf 100644 --- a/docs/rh-log.txt +++ b/docs/rh-log.txt @@ -1,3 +1,10 @@ +May 17, 2006 (Changes by Graf Zahl) +- Fixed: In case the path to strife1.wad didn't contain any '/' an + incorrect path was created for voices.wad. +- Fixed: The code building the path for Strife's voices.wad called the + wrong FString constructor. +- Fixed: LS_Thing_SetGoal set MF5_CHASEGOAL in flags, not flags5. + May 17, 2006 - Fixed: M_NotifyNewSave() needlessly created a copy of the filename. - Fixed: Any touching_sectorlists for actors unlinked in G_StartTravel() were diff --git a/src/d_main.cpp b/src/d_main.cpp index c83300215..c0cbc09c5 100644 --- a/src/d_main.cpp +++ b/src/d_main.cpp @@ -1616,11 +1616,11 @@ static EIWADType IdentifyVersion (const char *zdoom_wad) if (lastslash == -1) { - path = wads[pickwad].Path; + path = "";// wads[pickwad].Path; } else { - path = FString (wads[pickwad].Path, lastslash + 1); + path = FString (wads[pickwad].Path.GetChars(), lastslash + 1); } path += "voices.wad"; D_AddFile (path); diff --git a/src/p_lnspec.cpp b/src/p_lnspec.cpp index 74cff859e..9ffcbed51 100644 --- a/src/p_lnspec.cpp +++ b/src/p_lnspec.cpp @@ -1325,7 +1325,7 @@ FUNC(LS_Thing_SetGoal) { self->goal = goal; if (arg3 == 0) self->flags5 &=~ MF5_CHASEGOAL; - else self->flags |= MF5_CHASEGOAL; + else self->flags5 |= MF5_CHASEGOAL; if (self->target == NULL) { self->reactiontime = arg2 * TICRATE;