aboutsummaryrefslogtreecommitdiff
path: root/simon
diff options
context:
space:
mode:
authorTravis Howell2005-05-06 12:29:37 +0000
committerTravis Howell2005-05-06 12:29:37 +0000
commit6e06194dd9820a99b3a20189a48de4375a420803 (patch)
treef48f99ecb81b24d4a14552f369b09166a6848e06 /simon
parent1057d5fa696c5e1503f2d8e55bab939a0dcfa06f (diff)
downloadscummvm-rg350-6e06194dd9820a99b3a20189a48de4375a420803.tar.gz
scummvm-rg350-6e06194dd9820a99b3a20189a48de4375a420803.tar.bz2
scummvm-rg350-6e06194dd9820a99b3a20189a48de4375a420803.zip
Ooops
svn-id: r17932
Diffstat (limited to 'simon')
-rw-r--r--simon/vga.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/simon/vga.cpp b/simon/vga.cpp
index aad2253b65..7211ade7ce 100644
--- a/simon/vga.cpp
+++ b/simon/vga.cpp
@@ -1609,7 +1609,7 @@ void SimonEngine::vc_kill_sprite(uint file, uint sprite) {
vfs = _vgaSleepStructs;
while (vfs->ident != 0) {
- if ((_game & GF_SIMON1) || (vfs->sprite_id == _vgaCurSpriteId && vfs->cur_vga_file == _vgaCurFileId)) {
+ if (vfs->sprite_id == _vgaCurSpriteId && ((_game & GF_SIMON1) || vfs->cur_vga_file == _vgaCurFileId)) {
while (vfs->ident != 0) {
memcpy(vfs, vfs + 1, sizeof(VgaSleepStruct));
vfs++;
@@ -1625,7 +1625,7 @@ void SimonEngine::vc_kill_sprite(uint file, uint sprite) {
vte = _vgaTimerList;
while (vte->delay != 0) {
- if ((_game & GF_SIMON1) || (vte->sprite_id == _vgaCurSpriteId && vte->cur_vga_file == _vgaCurFileId)) {
+ if (vte->sprite_id == _vgaCurSpriteId && ((_game & GF_SIMON1) || vte->cur_vga_file == _vgaCurFileId)) {
delete_vga_timer(vte);
break;
}