aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Kagerer2010-10-07 19:27:11 +0000
committerFlorian Kagerer2010-10-07 19:27:11 +0000
commitcf9c948433e123904cd61f9ae67e09453ea1ab74 (patch)
tree4457e460bcae696cadda98a5e2801baa294cdfb5
parent01c9b1706823b5a872f376a51a94ae3266dad69a (diff)
downloadscummvm-rg350-cf9c948433e123904cd61f9ae67e09453ea1ab74.tar.gz
scummvm-rg350-cf9c948433e123904cd61f9ae67e09453ea1ab74.tar.bz2
scummvm-rg350-cf9c948433e123904cd61f9ae67e09453ea1ab74.zip
SCUMM/FM-TOWNS: cleanup
svn-id: r53053
-rw-r--r--engines/scumm/player_towns.cpp4
-rw-r--r--engines/scumm/player_towns.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/scumm/player_towns.cpp b/engines/scumm/player_towns.cpp
index 6d8dc9f847..1c4ae51d2a 100644
--- a/engines/scumm/player_towns.cpp
+++ b/engines/scumm/player_towns.cpp
@@ -630,7 +630,7 @@ void Player_Towns_v2::startSound(int sound) {
playPcmTrack(sound, ptr + 8, velo, pan, 0, pri);
} else if (READ_BE_UINT32(ptr) == MKID_BE('SBL ')) {
_soundOverride2[sound].type = 5;
- playPcmTrackSBL(sound, ptr + 27);
+ playPcmTrackSBL(ptr + 27);
} else {
_soundOverride2[sound].type = 3;
_imuse->startSound(sound);
@@ -714,7 +714,7 @@ void Player_Towns_v2::saveLoadWithSerializer(Serializer *ser) {
Player_Towns::saveLoadWithSerializer(ser);
}
-void Player_Towns_v2::playPcmTrackSBL(int sound, const uint8 *data) {
+void Player_Towns_v2::playPcmTrackSBL(const uint8 *data) {
static const uint8 header[] = {
0x54, 0x61, 0x6C, 0x6B, 0x69, 0x65, 0x20, 0x20,
0x78, 0x56, 0x34, 0x12, 0x00, 0x00, 0x00, 0x00,
diff --git a/engines/scumm/player_towns.h b/engines/scumm/player_towns.h
index 4635a436f0..3e0fc3598a 100644
--- a/engines/scumm/player_towns.h
+++ b/engines/scumm/player_towns.h
@@ -170,7 +170,7 @@ public:
void saveLoadWithSerializer(Serializer *ser);
private:
- void playPcmTrackSBL(int sound, const uint8 *data);
+ void playPcmTrackSBL(const uint8 *data);
uint8 *_sblData;
IMuse *_imuse;