diff options
| -rw-r--r-- | engines/simon/items.cpp | 35 | ||||
| -rw-r--r-- | engines/simon/simon.h | 1 |
2 files changed, 16 insertions, 20 deletions
diff --git a/engines/simon/items.cpp b/engines/simon/items.cpp index 884adb2643..5c7b1b05c3 100644 --- a/engines/simon/items.cpp +++ b/engines/simon/items.cpp @@ -884,7 +884,22 @@ void SimonEngine::o1_defWindow() { uint h = getVarOrWord(); uint flags = getVarOrWord(); uint fill_color = getVarOrWord(); - o_defineWindow(num, x, y, w, h, flags, fill_color, 0); + uint text_color = 0; + + num &= 7; + + if (_windowArray[num]) + closeWindow(num); + + _windowArray[num] = openWindow(x, y, w, h, flags, fill_color, text_color); + + if (num == _curWindow) { + _textWindow = _windowArray[num]; + if (getGameType() == GType_FF) + showmessage_helper_3(_textWindow->textColumn, _textWindow->width); + else + showmessage_helper_3(_textWindow->textLength, _textWindow->textMaxLength); + } } void SimonEngine::o1_window() { @@ -1991,22 +2006,4 @@ void SimonEngine::o_kill_sprite_simon2(uint a, uint b) { _lockWord &= ~0x8000; } -/* OK */ -void SimonEngine::o_defineWindow(uint num, uint x, uint y, uint w, uint h, uint flags, uint fill_color, uint text_color) { - num &= 7; - - if (_windowArray[num]) - closeWindow(num); - - _windowArray[num] = openWindow(x, y, w, h, flags, fill_color, text_color); - - if (num == _curWindow) { - _textWindow = _windowArray[num]; - if (getGameType() == GType_FF) - showmessage_helper_3(_textWindow->textColumn, _textWindow->width); - else - showmessage_helper_3(_textWindow->textLength, _textWindow->textMaxLength); - } -} - } // End of namespace Simon diff --git a/engines/simon/simon.h b/engines/simon/simon.h index 3cb8bc89c6..1ad33039fc 100644 --- a/engines/simon/simon.h +++ b/engines/simon/simon.h @@ -700,7 +700,6 @@ protected: void loadZone(uint vga_res); void loadSprite(uint windowNum, uint vga_res, uint vga_sprite_id, uint x, uint y, uint palette); - void o_defineWindow(uint a, uint b, uint c, uint d, uint e, uint f, uint g, uint h); void playSpeech(uint speech_id, uint vga_sprite_id); WindowBlock *openWindow(uint x, uint y, uint w, uint h, uint flags, uint fill_color, uint text_color); |