diff options
| -rw-r--r-- | engines/scumm/dialogs.cpp | 9 | ||||
| -rw-r--r-- | engines/scumm/dialogs.h | 2 |
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; |