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_v1.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_v1.cpp')
| -rw-r--r-- | engines/scumm/player_v1.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/scumm/player_v1.cpp b/engines/scumm/player_v1.cpp index 74605b20d1..03c3419502 100644 --- a/engines/scumm/player_v1.cpp +++ b/engines/scumm/player_v1.cpp @@ -133,7 +133,7 @@ void Player_V1::parseSpeakerChunk() { parse_again: _chunk_type = READ_LE_UINT16(_next_chunk); - debug(6, "parseSpeakerChunk: sound %d, offset %4x, chunk %x", + debug(6, "parseSpeakerChunk: sound %d, offset %lx, chunk %x", _current_nr, _next_chunk - _current_data, _chunk_type); _next_chunk += 2; @@ -209,7 +209,7 @@ void Player_V1::nextSpeakerCmd() { _time_left = READ_LE_UINT16(_next_chunk); _next_chunk += 2; } - debug(7, "nextSpeakerCmd: chunk %d, offset %4x: notelen %d", + debug(7, "nextSpeakerCmd: chunk %d, offset %4lx: notelen %d", _chunk_type, _next_chunk - 2 - _current_data, _time_left); if (_time_left == 0) { parseSpeakerChunk(); @@ -265,7 +265,7 @@ void Player_V1::parsePCjrChunk() { parse_again: _chunk_type = READ_LE_UINT16(_next_chunk); - debug(6, "parsePCjrChunk: sound %d, offset %4x, chunk %x", + debug(6, "parsePCjrChunk: sound %d, offset %4lx, chunk %x", _current_nr, _next_chunk - _current_data, _chunk_type); _next_chunk += 2; @@ -351,7 +351,7 @@ parse_again: } *_value_ptr_2 = _start_2; } - debug(6, "chunk 1: %d: %d step %d for %d, %d: %d step %d for %d", + debug(6, "chunk 1: %lu: %d step %d for %d, %lu: %d step %d for %d", _value_ptr - (uint*)_channels, _start, _delta, _time_left, _value_ptr_2 - (uint*)_channels, _start_2, _delta_2, _time_left_2); break; |