aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schickel2009-07-16 17:39:16 +0000
committerJohannes Schickel2009-07-16 17:39:16 +0000
commit2422ee06a25a82ce5367a2c36cb72422f61343e8 (patch)
treef2cea738dfdeeda297e1435602e52a8848b42858
parentaf289bdb03d7f0a5e8f01c03e462f230835e0077 (diff)
downloadscummvm-rg350-2422ee06a25a82ce5367a2c36cb72422f61343e8.tar.gz
scummvm-rg350-2422ee06a25a82ce5367a2c36cb72422f61343e8.tar.bz2
scummvm-rg350-2422ee06a25a82ce5367a2c36cb72422f61343e8.zip
Formatting fixes.
svn-id: r42538
-rw-r--r--engines/scumm/dialogs.cpp9
-rw-r--r--engines/scumm/dialogs.h2
2 files changed, 4 insertions, 7 deletions
diff --git a/engines/scumm/dialogs.cpp b/engines/scumm/dialogs.cpp
index 54ade5b7ca..9d3ba527c4 100644
--- a/engines/scumm/dialogs.cpp
+++ b/engines/scumm/dialogs.cpp
@@ -660,11 +660,10 @@ void HelpDialog::reflowLayout() {
g_gui.xmlEval()->getWidgetData("ScummHelp.HelpText", x, y, w, h);
- /* Make sure than we don't have more lines than what we can fit
- * on the space that the layout reserves for text */
+ // Make sure than we don't have more lines than what we can fit
+ // on the space that the layout reserves for text
_numLines = MIN(HELP_NUM_LINES, (int)(h / lineHeight));
-
int keyW = w * 20 / 100;
int dscX = x + keyW + 32;
int dscW = w * 80 / 100;
@@ -680,9 +679,7 @@ void HelpDialog::reflowLayout() {
}
void HelpDialog::displayKeyBindings() {
-
String titleStr, *keyStr, *dscStr;
- int i;
#ifndef __DS__
ScummHelp::updateStrings(_game.id, _game.version, _game.platform, _page, titleStr, keyStr, dscStr);
@@ -692,7 +689,7 @@ void HelpDialog::displayKeyBindings() {
#endif
_title->setLabel(titleStr);
- for (i = 0; i < _numLines; i++) {
+ for (int i = 0; i < _numLines; i++) {
_key[i]->setLabel(keyStr[i]);
_dsc[i]->setLabel(dscStr[i]);
}
diff --git a/engines/scumm/dialogs.h b/engines/scumm/dialogs.h
index 996ff0e7a7..af844272fa 100644
--- a/engines/scumm/dialogs.h
+++ b/engines/scumm/dialogs.h
@@ -124,7 +124,7 @@ protected:
int _page;
int _numPages;
- int _numLines;
+ int _numLines;
const GameSettings _game;