From cf202049ff85bb63fcb0990f81ba173d1ab4d7c8 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Wed, 12 Apr 2006 14:54:12 +0000
Subject: Fixing mismatch between format strings and data on some systems

svn-id: r21827
---
 engines/scumm/player_v2.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'engines/scumm/player_v2.cpp')

diff --git a/engines/scumm/player_v2.cpp b/engines/scumm/player_v2.cpp
index 9423fb773c..e8abbe1e03 100644
--- a/engines/scumm/player_v2.cpp
+++ b/engines/scumm/player_v2.cpp
@@ -566,14 +566,14 @@ void Player_V2::execute_cmd(ChannelInfo *channel) {
 			switch (opcode) {
 			case 0xf8: // set hull curve
 				debug(7, "channels[%lu]: hull curve %2d",
-				channel - _channels, *script_ptr);
+				(long)(channel - _channels), *script_ptr);
 				channel->d.hull_curve = hull_offsets[*script_ptr / 2];
 				script_ptr++;
 				break;
 
 			case 0xf9: // set freqmod curve
 				debug(7, "channels[%lu]: freqmod curve %2d",
-				channel - _channels, *script_ptr);
+				(long)(channel - _channels), *script_ptr);
 				channel->d.freqmod_table = freqmod_offsets[*script_ptr / 4];
 				channel->d.freqmod_modulo = freqmod_lengths[*script_ptr / 4];
 				script_ptr++;
@@ -644,7 +644,7 @@ void Player_V2::execute_cmd(ChannelInfo *channel) {
 				value = READ_LE_UINT16 (script_ptr);
 				channel->array[opcode / 2] = value;
 				debug(7, "channels[%lu]: set param %2d = %5d",
-						channel - &_channels[0], opcode, value);
+						(long)(channel - _channels), opcode, value);
 				script_ptr += 2;
 				if (opcode == 14) {
 				    /* tempo var */
@@ -672,7 +672,7 @@ void Player_V2::execute_cmd(ChannelInfo *channel) {
 					note &= 0x7f;
 					if (note == 0x7f) {
 						debug(8, "channels[%lu]: pause %d",
-							  channel - _channels, channel->d.time_left);
+							  (long)(channel - _channels), channel->d.time_left);
 						goto end;
 					}
 				} else {
@@ -681,7 +681,7 @@ void Player_V2::execute_cmd(ChannelInfo *channel) {
 
 					if ((opcode & 0x10)) {
 						debug(8, "channels[%lu]: pause %d",
-							  channel - _channels, channel->d.time_left);
+							  (long)(channel - _channels), channel->d.time_left);
 						goto end;
 					}
 
@@ -690,7 +690,7 @@ void Player_V2::execute_cmd(ChannelInfo *channel) {
 				}
 
 				debug(8, "channels[%lu]: @%04lx note: %3d+%d len: %2d hull: %d mod: %d/%d/%d %s",
-						dest_channel - channel, script_ptr ? script_ptr - _current_data - 2 : 0,
+						(long)(dest_channel - channel), (long)(script_ptr ? 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,
-- 
cgit v1.2.3