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

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Sat Jun 6 20:33:20 CEST 2009


Revision: 41289
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41289&view=rev
Author:   lordhoto
Date:     2009-06-06 18:33:20 +0000 (Sat, 06 Jun 2009)

Log Message:
-----------
Fix printf format argument related warnings.

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/player_v2cms.cpp

Modified: scummvm/trunk/engines/scumm/player_v2cms.cpp
===================================================================
--- scummvm/trunk/engines/scumm/player_v2cms.cpp	2009-06-06 18:32:33 UTC (rev 41288)
+++ scummvm/trunk/engines/scumm/player_v2cms.cpp	2009-06-06 18:33:20 UTC (rev 41289)
@@ -1121,14 +1121,14 @@
 			switch (opcode) {
 			case 0xf8: // set hull curve
 				debug(7, "channels[%d]: hull curve %2d",
-				channel - _channels, *script_ptr);
+				(uint)(channel - _channels), *script_ptr);
 				channel->d.hull_curve = hull_offsets[*script_ptr / 2];
 				script_ptr++;
 				break;
 
 			case 0xf9: // set freqmod curve
 				debug(7, "channels[%d]: freqmod curve %2d",
-				channel - _channels, *script_ptr);
+				(uint)(channel - _channels), *script_ptr);
 				channel->d.freqmod_table = freqmod_offsets[*script_ptr / 4];
 				channel->d.freqmod_modulo = freqmod_lengths[*script_ptr / 4];
 				script_ptr++;
@@ -1199,7 +1199,7 @@
 				value = READ_LE_UINT16 (script_ptr);
 				channel->array[opcode / 2] = value;
 				debug(7, "channels[%d]: set param %2d = %5d",
-						channel - &_channels[0], opcode, value);
+						(uint)(channel - _channels), opcode, value);
 				script_ptr += 2;
 				if (opcode == 14) {
 				    /* tempo var */
@@ -1227,7 +1227,7 @@
 					note &= 0x7f;
 					if (note == 0x7f) {
 						debug(8, "channels[%d]: pause %d",
-							  channel - _channels, channel->d.time_left);
+							  (uint)(channel - _channels), channel->d.time_left);
 						goto end;
 					}
 				} else {
@@ -1236,7 +1236,7 @@
 
 					if ((opcode & 0x10)) {
 						debug(8, "channels[%d]: pause %d",
-							  channel - _channels, channel->d.time_left);
+							  (uint)(channel - _channels), channel->d.time_left);
 						goto end;
 					}
 
@@ -1245,7 +1245,7 @@
 				}
 
 				debug(8, "channels[%d]: @%04x note: %3d+%d len: %2d hull: %d mod: %d/%d/%d %s",
-						dest_channel - channel, script_ptr ? script_ptr - _current_data - 2 : 0,
+						(uint)(dest_channel - channel), script_ptr ? (uint)(script_ptr - _current_data - 2) : 0,
 						note, (signed short) dest_channel->d.transpose, channel->d.time_left,
 						dest_channel->d.hull_curve, dest_channel->d.freqmod_table,
 						dest_channel->d.freqmod_incr,dest_channel->d.freqmod_multiplier,


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