diff options
author | Torbjörn Andersson | 2006-04-10 06:51:20 +0000 |
---|---|---|
committer | Torbjörn Andersson | 2006-04-10 06:51:20 +0000 |
commit | e67f1a99231fbb7fc640b0fff6fdf2e07aa8e1f0 (patch) | |
tree | 605d549da7e8f9c304ee7e0ddf0dd3c0bc3e3781 | |
parent | 46ef60e1b93603dc6fc6e7543959ca9efdfd3f2a (diff) | |
download | scummvm-rg350-e67f1a99231fbb7fc640b0fff6fdf2e07aa8e1f0.tar.gz scummvm-rg350-e67f1a99231fbb7fc640b0fff6fdf2e07aa8e1f0.tar.bz2 scummvm-rg350-e67f1a99231fbb7fc640b0fff6fdf2e07aa8e1f0.zip |
Merged o_vga_reset() into o1_killAnimate().
svn-id: r21744
-rw-r--r-- | engines/simon/items.cpp | 4 | ||||
-rw-r--r-- | engines/simon/simon.cpp | 6 | ||||
-rw-r--r-- | engines/simon/simon.h | 1 |
3 files changed, 3 insertions, 8 deletions
diff --git a/engines/simon/items.cpp b/engines/simon/items.cpp index c3d668a3bb..884adb2643 100644 --- a/engines/simon/items.cpp +++ b/engines/simon/items.cpp @@ -870,7 +870,9 @@ void SimonEngine::o1_stopAnimate() { void SimonEngine::o1_killAnimate() { // 100: vga reset - o_vga_reset(); + _lockWord |= 0x8000; + vc27_resetSprite(); + _lockWord &= ~0x8000; } void SimonEngine::o1_defWindow() { diff --git a/engines/simon/simon.cpp b/engines/simon/simon.cpp index 3c275a8fb0..54c8c46988 100644 --- a/engines/simon/simon.cpp +++ b/engines/simon/simon.cpp @@ -2863,12 +2863,6 @@ void SimonEngine::timer_callback() { } } -void SimonEngine::o_vga_reset() { - _lockWord |= 0x8000; - vc27_resetSprite(); - _lockWord &= ~0x8000; -} - bool SimonEngine::itemIsSiblingOf(uint16 a) { Item *item; diff --git a/engines/simon/simon.h b/engines/simon/simon.h index 74c73c873e..3cb8bc89c6 100644 --- a/engines/simon/simon.h +++ b/engines/simon/simon.h @@ -557,7 +557,6 @@ protected: void o_kill_sprite_simon1(uint a); void o_kill_sprite_simon2(uint a, uint b); - void o_vga_reset(); void changeWindow(uint a); void o_unk_103(); void closeWindow(uint a); |