[Scummvm-cvs-logs] SF.net SVN: scummvm:[47058] scummvm/branches/branch-1-0-0/engines/scumm

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Tue Jan 5 23:23:25 CET 2010


Revision: 47058
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47058&view=rev
Author:   lordhoto
Date:     2010-01-05 22:23:25 +0000 (Tue, 05 Jan 2010)

Log Message:
-----------
Backport of r47057: Fix broken Scumm dialogs, which is a regression from r46952.

Modified Paths:
--------------
    scummvm/branches/branch-1-0-0/engines/scumm/dialogs.cpp
    scummvm/branches/branch-1-0-0/engines/scumm/dialogs.h

Modified: scummvm/branches/branch-1-0-0/engines/scumm/dialogs.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/scumm/dialogs.cpp	2010-01-05 22:18:09 UTC (rev 47057)
+++ scummvm/branches/branch-1-0-0/engines/scumm/dialogs.cpp	2010-01-05 22:23:25 UTC (rev 47058)
@@ -207,6 +207,10 @@
 
 #pragma mark -
 
+ScummDialog::ScummDialog(int x, int y, int w, int h) : GUI::Dialog(x, y, w, h) {
+	_backgroundType = GUI::ThemeEngine::kDialogBackgroundSpecial;
+}
+
 ScummDialog::ScummDialog(String name) : GUI::Dialog(name) {
 	_backgroundType = GUI::ThemeEngine::kDialogBackgroundSpecial;
 }
@@ -743,7 +747,7 @@
 #pragma mark -
 
 InfoDialog::InfoDialog(ScummEngine *scumm, int res)
-: ScummDialog("scummDummyDialog"), _vm(scumm) { // dummy x and w
+: ScummDialog(0, 0, 0, 0), _vm(scumm) { // dummy x and w
 
 	_message = queryResString(res);
 
@@ -752,7 +756,7 @@
 }
 
 InfoDialog::InfoDialog(ScummEngine *scumm, const String& message)
-: ScummDialog("scummDummyDialog"), _vm(scumm) { // dummy x and w
+: ScummDialog(0, 0, 0, 0), _vm(scumm) { // dummy x and w
 
 	_message = message;
 
@@ -853,7 +857,7 @@
 
 ValueDisplayDialog::ValueDisplayDialog(const Common::String& label, int minVal, int maxVal,
 		int val, uint16 incKey, uint16 decKey)
-	: GUI::Dialog("scummDummyDialog"),
+	: GUI::Dialog(0, 0, 0, 0),
 	_label(label), _min(minVal), _max(maxVal),
 	_value(val), _incKey(incKey), _decKey(decKey) {
 	assert(_min <= _value && _value <= _max);

Modified: scummvm/branches/branch-1-0-0/engines/scumm/dialogs.h
===================================================================
--- scummvm/branches/branch-1-0-0/engines/scumm/dialogs.h	2010-01-05 22:18:09 UTC (rev 47057)
+++ scummvm/branches/branch-1-0-0/engines/scumm/dialogs.h	2010-01-05 22:23:25 UTC (rev 47058)
@@ -47,6 +47,7 @@
 
 class ScummDialog : public GUI::Dialog {
 public:
+	ScummDialog(int x, int y, int w, int h);
 	ScummDialog(Common::String name);
 
 protected:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list