aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoruruk2014-05-24 08:59:06 +0200
committeruruk2014-05-24 08:59:06 +0200
commit9c8c734a3c6c5e1af9436a08cde39fe5474e42ac (patch)
treedb33a1cb0651bf90dd8564c3a4098b95003d4c15
parent0566d095bbb6bc02d24b90bb3e7ac3b1bf42561b (diff)
downloadscummvm-rg350-9c8c734a3c6c5e1af9436a08cde39fe5474e42ac.tar.gz
scummvm-rg350-9c8c734a3c6c5e1af9436a08cde39fe5474e42ac.tar.bz2
scummvm-rg350-9c8c734a3c6c5e1af9436a08cde39fe5474e42ac.zip
CGE2: Revise CGE2Engine::tick().
-rw-r--r--engines/cge2/cge2_main.cpp14
1 files changed, 10 insertions, 4 deletions
diff --git a/engines/cge2/cge2_main.cpp b/engines/cge2/cge2_main.cpp
index fba0cd060d..5dcec22178 100644
--- a/engines/cge2/cge2_main.cpp
+++ b/engines/cge2/cge2_main.cpp
@@ -451,12 +451,18 @@ Sprite *CGE2Engine::locate(int ref) {
void CGE2Engine::tick() {
for (Sprite *spr = _vga->_showQ->first(); spr; spr = spr->_next) {
if (spr->_time) {
- if (!spr->_flags._hide) {
- if (--spr->_time == 0)
- spr->tick();
- }
+ if (--spr->_time == 0)
+ spr->tick();
+ }
+ if (_waitRef) {
+ if (_waitRef == _sprite->_ref)
+ if (spr->seqTest(_waitSeq))
+ _waitRef = 0;
}
}
+
+ //Mouse->Tick();
+ warning("STUB: CGE2Engine::tick() - Mouse");
}
void CGE2Engine::loadMap(int cav) {