[Scummvm-cvs-logs] SF.net SVN: scummvm:[42538] scummvm/trunk/engines/scumm

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Thu Jul 16 19:39:16 CEST 2009


Revision: 42538
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42538&view=rev
Author:   lordhoto
Date:     2009-07-16 17:39:16 +0000 (Thu, 16 Jul 2009)

Log Message:
-----------
Formatting fixes.

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/dialogs.cpp
    scummvm/trunk/engines/scumm/dialogs.h

Modified: scummvm/trunk/engines/scumm/dialogs.cpp
===================================================================
--- scummvm/trunk/engines/scumm/dialogs.cpp	2009-07-16 17:29:31 UTC (rev 42537)
+++ scummvm/trunk/engines/scumm/dialogs.cpp	2009-07-16 17:39:16 UTC (rev 42538)
@@ -660,11 +660,10 @@
 
 	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::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 @@
 #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]);
 	}

Modified: scummvm/trunk/engines/scumm/dialogs.h
===================================================================
--- scummvm/trunk/engines/scumm/dialogs.h	2009-07-16 17:29:31 UTC (rev 42537)
+++ scummvm/trunk/engines/scumm/dialogs.h	2009-07-16 17:39:16 UTC (rev 42538)
@@ -124,7 +124,7 @@
 
 	int _page;
 	int _numPages;
-    int _numLines;
+	int _numLines;
 
 	const GameSettings _game;
 


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