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

wjp wjp at usecode.org
Sat Nov 9 21:13:36 CET 2013


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:
ebc32defd5 KYRA: Fix wrong check order


Commit: ebc32defd51369b69187adf633f63cf12065e762
    https://github.com/scummvm/scummvm/commit/ebc32defd51369b69187adf633f63cf12065e762
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2013-11-09T12:12:42-08:00

Commit Message:
KYRA: Fix wrong check order

Changed paths:
    engines/kyra/animator_lok.cpp



diff --git a/engines/kyra/animator_lok.cpp b/engines/kyra/animator_lok.cpp
index c246eeb..945a51a 100644
--- a/engines/kyra/animator_lok.cpp
+++ b/engines/kyra/animator_lok.cpp
@@ -491,7 +491,7 @@ Animator_LoK::AnimObject *Animator_LoK::objectAddHead(AnimObject *queue, AnimObj
 }
 
 Animator_LoK::AnimObject *Animator_LoK::objectQueue(AnimObject *queue, AnimObject *add) {
-	if (add->drawY <= queue->drawY || !queue) {
+	if (!queue || add->drawY <= queue->drawY) {
 		add->nextAnimObject = queue;
 		return add;
 	}






More information about the Scummvm-git-logs mailing list