[Scummvm-cvs-logs] CVS: scummvm/scumm dialogs.cpp,1.94,1.95 dialogs.h,1.34,1.35 scumm.h,1.332,1.333 scummvm.cpp,2.503,2.504
Max Horn
fingolfin at users.sourceforge.net
Sun Dec 14 12:37:02 CET 2003
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv15790
Modified Files:
dialogs.cpp dialogs.h scumm.h scummvm.cpp
Log Message:
Let's spell it out: c-o-d-e r-e-u-s-e :-)
Index: dialogs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/dialogs.cpp,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -d -r1.94 -r1.95
--- dialogs.cpp 14 Dec 2003 15:23:43 -0000 1.94
+++ dialogs.cpp 14 Dec 2003 20:36:37 -0000 1.95
@@ -606,30 +606,22 @@
: InfoDialog(scumm, 10) {
}
-ConfirmExitDialog::ConfirmExitDialog(ScummEngine *scumm)
- : InfoDialog(scumm, "Do you really want to quit (y/n)?") {
-}
-
-void ConfirmExitDialog::handleKeyDown(uint16 ascii, int keycode, int modifiers) {
- if (tolower(ascii) == 'n') { // Close exit dialog if n key is pressed
- setResult(0);
- close();
- } else if (tolower(ascii) == 'y') { // Quit if y key is pressed
- setResult(1);
+void PauseDialog::handleKeyDown(uint16 ascii, int keycode, int modifiers) {
+ if (ascii == ' ') // Close pause dialog if space key is pressed
close();
- } else
+ else
ScummDialog::handleKeyDown(ascii, keycode, modifiers);
}
-ConfirmRestartDialog::ConfirmRestartDialog(ScummEngine *scumm)
- : InfoDialog(scumm, "Do you really want to restart (y/n)?") {
+ConfirmDialog::ConfirmDialog(ScummEngine *scumm, const String& message)
+ : InfoDialog(scumm, message) {
}
-void ConfirmRestartDialog::handleKeyDown(uint16 ascii, int keycode, int modifiers) {
- if (tolower(ascii) == 'n') { // Close restart dialog if n key is pressed
+void ConfirmDialog::handleKeyDown(uint16 ascii, int keycode, int modifiers) {
+ if (tolower(ascii) == 'n') {
setResult(0);
close();
- } else if (tolower(ascii) == 'y') { // Restart if y key is pressed
+ } else if (tolower(ascii) == 'y') {
setResult(1);
close();
} else
Index: dialogs.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/dialogs.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- dialogs.h 14 Dec 2003 15:04:05 -0000 1.34
+++ dialogs.h 14 Dec 2003 20:36:37 -0000 1.35
@@ -142,24 +142,12 @@
class PauseDialog : public InfoDialog {
public:
PauseDialog(ScummEngine *scumm);
- virtual void handleKeyDown(uint16 ascii, int keycode, int modifiers)
- {
- if (ascii == ' ') // Close pause dialog if space key is pressed
- close();
- else
- ScummDialog::handleKeyDown(ascii, keycode, modifiers);
- }
-};
-
-class ConfirmExitDialog : public InfoDialog {
-public:
- ConfirmExitDialog(ScummEngine *scumm);
virtual void handleKeyDown(uint16 ascii, int keycode, int modifiers);
};
-class ConfirmRestartDialog : public InfoDialog {
+class ConfirmDialog : public InfoDialog {
public:
- ConfirmRestartDialog(ScummEngine *scumm);
+ ConfirmDialog(ScummEngine *scumm, const String& message);
virtual void handleKeyDown(uint16 ascii, int keycode, int modifiers);
};
Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.332
retrieving revision 1.333
diff -u -d -r1.332 -r1.333
--- scumm.h 14 Dec 2003 15:04:05 -0000 1.332
+++ scumm.h 14 Dec 2003 20:36:37 -0000 1.333
@@ -351,8 +351,6 @@
Dialog *_pauseDialog;
Dialog *_optionsDialog;
Dialog *_mainMenuDialog;
- Dialog *_confirmExitDialog;
- Dialog *_confirmRestartDialog;
protected:
int runDialog(Dialog &dialog);
Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.503
retrieving revision 2.504
diff -u -d -r2.503 -r2.504
--- scummvm.cpp 14 Dec 2003 15:04:05 -0000 2.503
+++ scummvm.cpp 14 Dec 2003 20:36:37 -0000 2.504
@@ -326,8 +326,6 @@
_pauseDialog = NULL;
_optionsDialog = NULL;
_mainMenuDialog = NULL;
- _confirmExitDialog = NULL;
- _confirmRestartDialog = NULL;
_fastMode = 0;
_actors = NULL;
_inventory = NULL;
@@ -862,8 +860,6 @@
delete _pauseDialog;
delete _optionsDialog;
delete _mainMenuDialog;
- delete _confirmExitDialog;
- delete _confirmRestartDialog;
delete _sound;
if (_musicEngine) {
@@ -1699,7 +1695,7 @@
if (_confirmExit)
confirmexitDialog();
else
- _quit = true;
+ _quit = true;
break;
default:
@@ -2577,19 +2573,17 @@
}
void ScummEngine::confirmexitDialog() {
- if (!_confirmExitDialog)
- _confirmExitDialog = new ConfirmExitDialog(this);
+ ConfirmDialog confirmExitDialog(this, "Do you really want to quit (y/n)?");
- if (runDialog(*_confirmExitDialog)) {
+ if (runDialog(confirmExitDialog)) {
_quit = true;
}
}
void ScummEngine::confirmrestartDialog() {
- if (!_confirmRestartDialog)
- _confirmRestartDialog = new ConfirmRestartDialog(this);
+ ConfirmDialog confirmRestartDialog(this, "Do you really want to restart (y/n)?");
- if (runDialog(*_confirmRestartDialog)) {
+ if (runDialog(confirmRestartDialog)) {
restart();
}
}
More information about the Scummvm-git-logs
mailing list