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

[sev at users.sourceforge.net]

Revision: 52154
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52154&view=rev
Author:   sev
Date:     2010-08-17 11:42:47 +0000 (Tue, 17 Aug 2010)

Log Message:
-----------
HUGO: Fix even more warnings

Modified Paths:
--------------
    scummvm/trunk/engines/hugo/display.cpp
    scummvm/trunk/engines/hugo/engine.cpp

Modified: scummvm/trunk/engines/hugo/display.cpp
===================================================================
--- scummvm/trunk/engines/hugo/display.cpp	2010-08-17 11:40:48 UTC (rev 52153)
+++ scummvm/trunk/engines/hugo/display.cpp	2010-08-17 11:42:47 UTC (rev 52154)
@@ -396,7 +396,7 @@
 	debugC(2, kDebugDisplay, "stringLength(%s)", s);
 
 	for (sum = 0; *s; s++)
-		sum += *(fontArr[*s] + 1) + 1;
+		sum += *(fontArr[(uint)*s] + 1) + 1;
 
 	return(sum);
 }
@@ -419,8 +419,8 @@
 		sx = center(s);
 
 	for (; *s; s++) {
-		writeChr(sx, sy, color, (char *)font[*s]);
-		sx += *(font[*s] + 1) + 1;
+		writeChr(sx, sy, color, (char *)font[(uint)*s]);
+		sx += *(font[(uint)*s] + 1) + 1;
 	}
 }
 

Modified: scummvm/trunk/engines/hugo/engine.cpp
===================================================================
--- scummvm/trunk/engines/hugo/engine.cpp	2010-08-17 11:40:48 UTC (rev 52153)
+++ scummvm/trunk/engines/hugo/engine.cpp	2010-08-17 11:42:47 UTC (rev 52154)
@@ -272,24 +272,27 @@
 				switch (obj->seqNumb) {
 				case 4:
 					if (!obj->vx) {                 // Got 4 directions
-						if (obj->vx != obj->oldvx)  // vx just stopped
+						if (obj->vx != obj->oldvx)  { // vx just stopped
 							if (dy >= 0)
 								obj->currImagePtr = obj->seqList[DOWN].seqPtr;
 							else
 								obj->currImagePtr = obj->seqList[_UP].seqPtr;
-					} else if (obj->vx != obj->oldvx)
+						}
+					} else if (obj->vx != obj->oldvx) {
 						if (dx > 0)
 							obj->currImagePtr = obj->seqList[RIGHT].seqPtr;
 						else
 							obj->currImagePtr = obj->seqList[LEFT].seqPtr;
+					}
 					break;
 				case 3:
 				case 2:
-					if (obj->vx != obj->oldvx)      // vx just stopped
+					if (obj->vx != obj->oldvx) {     // vx just stopped
 						if (dx > 0)                 // Left & right only
 							obj->currImagePtr = obj->seqList[RIGHT].seqPtr;
 						else
 							obj->currImagePtr = obj->seqList[LEFT].seqPtr;
+					}
 					break;
 				}
 
@@ -312,16 +315,18 @@
 					// Set first image in sequence (if multi-seq object)
 					if (obj->seqNumb > 1) {
 						if (!obj->vx && (obj->seqNumb >= 4)) {
-							if (obj->vx != obj->oldvx)  // vx just stopped
+							if (obj->vx != obj->oldvx)  { // vx just stopped
 								if (obj->vy > 0)
 									obj->currImagePtr = obj->seqList[DOWN].seqPtr;
 								else
 									obj->currImagePtr = obj->seqList[_UP].seqPtr;
-						} else if (obj->vx != obj->oldvx)
+							}
+						} else if (obj->vx != obj->oldvx) {
 							if (obj->vx > 0)
 								obj->currImagePtr = obj->seqList[RIGHT].seqPtr;
 							else
 								obj->currImagePtr = obj->seqList[LEFT].seqPtr;
+						}
 					}
 					obj->oldvx = obj->vx;
 					obj->oldvy = obj->vy;


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