[Scummvm-cvs-logs] scummvm master -> e469604f83e824cc705a912829214645cdd41d15

dreammaster dreammaster at scummvm.org
Sat May 30 17:50:33 CEST 2015


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:
e469604f83 SHERLOCK: Fix incorrect if statement


Commit: e469604f83e824cc705a912829214645cdd41d15
    https://github.com/scummvm/scummvm/commit/e469604f83e824cc705a912829214645cdd41d15
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-05-30T11:49:34-04:00

Commit Message:
SHERLOCK: Fix incorrect if statement

Changed paths:
    engines/sherlock/tattoo/tattoo_scene.cpp



diff --git a/engines/sherlock/tattoo/tattoo_scene.cpp b/engines/sherlock/tattoo/tattoo_scene.cpp
index dd96f33..66a66ba 100644
--- a/engines/sherlock/tattoo/tattoo_scene.cpp
+++ b/engines/sherlock/tattoo/tattoo_scene.cpp
@@ -244,7 +244,7 @@ void TattooScene::doBgAnimUpdateBgObjectsAndAnim() {
 			people[idx].adjustSprite();
 	}
 
-	if (_activeCAnim._images != nullptr != _activeCAnim._zPlacement != REMOVE) {
+	if (_activeCAnim._images != nullptr && _activeCAnim._zPlacement != REMOVE) {
 		_activeCAnim.getNextFrame();
 	}
 






More information about the Scummvm-git-logs mailing list