[Scummvm-cvs-logs] CVS: scummvm/scumm dialogs.h,1.1,1.2 scummvm.cpp,1.37,1.38

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory usw-pr-cvs1:/tmp/cvs-serv32207/scumm

Modified Files:
	dialogs.h scummvm.cpp 
Log Message:
added simple message dialog

Index: dialogs.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/dialogs.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- dialogs.h	19 Sep 2002 17:44:41 -0000	1.1
+++ dialogs.h	26 Sep 2002 11:44:02 -0000	1.2
@@ -63,16 +63,13 @@
 	AboutDialog(NewGui *gui, Scumm *scumm);
 };
 
-class SoundDialog;
-class KeysDialog;
-class MiscDialog;
 
 class OptionsDialog : public ScummDialog {
 protected:
-	AboutDialog		*_aboutDialog;
-	SoundDialog		*_soundDialog;
-	KeysDialog		*_keysDialog;
-	MiscDialog		*_miscDialog;
+	Dialog		*_aboutDialog;
+	Dialog		*_soundDialog;
+	Dialog		*_keysDialog;
+	Dialog		*_miscDialog;
 
 public:
 	OptionsDialog(NewGui *gui, Scumm *scumm);

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- scummvm.cpp	26 Sep 2002 09:59:46 -0000	1.37
+++ scummvm.cpp	26 Sep 2002 11:44:02 -0000	1.38
@@ -33,6 +33,7 @@
 #include "gameDetector.h"
 #include "gui/gui.h"
 #include "gui/newgui.h"
+#include "gui/message.h"
 #include "object.h"
 #include "resource.h"
 #include "string.h"
@@ -936,8 +937,21 @@
 
 void Scumm::pauseDialog()
 {
-	if (!_pauseDialog)
+	if (!_pauseDialog) {
+#if 1
+	// HACK HACK
+		const char *message = "This demonstrates MessageDialog's abilities.\n"
+						      "For example it supports multi line text.\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...
+		_pauseDialog = new MessageDialog(_newgui, message);
+#else
 		_pauseDialog = new PauseDialog(_newgui, this);
+#endif
+	}
+
 	runDialog(_pauseDialog);
 }