diff options
| author | Jonathan Gray | 2006-04-12 10:01:41 +0000 |
|---|---|---|
| committer | Jonathan Gray | 2006-04-12 10:01:41 +0000 |
| commit | eb3ae7d7260f1cd2319e605e4b054d004733228c (patch) | |
| tree | 195b8779841dae3513ced4ece726de87d9453e04 /engines/scumm/player_v2.cpp | |
| parent | adbafccc64fba8f314a302042b78c2a36a61619f (diff) | |
| download | scummvm-rg350-eb3ae7d7260f1cd2319e605e4b054d004733228c.tar.gz scummvm-rg350-eb3ae7d7260f1cd2319e605e4b054d004733228c.tar.bz2 scummvm-rg350-eb3ae7d7260f1cd2319e605e4b054d004733228c.zip | |
sizeof(void *) != sizeof(int) for a large number of systems.
Fix a lot of debug/error statements that were using %d/%x
for the result of pointer arithmetic.
As C++ apparently has no format string for ptrdiff_t use
%lu/%lx as appropriate.
svn-id: r21824
Diffstat (limited to 'engines/scumm/player_v2.cpp')
| -rw-r--r-- | engines/scumm/player_v2.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/scumm/player_v2.cpp b/engines/scumm/player_v2.cpp index d49706d524..9423fb773c 100644 --- a/engines/scumm/player_v2.cpp +++ b/engines/scumm/player_v2.cpp @@ -565,14 +565,14 @@ void Player_V2::execute_cmd(ChannelInfo *channel) { if (opcode >= 0xf8) { switch (opcode) { case 0xf8: // set hull curve - debug(7, "channels[%d]: hull curve %2d", + debug(7, "channels[%lu]: hull curve %2d", 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", + debug(7, "channels[%lu]: freqmod curve %2d", channel - _channels, *script_ptr); channel->d.freqmod_table = freqmod_offsets[*script_ptr / 4]; channel->d.freqmod_modulo = freqmod_lengths[*script_ptr / 4]; @@ -643,7 +643,7 @@ void Player_V2::execute_cmd(ChannelInfo *channel) { opcode = *script_ptr++; value = READ_LE_UINT16 (script_ptr); channel->array[opcode / 2] = value; - debug(7, "channels[%d]: set param %2d = %5d", + debug(7, "channels[%lu]: set param %2d = %5d", channel - &_channels[0], opcode, value); script_ptr += 2; if (opcode == 14) { @@ -671,7 +671,7 @@ void Player_V2::execute_cmd(ChannelInfo *channel) { is_last_note = note & 0x80; note &= 0x7f; if (note == 0x7f) { - debug(8, "channels[%d]: pause %d", + debug(8, "channels[%lu]: pause %d", channel - _channels, channel->d.time_left); goto end; } @@ -680,7 +680,7 @@ void Player_V2::execute_cmd(ChannelInfo *channel) { channel->d.time_left = ((opcode & 7) << 8) | *script_ptr++; if ((opcode & 0x10)) { - debug(8, "channels[%d]: pause %d", + debug(8, "channels[%lu]: pause %d", channel - _channels, channel->d.time_left); goto end; } @@ -689,7 +689,7 @@ void Player_V2::execute_cmd(ChannelInfo *channel) { note = (*script_ptr++) & 0x7f; } - debug(8, "channels[%d]: @%04x note: %3d+%d len: %2d hull: %d mod: %d/%d/%d %s", + 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, note, (signed short) dest_channel->d.transpose, channel->d.time_left, dest_channel->d.hull_curve, dest_channel->d.freqmod_table, |