[Scummvm-git-logs] scummvm master -> d22e58bd6eda49aeb88acbe8c44f8787b1bf65b0

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
d22e58bd6e AGS: Restore legacy behaviour of MoveCharacterBlocking


Commit: d22e58bd6eda49aeb88acbe8c44f8787b1bf65b0
    https://github.com/scummvm/scummvm/commit/d22e58bd6eda49aeb88acbe8c44f8787b1bf65b0
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2021-07-10T19:24:08-07:00

Commit Message:
AGS: Restore legacy behaviour of MoveCharacterBlocking

>From upstream 5f65bb2edcf4138116a58393dc466fc20549ff41

Changed paths:
    engines/ags/engine/ac/global_character.cpp


diff --git a/engines/ags/engine/ac/global_character.cpp b/engines/ags/engine/ac/global_character.cpp
index 77d08ef42c..8f3c5160ee 100644
--- a/engines/ags/engine/ac/global_character.cpp
+++ b/engines/ags/engine/ac/global_character.cpp
@@ -368,11 +368,7 @@ int MoveCharacterBlocking(int chaa, int xx, int yy, int direct) {
 
 	GameLoopUntilNotMoving(&_GP(game).chars[chaa].walking);
 
-	// TODO: See https://github.com/adventuregamestudio/ags/issues/1331#issuecomment-877524051
-	// To summarize, looks like there was a whole system of returned values, which was later
-	// just scrapped, so the ways to restore it is either extensive testing of all these
-	// functions using pre-2.72 editor/engine, or reverse engineer the code maybe.
-	return 1;
+	return -1; // replicates legacy engine effect
 }
 
 int GetCharacterSpeechAnimationDelay(CharacterInfo *cha) {