aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorMax Horn2005-05-15 17:01:32 +0000
committerMax Horn2005-05-15 17:01:32 +0000
commit2d40452a119fd9a0ed4b482b92c9c8df5978c917 (patch)
tree963f62ef44d7125121e01ae2897966674c33cf0d /scumm
parent1043554591d8208fc1b1cb504086216ae2aa3799 (diff)
downloadscummvm-rg350-2d40452a119fd9a0ed4b482b92c9c8df5978c917.tar.gz
scummvm-rg350-2d40452a119fd9a0ed4b482b92c9c8df5978c917.tar.bz2
scummvm-rg350-2d40452a119fd9a0ed4b482b92c9c8df5978c917.zip
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
svn-id: r18111
Diffstat (limited to 'scumm')
-rw-r--r--scumm/dialogs.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/scumm/dialogs.cpp b/scumm/dialogs.cpp
index 7b05d0c9a4..feeaccd36f 100644
--- a/scumm/dialogs.cpp
+++ b/scumm/dialogs.cpp
@@ -390,8 +390,8 @@ Common::StringList generateSavegameList(ScummEngine *scumm, bool saveMode) {
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 @@ MainMenuDialog::MainMenuDialog(ScummEngine *scumm)
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 @@ MainMenuDialog::MainMenuDialog(ScummEngine *scumm)
_w = buttonWidth + 2 * hOffset;
_h = y + vSpace;
- _x = (sw - _w) / 2;
- _y = (sh - _h) / 2;
+ _x = (screenW - _w) / 2;
+ _y = (screenH - _h) / 2;
//