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

1 files changed, 7 insertions, 7 deletions

diff --git a/engines/kyra/sound_adlib.cpp b/engines/kyra/sound_adlib.cpp
index 3e8465dbd0..0e823ed347 100644
--- a/engines/kyra/sound_adlib.cpp
+++ b/engines/kyra/sound_adlib.cpp
@@ -769,7 +769,7 @@ void AdlibDriver::writeOPL(byte reg, byte val) {
 }
 
 void AdlibDriver::initChannel(Channel &channel) {
-	debugC(9, kDebugLevelSound, "initChannel(%d)", &channel - _channels);
+	debugC(9, kDebugLevelSound, "initChannel(%lu)", &channel - _channels);
 	memset(&channel.dataptr, 0, sizeof(Channel) - ((char*)&channel.dataptr - (char*)&channel));
 
 	channel.tempo = 0xFF;
@@ -781,7 +781,7 @@ void AdlibDriver::initChannel(Channel &channel) {
 }
 
 void AdlibDriver::noteOff(Channel &channel) {
-	debugC(9, kDebugLevelSound, "noteOff(%d)", &channel - _channels);
+	debugC(9, kDebugLevelSound, "noteOff(%lu)", &channel - _channels);
 
 	// The control channel has no corresponding Adlib channel
 
@@ -860,7 +860,7 @@ uint16 AdlibDriver::getRandomNr() {
 }
 
 void AdlibDriver::setupDuration(uint8 duration, Channel &channel) {
-	debugC(9, kDebugLevelSound, "setupDuration(%d, %d)", duration, &channel - _channels);
+	debugC(9, kDebugLevelSound, "setupDuration(%d, %lu)", duration, &channel - _channels);
 	if (channel.durationRandomness) {
 		channel.duration = duration + (getRandomNr() & channel.durationRandomness);
 		return;
@@ -875,7 +875,7 @@ void AdlibDriver::setupDuration(uint8 duration, Channel &channel) {
 // to noteOn(), which will always play the current note.
 
 void AdlibDriver::setupNote(uint8 rawNote, Channel &channel, bool flag) {
-	debugC(9, kDebugLevelSound, "setupNote(%d, %d)", rawNote, &channel - _channels);
+	debugC(9, kDebugLevelSound, "setupNote(%d, %lu)", rawNote, &channel - _channels);
 
 	channel.rawNote = rawNote;
 
@@ -929,7 +929,7 @@ void AdlibDriver::setupNote(uint8 rawNote, Channel &channel, bool flag) {
 }
 
 void AdlibDriver::setupInstrument(uint8 regOffset, uint8 *dataptr, Channel &channel) {
-	debugC(9, kDebugLevelSound, "setupInstrument(%d, %p, %d)", regOffset, (const void *)dataptr, &channel - _channels);
+	debugC(9, kDebugLevelSound, "setupInstrument(%d, %p, %lu)", regOffset, (const void *)dataptr, &channel - _channels);
 	// Amplitude Modulation / Vibrato / Envelope Generator Type /
 	// Keyboard Scaling Rate / Modulator Frequency Multiple
 	writeOPL(0x20 + regOffset, *dataptr++);
@@ -976,7 +976,7 @@ void AdlibDriver::setupInstrument(uint8 regOffset, uint8 *dataptr, Channel &chan
 // primary effect 2.
 
 void AdlibDriver::noteOn(Channel &channel) {
-	debugC(9, kDebugLevelSound, "noteOn(%d)", &channel - _channels);
+	debugC(9, kDebugLevelSound, "noteOn(%lu)", &channel - _channels);
 
 	// The "note on" bit is set, and the current note is played.
 
@@ -990,7 +990,7 @@ void AdlibDriver::noteOn(Channel &channel) {
 }
 
 void AdlibDriver::adjustVolume(Channel &channel) {
-	debugC(9, kDebugLevelSound, "adjustVolume(%d)", &channel - _channels);
+	debugC(9, kDebugLevelSound, "adjustVolume(%lu)", &channel - _channels);
 	// Level Key Scaling / Total Level
 
 	writeOPL(0x43 + _regOffset[_curChannel], calculateOpLevel2(channel));