[Scummvm-cvs-logs] SF.net SVN: scummvm:[33315] residual/trunk/engine

[aquadran at users.sourceforge.net]

Revision: 33315
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33315&view=rev
Author:   aquadran
Date:     2008-07-26 19:30:44 +0000 (Sat, 26 Jul 2008)

Log Message:
-----------
fixes warnings

Modified Paths:
--------------
    residual/trunk/engine/backend/fs/amigaos4/amigaos4-fs.cpp
    residual/trunk/engine/imuse/imuse.cpp
    residual/trunk/engine/lua/liolib.cpp
    residual/trunk/engine/lua/llex.cpp
    residual/trunk/engine/lua/lparser.cpp
    residual/trunk/engine/lua/lvm.cpp
    residual/trunk/engine/smush/smush.cpp

Modified: residual/trunk/engine/backend/fs/amigaos4/amigaos4-fs.cpp
===================================================================
--- residual/trunk/engine/backend/fs/amigaos4/amigaos4-fs.cpp	2008-07-26 19:24:27 UTC (rev 33314)
+++ residual/trunk/engine/backend/fs/amigaos4/amigaos4-fs.cpp	2008-07-26 19:30:44 UTC (rev 33315)
@@ -151,7 +151,7 @@
 AmigaOSFilesystemNode::AmigaOSFilesystemNode(const String &p) {
 	ENTER();
 
-	int len = 0, offset = p.size();
+	int offset = p.size();
 
 	//assert(offset > 0);
 

Modified: residual/trunk/engine/imuse/imuse.cpp
===================================================================
--- residual/trunk/engine/imuse/imuse.cpp	2008-07-26 19:24:27 UTC (rev 33314)
+++ residual/trunk/engine/imuse/imuse.cpp	2008-07-26 19:30:44 UTC (rev 33315)
@@ -370,7 +370,7 @@
 	}
 
 	if (debugLevel == DEBUG_IMUSE || debugLevel == DEBUG_ALL)
-		printf("Imuse::switchToNextRegion(): REGION %d: soundName:%s\n", track->curRegion, track->soundName);
+		printf("Imuse::switchToNextRegion(): REGION %d: soundName:%s\n", (int)track->curRegion, track->soundName);
 	track->dataOffset = _sound->getRegionOffset(soundDesc, track->curRegion);
 	track->regionOffset = 0;
 }

Modified: residual/trunk/engine/lua/liolib.cpp
===================================================================
--- residual/trunk/engine/lua/liolib.cpp	2008-07-26 19:24:27 UTC (rev 33314)
+++ residual/trunk/engine/lua/liolib.cpp	2008-07-26 19:30:44 UTC (rev 33315)
@@ -361,12 +361,12 @@
         else if (linedefined < 0)
           fprintf(f, "%s", filename);
         else
-          fprintf(f, "function (%s:%d)", filename, linedefined);
+          fprintf(f, "function (%s:%d)", filename, (int)linedefined);
         filename = NULL;
       }
     }
     if ((currentline = lua_currentline(func)) > 0)
-      fprintf(f, " at line %d", currentline);
+      fprintf(f, " at line %d", (int)currentline);
     if (filename)
       fprintf(f, " [in file %s]", filename);
     fprintf(f, "\n");

Modified: residual/trunk/engine/lua/llex.cpp
===================================================================
--- residual/trunk/engine/lua/llex.cpp	2008-07-26 19:24:27 UTC (rev 33314)
+++ residual/trunk/engine/lua/llex.cpp	2008-07-26 19:30:44 UTC (rev 33315)
@@ -68,7 +68,7 @@
 
 static void luaX_invalidchar (LexState *ls, int32 c) {
   char buff[10];
-  sprintf(buff, "0x%X", c);
+  sprintf(buff, "0x%X", (int)c);
   luaX_syntaxerror(ls, "invalid control char", buff);
 }
 

Modified: residual/trunk/engine/lua/lparser.cpp
===================================================================
--- residual/trunk/engine/lua/lparser.cpp	2008-07-26 19:24:27 UTC (rev 33314)
+++ residual/trunk/engine/lua/lparser.cpp	2008-07-26 19:30:44 UTC (rev 33315)
@@ -592,7 +592,7 @@
     luaX_token2str(ls, what, t_what);
     luaX_token2str(ls, who, t_who);
     sprintf(buff, "`%s' expected (to close `%s' at line %d)",
-            t_what, t_who, where);
+            t_what, t_who, (int)where);
     luaX_error(ls, buff);
   }
 }

Modified: residual/trunk/engine/lua/lvm.cpp
===================================================================
--- residual/trunk/engine/lua/lvm.cpp	2008-07-26 19:24:27 UTC (rev 33314)
+++ residual/trunk/engine/lua/lvm.cpp	2008-07-26 19:30:44 UTC (rev 33315)
@@ -69,7 +69,7 @@
     real f = nvalue(obj);
     int32 i;
     if ((real)(-MAX_INT) <= f && f <= (real)MAX_INT && (real)(i=(int32)f) == f)
-      sprintf (s, "%d", i);
+      sprintf (s, "%d", (int)i);
     else
       sprintf (s, NUMBER_FMT, nvalue(obj));
     tsvalue(obj) = luaS_new(s);

Modified: residual/trunk/engine/smush/smush.cpp
===================================================================
--- residual/trunk/engine/smush/smush.cpp	2008-07-26 19:24:27 UTC (rev 33314)
+++ residual/trunk/engine/smush/smush.cpp	2008-07-26 19:30:44 UTC (rev 33315)
@@ -302,7 +302,7 @@
 	// does not quite do it.
 	// TODO: Find out what needs to go on here.
 	if (SMUSH_ALTSPEED(flags)) {
-		printf("Bad time: %d, suggested: %d\n", _speed, 2 * _speed);
+		printf("Bad time: %d, suggested: %d\n", (int)_speed, (int)(2 * _speed));
 		_speed = 66667;
 	}
 	_videoLooping = SMUSH_LOOPMOVIE(flags);


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