diff options
| -rw-r--r-- | engines/simon/items.cpp | 12 | ||||
| -rw-r--r-- | engines/simon/simon.cpp | 10 | ||||
| -rw-r--r-- | engines/simon/simon.h | 1 |
3 files changed, 10 insertions, 13 deletions
diff --git a/engines/simon/items.cpp b/engines/simon/items.cpp index 6e6eb29c0b..0256a1189a 100644 --- a/engines/simon/items.cpp +++ b/engines/simon/items.cpp @@ -842,8 +842,16 @@ void SimonEngine::o1_getChildren() { void SimonEngine::o1_picture() { // 96 - uint val = getVarOrWord(); - o_set_video_mode(getVarOrByte(), val); + uint vga_res = getVarOrWord(); + uint mode = getVarOrByte(); + + if (mode == 4) + vc29_stopAllSounds(); + + if (_lockWord & 0x10) + error("o1_picture: _lockWord & 0x10"); + + set_video_mode_internal(mode, vga_res); } void SimonEngine::o1_loadZone() { diff --git a/engines/simon/simon.cpp b/engines/simon/simon.cpp index 54c8c46988..e69d81eb83 100644 --- a/engines/simon/simon.cpp +++ b/engines/simon/simon.cpp @@ -2306,16 +2306,6 @@ void SimonEngine::o_unloadZone(uint a) { vpe->vgaFile2 = NULL; } -void SimonEngine::o_set_video_mode(uint mode, uint vga_res) { - if (mode == 4) - vc29_stopAllSounds(); - - if (_lockWord & 0x10) - error("o_set_video_mode_ex: _lockWord & 0x10"); - - set_video_mode_internal(mode, vga_res); -} - void SimonEngine::set_video_mode_internal(uint mode, uint vga_res_id) { uint num, num_lines; VgaPointersEntry *vpe; diff --git a/engines/simon/simon.h b/engines/simon/simon.h index e9b5cc476c..248e45cd87 100644 --- a/engines/simon/simon.h +++ b/engines/simon/simon.h @@ -692,7 +692,6 @@ protected: void handleVerbClicked(uint verb); - void o_set_video_mode(uint mode, uint vga_res); void set_video_mode_internal(uint mode, uint vga_res_id); void o_loadZone(uint vga_res); |