thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix a small bug (wrong mouse cursor is briefly shown) in the F5 menu

Browse source 
svn-id: r16804
This commit is contained in:
Max Horn 2005-02-18 00:28:56 +00:00
parent 05f4bf5151
commit 695b0fcb5f
4 changed files with 5 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scumm/dialogs.cpp
View file

@ -303,6 +303,7 @@ MainMenuDialog::MainMenuDialog(ScummEngine *scumm)
// 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(ScummEngine *scumm)
MainMenuDialog::~MainMenuDialog() {
delete _aboutDialog;
delete _optionsDialog;
#ifndef DISABLE_HELP
delete _helpDialog;
#endif
@ -331,7 +333,7 @@ void MainMenuDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 dat
close();
break;
case kOptionsCmd:
_vm->optionsDialog();
_optionsDialog->runModal();
break;
case kAboutCmd:
_aboutDialog->runModal();

1
scumm/dialogs.h
View file

@ -64,6 +64,7 @@ public:
protected:
GUI::Dialog *_aboutDialog;
GUI::Dialog *_optionsDialog;
#ifndef DISABLE_HELP
GUI::Dialog *_helpDialog;
#endif

10
scumm/scumm.cpp
View file

@ -551,7 +551,7 @@ ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst, const ScummGameS
_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 @@ ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst, const ScummGameS
_insaneRunning = false;
_quit = false;
_pauseDialog = NULL;
_optionsDialog = NULL;
_mainMenuDialog = NULL;
_versionDialog = NULL;
_fastMode = 0;
@ -1041,7 +1040,6 @@ ScummEngine::~ScummEngine() {
delete _2byteFontPtr;
delete _charset;
delete _pauseDialog;
delete _optionsDialog;
delete _mainMenuDialog;
delete _versionDialog;
@ -2585,12 +2583,6 @@ void ScummEngine::mainMenuDialog() {
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)?");

3
scumm/scumm.h
View file

@ -412,7 +412,6 @@ public:
protected:
Dialog *_pauseDialog;
Dialog *_versionDialog;
Dialog *_optionsDialog;
Dialog *_mainMenuDialog;
protected:
@ -422,8 +421,6 @@ protected:
void pauseDialog();
void versionDialog();
void mainMenuDialog();
public:
void optionsDialog(); // Used by MainMenuDialog::handleCommand()
protected:
char displayMessage(const char *altButton, const char *message, ...);