[Scummvm-cvs-logs] CVS: scummvm/scumm dialogs.cpp,1.122,1.123 dialogs.h,1.43,1.44 scumm.cpp,1.328,1.329 scumm.h,1.532,1.533
Max Horn
fingolfin at users.sourceforge.net
Thu Feb 17 16:29:12 CET 2005
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18972
Modified Files:
dialogs.cpp dialogs.h scumm.cpp scumm.h
Log Message:
Fix a small bug (wrong mouse cursor is briefly shown) in the F5 menu
Index: dialogs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/dialogs.cpp,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -d -r1.122 -r1.123
--- dialogs.cpp 25 Jan 2005 08:15:49 -0000 1.122
+++ dialogs.cpp 18 Feb 2005 00:28:55 -0000 1.123
@@ -303,6 +303,7 @@
// Create the sub dialog(s)
//
_aboutDialog = new GUI::AboutDialog();
+ _optionsDialog = new ConfigDialog(scumm);
#ifndef DISABLE_HELP
_helpDialog = new HelpDialog(scumm);
#endif
@@ -312,6 +313,7 @@
MainMenuDialog::~MainMenuDialog() {
delete _aboutDialog;
+ delete _optionsDialog;
#ifndef DISABLE_HELP
delete _helpDialog;
#endif
@@ -331,7 +333,7 @@
close();
break;
case kOptionsCmd:
- _vm->optionsDialog();
+ _optionsDialog->runModal();
break;
case kAboutCmd:
_aboutDialog->runModal();
Index: dialogs.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/dialogs.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- dialogs.h 1 Jan 2005 16:09:13 -0000 1.43
+++ dialogs.h 18 Feb 2005 00:28:56 -0000 1.44
@@ -64,6 +64,7 @@
protected:
GUI::Dialog *_aboutDialog;
+ GUI::Dialog *_optionsDialog;
#ifndef DISABLE_HELP
GUI::Dialog *_helpDialog;
#endif
Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.328
retrieving revision 1.329
diff -u -d -r1.328 -r1.329
--- scumm.cpp 17 Feb 2005 01:22:31 -0000 1.328
+++ scumm.cpp 18 Feb 2005 00:28:56 -0000 1.329
@@ -551,7 +551,7 @@
_heversion(gs.heversion),
_numActors(gs.numActors),
_features(gs.features),
- gdi(this), _pauseDialog(0), _optionsDialog(0), _mainMenuDialog(0), _versionDialog(0),
+ gdi(this), _pauseDialog(0), _mainMenuDialog(0), _versionDialog(0),
_targetName(detector->_targetName) {
// Copy MD5 checksum
@@ -641,7 +641,6 @@
_insaneRunning = false;
_quit = false;
_pauseDialog = NULL;
- _optionsDialog = NULL;
_mainMenuDialog = NULL;
_versionDialog = NULL;
_fastMode = 0;
@@ -1041,7 +1040,6 @@
delete _2byteFontPtr;
delete _charset;
delete _pauseDialog;
- delete _optionsDialog;
delete _mainMenuDialog;
delete _versionDialog;
@@ -2585,12 +2583,6 @@
runDialog(*_mainMenuDialog);
}
-void ScummEngine::optionsDialog() {
- if (!_optionsDialog)
- _optionsDialog = new ConfigDialog(this);
- runDialog(*_optionsDialog);
-}
-
void ScummEngine::confirmexitDialog() {
ConfirmDialog confirmExitDialog(this, "Do you really want to quit (y/n)?");
Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.532
retrieving revision 1.533
diff -u -d -r1.532 -r1.533
--- scumm.h 14 Feb 2005 03:12:40 -0000 1.532
+++ scumm.h 18 Feb 2005 00:28:56 -0000 1.533
@@ -412,7 +412,6 @@
protected:
Dialog *_pauseDialog;
Dialog *_versionDialog;
- Dialog *_optionsDialog;
Dialog *_mainMenuDialog;
protected:
@@ -422,8 +421,6 @@
void pauseDialog();
void versionDialog();
void mainMenuDialog();
-public:
- void optionsDialog(); // Used by MainMenuDialog::handleCommand()
protected:
char displayMessage(const char *altButton, const char *message, ...);
More information about the Scummvm-git-logs
mailing list