diff options
Diffstat (limited to 'engines/scumm/dialogs.cpp')
-rw-r--r-- | engines/scumm/dialogs.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/engines/scumm/dialogs.cpp b/engines/scumm/dialogs.cpp index c22525b6f2..9b09f426ef 100644 --- a/engines/scumm/dialogs.cpp +++ b/engines/scumm/dialogs.cpp @@ -33,10 +33,8 @@ #include "scummhelp.h" #endif -#include "gui/about.h" - #include "gui/gui-manager.h" -#include "gui/widgets/list.h" +#include "gui/widget.h" #include "gui/ThemeEval.h" #include "scumm/dialogs.h" @@ -45,14 +43,12 @@ #include "scumm/imuse/imuse.h" #include "scumm/imuse_digi/dimuse.h" #include "scumm/verbs.h" -#include "audio/mididrv.h" -#include "audio/mixer.h" #ifndef DISABLE_HELP #include "scumm/help.h" #endif -#ifdef SMALL_SCREEN_DEVICE +#ifdef GUI_ENABLE_KEYSDIALOG #include "gui/KeysDialog.h" #endif @@ -153,8 +149,8 @@ static const ResString string_map_table_v6[] = { {91, "Unable to Find %s, (%c%d) Press Button."}, {92, "Error reading disk %c, (%c%d) Press Button."}, {93, "Game Paused. Press SPACE to Continue."}, - {94, "Are you sure you want to restart? (Y/N)"}, - {95, "Are you sure you want to quit? (Y/N)"}, + {94, "Are you sure you want to restart? (Y/N)Y"}, + {95, "Are you sure you want to quit? (Y/N)Y"}, {96, "Save"}, {97, "Load"}, {98, "Play"}, @@ -308,6 +304,8 @@ void HelpDialog::reflowLayout() { int16 x, y; uint16 w, h; + assert(lineHeight); + g_gui.xmlEval()->getWidgetData("ScummHelp.HelpText", x, y, w, h); // Make sure than we don't have more lines than what we can fit |