[Scummvm-git-logs] scummvm master -> 42814d228243cd44b92182828f4f7d9d255aaffc

dreammaster dreammaster at scummvm.org
Tue Jan 17 03:41:58 CET 2017


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:
42814d2282 TITANIC: Fix if check in CParrot frameMsg


Commit: 42814d228243cd44b92182828f4f7d9d255aaffc
    https://github.com/scummvm/scummvm/commit/42814d228243cd44b92182828f4f7d9d255aaffc
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-01-16T21:41:49-05:00

Commit Message:
TITANIC: Fix if check in CParrot frameMsg

Changed paths:
    engines/titanic/npcs/parrot.cpp


diff --git a/engines/titanic/npcs/parrot.cpp b/engines/titanic/npcs/parrot.cpp
index 9e6366a..a35a0d9 100644
--- a/engines/titanic/npcs/parrot.cpp
+++ b/engines/titanic/npcs/parrot.cpp
@@ -607,7 +607,7 @@ bool CParrot::FrameMsg(CFrameMsg *msg) {
 	if ((_npcFlags & NPCFLAG_10000) || hasActiveMovie())
 		return true;
 
-	if (_newXc > 64) {
+	if (ABS(_newXc - xp) > 64) {
 		_npcFlags |= NPCFLAG_10000 | NPCFLAG_20000;
 
 		if (_newXc >= xp) {





More information about the Scummvm-git-logs mailing list