aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/dialogs.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'engines/scumm/dialogs.cpp')
-rw-r--r--engines/scumm/dialogs.cpp16
1 files changed, 6 insertions, 10 deletions
diff --git a/engines/scumm/dialogs.cpp b/engines/scumm/dialogs.cpp
index 21c7428621..8acb6eb6de 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"},
@@ -514,7 +510,7 @@ ValueDisplayDialog::ValueDisplayDialog(const Common::String& label, int minVal,
int val, uint16 incKey, uint16 decKey)
: GUI::Dialog(0, 0, 0, 0),
_label(label), _min(minVal), _max(maxVal),
- _value(val), _incKey(incKey), _decKey(decKey) {
+ _value(val), _incKey(incKey), _decKey(decKey), _timer(0) {
assert(_min <= _value && _value <= _max);
}
@@ -570,7 +566,7 @@ void ValueDisplayDialog::open() {
}
SubtitleSettingsDialog::SubtitleSettingsDialog(ScummEngine *scumm, int value)
- : InfoDialog(scumm, ""), _value(value) {
+ : InfoDialog(scumm, ""), _value(value), _timer(0) {
}