[Scummvm-git-logs] scummvm master -> 8f31b1f8358a22c048e5e92c5b18f21bc6b03497

rvanlaar roland at rolandvanlaar.nl
Fri Aug 14 20:53:14 UTC 2020


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:
8f31b1f835 DIRECTOR: LINGO: Refetch the sprite after replace


Commit: 8f31b1f8358a22c048e5e92c5b18f21bc6b03497
    https://github.com/scummvm/scummvm/commit/8f31b1f8358a22c048e5e92c5b18f21bc6b03497
Author: Roland van Laar (roland at rolandvanlaar.nl)
Date: 2020-08-14T22:50:48+02:00

Commit Message:
DIRECTOR: LINGO: Refetch the sprite after replace

Refetch the sprite since the sprite is replaced in the if block on
channel->replaceSprite. Which leaves the pointer sp pointing
to the old sprite.

Changed paths:
    engines/director/lingo/lingo-builtins.cpp


diff --git a/engines/director/lingo/lingo-builtins.cpp b/engines/director/lingo/lingo-builtins.cpp
index a06708984f..760e1032f2 100644
--- a/engines/director/lingo/lingo-builtins.cpp
+++ b/engines/director/lingo/lingo-builtins.cpp
@@ -1866,7 +1866,7 @@ void LB::b_puppetSprite(int nargs) {
 				channel->_dirty = true;
 			}
 
-			sp->_puppet = state.asInt();
+			sc->getSpriteById(sprite.asInt())->_puppet = state.asInt();
 		} else {
 			warning("b_puppetSprite: sprite index out of bounds");
 		}




More information about the Scummvm-git-logs mailing list