aboutsummaryrefslogtreecommitdiff
path: root/engines/agos/vga_ww.cpp
diff options
context:
space:
mode:
authorTravis Howell2007-06-19 11:50:22 +0000
committerTravis Howell2007-06-19 11:50:22 +0000
commitab9b9a1bf362e68f5f6a69462ef2b7c146e6e08f (patch)
treee0ce7e51deb2bd42f4487144f01bc9a5e7e1ffe3 /engines/agos/vga_ww.cpp
parentaeb9668d6641059866d745df4026ccc88985f864 (diff)
downloadscummvm-rg350-ab9b9a1bf362e68f5f6a69462ef2b7c146e6e08f.tar.gz
scummvm-rg350-ab9b9a1bf362e68f5f6a69462ef2b7c146e6e08f.tar.bz2
scummvm-rg350-ab9b9a1bf362e68f5f6a69462ef2b7c146e6e08f.zip
Cleanup, could cause regressions.
svn-id: r27547
Diffstat (limited to 'engines/agos/vga_ww.cpp')
-rw-r--r--engines/agos/vga_ww.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/agos/vga_ww.cpp b/engines/agos/vga_ww.cpp
index 571dc25cec..09b51ecfe1 100644
--- a/engines/agos/vga_ww.cpp
+++ b/engines/agos/vga_ww.cpp
@@ -88,7 +88,7 @@ void AGOSEngine_Simon1::vcStopAnimation(uint zone, uint sprite) {
vfs = _waitSyncTable;
while (vfs->ident != 0) {
- if (vfs->sprite_id == _vgaCurSpriteId && ((getGameType() == GType_SIMON1) || vfs->cur_vga_file == _vgaCurZoneNum)) {
+ if (vfs->sprite_id == _vgaCurSpriteId && vfs->cur_vga_file == _vgaCurZoneNum) {
while (vfs->ident != 0) {
memcpy(vfs, vfs + 1, sizeof(VgaSleepStruct));
vfs++;
@@ -104,7 +104,7 @@ void AGOSEngine_Simon1::vcStopAnimation(uint zone, uint sprite) {
vte = _vgaTimerList;
while (vte->delay) {
- if (vte->sprite_id == _vgaCurSpriteId && (getGameType() == GType_SIMON1 || vte->cur_vga_file == _vgaCurZoneNum)) {
+ if (vte->sprite_id == _vgaCurSpriteId && vte->cur_vga_file == _vgaCurZoneNum) {
deleteVgaEvent(vte);
break;
}
@@ -127,8 +127,8 @@ void AGOSEngine::vc60_stopAnimation() {
zoneNum = vcReadNextWord();
sprite = vcReadNextWord();
} else {
- zoneNum = _vgaCurZoneNum;
sprite = vcReadNextWord();
+ zoneNum = sprite / 100;
}
vcStopAnimation(zoneNum, sprite);