Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
GLK: FROTZ: Only wait for keypress in Beyond Zork title if mg1 present
  • Loading branch information
dreammaster committed Jan 5, 2019
1 parent e655c50 commit ece101e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions engines/glk/frotz/glk_interface.cpp
Expand Up @@ -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);
}
}
Expand Down
8 changes: 4 additions & 4 deletions engines/glk/glk_api.cpp
Expand Up @@ -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;
Expand All @@ -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;
Expand Down

0 comments on commit ece101e

Please sign in to comment.