Ticket #8107: stump.patch

dialogs.cpp

@@ -642 +642 @@
 
 #pragma mark -
 
+InfoDialog::InfoDialog(NewGui *gui, Scumm *scumm, int res,
+                int x, int y, int w, int h)
+        : ScummDialog(gui, scumm, x, y, w, h)
+{
+        setInfoText (queryResString (res));
+}
+
+InfoDialog::InfoDialog(NewGui *gui, Scumm *scumm, const String& message,
+                int x, int y, int w, int h)
+        : ScummDialog(gui, scumm, x, y, w, h)
+{
+        setInfoText (message);
+}
+
+void InfoDialog::setInfoText(const String& message)
+{
+        new StaticTextWidget(this, 4, 4, _w-8, _h, message, kTextAlignCenter);
+}
+
+#pragma mark -
+
 PauseDialog::PauseDialog(NewGui *gui, Scumm *scumm)
-        : ScummDialog(gui, scumm, 35, 80, 250, 16)
+        : InfoDialog(gui, scumm, 10, 35, 80, 250, 16)
+        //: InfoDialog(gui, scumm, queryResString (10), 35, 80, 250, 16)
 {
-        addResText(4, 4, 250-8, 16, 10);
+        // cannot call queryResString from the initializer list, since _scumm
+        // is not initialized yet..
 }
 
 #ifdef _WIN32_WCE

dialogs.h

@@ -109 +109 @@
         CheckboxWidget *amigaPalCheckbox;
 };
 
-class PauseDialog : public ScummDialog {
+class InfoDialog : public ScummDialog {
 public:
-        PauseDialog(NewGui *gui, Scumm *scumm);
+        // arbitrary message
+        InfoDialog(NewGui *gui, Scumm *scumm, const String& message, int x, int y,
+                        int w, int h);
+        // from resources
+        InfoDialog(NewGui *gui, Scumm *scumm, int res, int x, int y, int w, int h);
 
         virtual void handleMouseDown(int x, int y, int button, int clickCount)
                 { close(); }
@@ -122 +126 @@
                         else
                                 ScummDialog::handleKeyDown(key, modifiers);
                 }
+protected:
+        void setInfoText (const String& message);
+};
+
+class PauseDialog : public InfoDialog {
+public:
+        PauseDialog(NewGui *gui, Scumm *scumm);
 };
 
 #ifdef _WIN32_WCE

string.cpp

@@ -23 +23 @@
 #include "stdafx.h"
 #include "scumm.h"
 #include "actor.h"
+#include "dialogs.h"
 #include "scumm/sound.h"
 
 int CharsetRenderer::getStringWidth(int arg, byte *text, int pos)
@@ -170 +171 @@
         if (_string[3].color == 0)
                 _string[3].color = 4;
 
-        // TODO - it appears the this function should display the given message graphically
-        // to the user in a "dialog" looking like the pause dialog, i.e. a single line.
-        warning("unkMessage2(\"%s\")", buf);
+        // Unfortunately, calculating string width will require including newgui.h
+        // OUCH
+        // Will used fixed width for now...
+
+        //int width = _newgui -> getStringWidth ((char*) buf);
+        //InfoDialog* dialog = new InfoDialog (_newgui, this, (char*) buf,
+        //      (_realWidth - (width + 10)) >> 1, 80, width + 10, 16);
+                        
+        InfoDialog* dialog = new InfoDialog (_newgui, this, (char*) buf,
+                        10, 80, 300, 16);
+        runDialog (dialog);
+        delete dialog;
+
         _messagePtr = tmp;
 }