From 63fa2d4906dbe119c552e993ae0f4cd2a4079ddb Mon Sep 17 00:00:00 2001 From: uruk Date: Mon, 9 Jun 2014 23:34:40 +0200 Subject: [PATCH] CGE2: Simplify if-statements. --- engines/cge2/cge2_main.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/engines/cge2/cge2_main.cpp b/engines/cge2/cge2_main.cpp index 764bdde5d83..99b0f26c21a 100644 --- a/engines/cge2/cge2_main.cpp +++ b/engines/cge2/cge2_main.cpp @@ -533,13 +533,11 @@ bool CGE2Engine::isHero(Sprite *spr) { void CGE2Engine::tick() { for (Sprite *spr = _vga->_showQ->first(); spr; spr = spr->_next) { - if (spr->_time) { - if (--spr->_time == 0) + if (spr->_time && (--spr->_time == 0)) spr->tick(); - } + if (_waitRef) { - if (_waitRef == spr->_ref) - if (spr->seqTest(_waitSeq)) + if (_waitRef == spr->_ref && spr->seqTest(_waitSeq)) _waitRef = 0; } }