diff options
author | Paul Gilbert | 2019-01-04 23:14:19 -0800 |
---|---|---|
committer | Paul Gilbert | 2019-01-04 23:14:19 -0800 |
commit | ece101ee4a5c9623eb030f5c96ef2bfa2401bdb3 (patch) | |
tree | c65338fd77e710eb4735a9f28c36cba6efad927e | |
parent | e655c50d17fdaea56567226187d0bf389047811a (diff) | |
download | scummvm-rg350-ece101ee4a5c9623eb030f5c96ef2bfa2401bdb3.tar.gz scummvm-rg350-ece101ee4a5c9623eb030f5c96ef2bfa2401bdb3.tar.bz2 scummvm-rg350-ece101ee4a5c9623eb030f5c96ef2bfa2401bdb3.zip |
GLK: FROTZ: Only wait for keypress in Beyond Zork title if mg1 present
-rw-r--r-- | engines/glk/frotz/glk_interface.cpp | 4 | ||||
-rw-r--r-- | engines/glk/glk_api.cpp | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/engines/glk/frotz/glk_interface.cpp b/engines/glk/frotz/glk_interface.cpp index ef1917b7eb..cf90ddc93e 100644 --- a/engines/glk/frotz/glk_interface.cpp +++ b/engines/glk/frotz/glk_interface.cpp @@ -490,9 +490,9 @@ void GlkInterface::showBeyondZorkTitle() { if (saveSlot == -1) { winid_t win = glk_window_open(0, 0, 0, wintype_Graphics, 0); - glk_image_draw_scaled(win, 1, 0, 0, g_vm->_screen->w, g_vm->_screen->h); + if (glk_image_draw_scaled(win, 1, 0, 0, g_vm->_screen->w, g_vm->_screen->h)) + _events->waitForPress(); - _events->waitForPress(); glk_window_close(win, nullptr); } } diff --git a/engines/glk/glk_api.cpp b/engines/glk/glk_api.cpp index 6e0f33ea56..329f4e9b08 100644 --- a/engines/glk/glk_api.cpp +++ b/engines/glk/glk_api.cpp @@ -896,9 +896,9 @@ bool GlkAPI::glk_image_draw(winid_t win, uint image, int val1, int val2) { GraphicsWindow *gfxWin = dynamic_cast<GraphicsWindow *>(win); if (textWin) - textWin->drawPicture(image, val1, false, 0, 0); + return textWin->drawPicture(image, val1, false, 0, 0); else if (gfxWin) - gfxWin->drawPicture(image, val1, val2, false, 0, 0); + return gfxWin->drawPicture(image, val1, val2, false, 0, 0); } return false; @@ -913,9 +913,9 @@ bool GlkAPI::glk_image_draw_scaled(winid_t win, uint image, int val1, int val2, GraphicsWindow *gfxWin = dynamic_cast<GraphicsWindow *>(win); if (textWin) - textWin->drawPicture(image, val1, true, width, height); + return textWin->drawPicture(image, val1, true, width, height); else if (gfxWin) - gfxWin->drawPicture(image, val1, val2, true, width, height); + return gfxWin->drawPicture(image, val1, val2, true, width, height); } return false; |