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

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Tue Feb 24 16:14:15 CET 2009


Revision: 38840
          http://scummvm.svn.sourceforge.net/scummvm/?rev=38840&view=rev
Author:   lordhoto
Date:     2009-02-24 15:14:15 +0000 (Tue, 24 Feb 2009)

Log Message:
-----------
Fix some warnings.

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/scriptdebug.cpp
    scummvm/trunk/engines/sci/engine/vm.cpp
    scummvm/trunk/engines/sci/tools.cpp

Modified: scummvm/trunk/engines/sci/engine/scriptdebug.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/scriptdebug.cpp	2009-02-24 12:01:28 UTC (rev 38839)
+++ scummvm/trunk/engines/sci/engine/scriptdebug.cpp	2009-02-24 15:14:15 UTC (rev 38840)
@@ -380,7 +380,7 @@
 		script_t *scr = &(mobj->data.script);
 		sciprintf("script.%03d locked by %d, bufsize=%d (%x)\n", scr->nr, scr->lockers, (uint)scr->buf_size, (uint)scr->buf_size);
 		if (scr->export_table)
-			sciprintf("  Exports: %4d at %d\n", scr->exports_nr, ((byte *)scr->export_table) - ((byte *)scr->buf));
+			sciprintf("  Exports: %4d at %d\n", scr->exports_nr, (int)(((byte *)scr->export_table) - ((byte *)scr->buf)));
 		else
 			sciprintf("  Exports: none\n");
 

Modified: scummvm/trunk/engines/sci/engine/vm.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/vm.cpp	2009-02-24 12:01:28 UTC (rev 38839)
+++ scummvm/trunk/engines/sci/engine/vm.cpp	2009-02-24 15:14:15 UTC (rev 38840)
@@ -90,7 +90,7 @@
 
 	script_debug_flag = script_error_flag = 1;
 	if (sci_debug_flags & 4)
-		sciprintf("[VM] Stack index %d out of valid range [%d..%d]\n", sp - s->stack_base, 0, s->stack_top - s->stack_base - 1);
+		sciprintf("[VM] Stack index %d out of valid range [%d..%d]\n", (int)(sp - s->stack_base), 0, (int)(s->stack_top - s->stack_base - 1));
 	return 0;
 }
 
@@ -1462,7 +1462,7 @@
 
 #ifndef DISABLE_VALIDATIONS
 		if (xs != s->execution_stack + s->execution_stack_pos) {
-			sciprintf("Error: xs is stale (%d vs %d); last command was %02x\n", xs - s->execution_stack, s->execution_stack_pos, opnumber);
+			sciprintf("Error: xs is stale (%d vs %d); last command was %02x\n", (int)(xs - s->execution_stack), s->execution_stack_pos, opnumber);
 		}
 #endif
 		if (script_error_flag) {

Modified: scummvm/trunk/engines/sci/tools.cpp
===================================================================
--- scummvm/trunk/engines/sci/tools.cpp	2009-02-24 12:01:28 UTC (rev 38839)
+++ scummvm/trunk/engines/sci/tools.cpp	2009-02-24 15:14:15 UTC (rev 38840)
@@ -121,7 +121,7 @@
 		else if (area == SCIkWARNING_NR)
 			fprintf(stderr, "%s: Warning ", funcname);
 		else
-			fprintf(stderr, funcname);
+			fprintf(stderr, "%s", funcname);
 
 		fprintf(stderr, "(%s L%d): ", file, line);
 


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