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

[thebluegr at users.sourceforge.net]

Revision: 53055
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53055&view=rev
Author:   thebluegr
Date:     2010-10-07 20:18:33 +0000 (Thu, 07 Oct 2010)

Log Message:
-----------
SCUMM: Silenced signed/unsigned warnings, removed unused variable

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/player_towns.cpp
    scummvm/trunk/engines/scumm/player_towns.h

Modified: scummvm/trunk/engines/scumm/player_towns.cpp
===================================================================
--- scummvm/trunk/engines/scumm/player_towns.cpp	2010-10-07 20:00:32 UTC (rev 53054)
+++ scummvm/trunk/engines/scumm/player_towns.cpp	2010-10-07 20:18:33 UTC (rev 53055)
@@ -156,7 +156,7 @@
 	}
 }
 
-int Player_Towns::getNextFreePcmChannel(int sound, int sfxChanRelIndex, int priority) {
+int Player_Towns::getNextFreePcmChannel(int sound, int sfxChanRelIndex, uint32 priority) {
 	if (!_intf)
 		return 0;
 
@@ -693,7 +693,6 @@
 				_soundOverride2[args[1]].type = 7;
 		}
 		if (_soundOverride2[args[1]].type == 7)	{
-			int p = CLIP<int>(args[2], -63, 63);
 			_soundOverride2[args[1]].pan = 64 - CLIP<int>(args[2], -63, 63);
 			res = 0;
 		}
@@ -733,7 +732,7 @@
 
 	const uint8 *src = data + 6;
 	uint8 *dst = _sblData + 32;
-	for (int i = 0; i < len; i++)
+	for (uint32 i = 0; i < len; i++)
 		*dst++ = *src & 0x80 ? (*src++ & 0x7f) : -*src++;
 
 	_intf->callback(37, 0x3f + chan, 60, 127, _sblData);

Modified: scummvm/trunk/engines/scumm/player_towns.h
===================================================================
--- scummvm/trunk/engines/scumm/player_towns.h	2010-10-07 20:00:32 UTC (rev 53054)
+++ scummvm/trunk/engines/scumm/player_towns.h	2010-10-07 20:18:33 UTC (rev 53055)
@@ -59,7 +59,7 @@
 	void playPcmTrack(int sound, const uint8 *data, int velo = 0, int pan = 64, int note = 0, int priority = 0);
 	void stopPcmTrack(int sound);
 
-	int getNextFreePcmChannel(int sound, int sfxChanRelIndex, int priority);
+	int getNextFreePcmChannel(int sound, int sfxChanRelIndex, uint32 priority);
 
 	struct PcmCurrentSound {
 		uint16 index;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.