[Scummvm-cvs-logs] CVS: scummvm/scumm dialogs.cpp,1.134,1.135

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21095/scumm

Modified Files:
	dialogs.cpp 
Log Message:
Unified rules that determine when a dialog shall use its 'big' mode and when its 'normal' mode; MessageDialog uses Font::wordWrapText now; MessageDialog scales itself now

Index: dialogs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/dialogs.cpp,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -d -r1.134 -r1.135
--- dialogs.cpp	14 May 2005 22:46:59 -0000	1.134
+++ dialogs.cpp	15 May 2005 17:01:32 -0000	1.135
@@ -390,8 +390,8 @@
 MainMenuDialog::MainMenuDialog(ScummEngine *scumm)
 	: ScummDialog(scumm, 0, 0, 0, 0) {
 
-	const int sw = g_system->getOverlayWidth();
-	const int sh = g_system->getOverlayHeight();
+	const int screenW = g_system->getOverlayWidth();
+	const int screenH = g_system->getOverlayHeight();
 	
 	int hOffset;
 	int vSpace;
@@ -401,7 +401,7 @@
 	int buttonWidth;
 	int buttonHeight;
 
-	if (sw >= 400 && sh >= 300) {
+	if (screenW >= 400 && screenH >= 300) {
 		buttonWidth = 160;
 		buttonHeight = 28;
 		ws = GUI::kBigWidgetSize;
@@ -440,8 +440,8 @@
 	_w = buttonWidth + 2 * hOffset;
 	_h = y + vSpace;
 
-	_x = (sw - _w) / 2;
-	_y = (sh - _h) / 2;
+	_x = (screenW - _w) / 2;
+	_y = (screenH - _h) / 2;
 
 
 	//