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

[thebluegr at users.sourceforge.net]

Revision: 34457
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34457&view=rev
Author:   thebluegr
Date:     2008-09-09 06:47:41 +0000 (Tue, 09 Sep 2008)

Log Message:
-----------
Fix for bug #2101083 - "ANY - MSVC71 compilation fails due to warnings-as-errors"

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/gui_br.cpp
    scummvm/trunk/engines/queen/journal.cpp

Modified: scummvm/trunk/engines/parallaction/gui_br.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/gui_br.cpp	2008-09-08 23:24:20 UTC (rev 34456)
+++ scummvm/trunk/engines/parallaction/gui_br.cpp	2008-09-09 06:47:41 UTC (rev 34457)
@@ -216,7 +216,7 @@
 
 	virtual void enter() {
 		_vm->_gfx->clearScreen();
-		int x = 0, y = 0;
+		int x = 0, y = 0, i = 0;
 		if (_vm->getPlatform() == Common::kPlatformPC) {
 			x = 20;
 			y = 50;
@@ -227,10 +227,9 @@
 
 		bool complete[3];
 		_vm->_saveLoad->getGamePartProgress(complete, 3);
-		for (int i = 0; i < 3 && complete[i]; i++, _availItems++) ;
+		for (i = 0; i < 3 && complete[i]; i++, _availItems++) ;
 
 		// TODO: keep track of and destroy menu item frames/surfaces
-		int i;
 		for (i = 0; i < _availItems; i++) {
 			_lines[i] = new GfxObj(0, renderMenuItem(_menuStrings[i]), "MenuItem");
 			uint id = _vm->_gfx->setItem(_lines[i], MENUITEMS_X, MENUITEMS_Y + MENUITEM_HEIGHT * i, 0xFF);

Modified: scummvm/trunk/engines/queen/journal.cpp
===================================================================
--- scummvm/trunk/engines/queen/journal.cpp	2008-09-08 23:24:20 UTC (rev 34456)
+++ scummvm/trunk/engines/queen/journal.cpp	2008-09-09 06:47:41 UTC (rev 34457)
@@ -385,16 +385,18 @@
 	char s[128];
 	strncpy(s, text, 127);
 	s[127] = 0;
+	char *p;
+
 	// remove leading and trailing spaces (necessary for spanish version)
-	for (char *p = s + strlen(s) - 1; p >= s && *p == ' '; --p) {
+	for (p = s + strlen(s) - 1; p >= s && *p == ' '; --p) {
 		*p = 0;
 	}
 	text = s;
-	for (char *p = s; *p == ' '; ++p) {
+	for (p = s; *p == ' '; ++p) {
 		text = p + 1;
 	}
 	// draw the substrings
-	char *p = (char *)strchr(text, ' ');
+	p = (char *)strchr(text, ' ');
 	if (!p) {
 		int x = (128 - _vm->display()->textWidth(text)) / 2;
 		_vm->display()->setText(x, y, text, false);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.