diff options
| author | Max Horn | 2002-09-26 12:29:10 +0000 |
|---|---|---|
| committer | Max Horn | 2002-09-26 12:29:10 +0000 |
| commit | 09f56dc233324a7611554912c5483e20e0684104 (patch) | |
| tree | c54941c8ae082b684b631b57a1a29db4cfe1d70a /scumm/scummvm.cpp | |
| parent | 58e5e0069f82c9319fd9c6f6987f98886c3b9f67 (diff) | |
| download | scummvm-rg350-09f56dc233324a7611554912c5483e20e0684104.tar.gz scummvm-rg350-09f56dc233324a7611554912c5483e20e0684104.tar.bz2 scummvm-rg350-09f56dc233324a7611554912c5483e20e0684104.zip | |
some fixes for the message dialog; added some comments
svn-id: r5021
Diffstat (limited to 'scumm/scummvm.cpp')
| -rw-r--r-- | scumm/scummvm.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index cc5fdde180..a218ddeb43 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -45,6 +45,7 @@ extern void GraphicsOff(void); // Use g_scumm from error() ONLY Scumm *g_scumm = 0; +extern NewGui *g_gui; void autosave(void * engine) { @@ -104,7 +105,7 @@ Scumm::Scumm (GameDetector *detector, OSystem *syst) _gui = new Gui(); _gui->init(this); - _newgui = new NewGui(_system); + _newgui = g_gui; _bundle = new Bundle(); _sound = new Sound(this); _timer = Engine::_timer; @@ -165,7 +166,6 @@ Scumm::~Scumm () delete _saveLoadDialog; delete _gui; - delete _newgui; delete _bundle; delete _sound; @@ -938,14 +938,14 @@ void Scumm::runDialog(Dialog *dialog) void Scumm::pauseDialog() { if (!_pauseDialog) { -#if 1 +#if 0 // HACK HACK const char *message = "This demonstrates MessageDialog's abilities.\n" "For example it supports multi line text.\n" - " \n" + "\n" "Well, not much more right now, really :-)\n" - "And there are still some bugs in it, too\n" - " "; // <- FIXME: This is needed due to a bug... + "And there are still some bugs in it, too\n"; + // <- FIXME: This is needed due to a bug... _pauseDialog = new MessageDialog(_newgui, message); #else _pauseDialog = new PauseDialog(_newgui, this); |