[Scummvm-cvs-logs] SF.net SVN: scummvm: [32812] scummvm/trunk/engines/kyra/sound_towns.cpp

[athrxx at users.sourceforge.net]

Revision: 32812
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32812&view=rev
Author:   athrxx
Date:     2008-06-26 13:43:23 -0700 (Thu, 26 Jun 2008)

Log Message:
-----------
fix bad const casts

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/sound_towns.cpp

Modified: scummvm/trunk/engines/kyra/sound_towns.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound_towns.cpp	2008-06-26 20:30:43 UTC (rev 32811)
+++ scummvm/trunk/engines/kyra/sound_towns.cpp	2008-06-26 20:43:23 UTC (rev 32812)
@@ -159,7 +159,7 @@
 	void loadDataToEndOfQueue(uint8 *trackdata, uint32 size, bool loop = 0);
 	void setPlayBackStatus(bool playing);
 	bool isPlaying() {return _playing; }
-	const uint8 * trackData() {return _trackData; }
+	uint8 *trackData() {return _trackData; }
 
 	bool _loop;
 	Towns_EuphonyTrackQueue *_next;
@@ -807,7 +807,7 @@
 		if (info.ext.type == 0x2F) {
 			unloadMusic();
 			memset(&info, 0, sizeof(EventInfo));
-			pos = _position._play_pos = _tracks[0] = (byte*) _queue->trackData() + 0x806;
+			pos = _position._play_pos = _tracks[0] = _queue->trackData() + 0x806;
 		} else if (_active_track == 255) {
 			_queue = _queue->_next;
 			setup();
@@ -964,7 +964,7 @@
 }
 
 void Towns_EuphonyParser::setup() {
-	uint8 *data = (uint8 *) _queue->trackData();
+	uint8 *data = _queue->trackData();
 	if (!data)
 		return;
 	_queue->initDriver();


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