[Scummvm-cvs-logs] SF.net SVN: scummvm:[42984] scummvm/branches/gsoc2009-mods/sound/mods

[nolange at users.sourceforge.net]

Revision: 42984
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42984&view=rev
Author:   nolange
Date:     2009-08-02 00:15:38 +0000 (Sun, 02 Aug 2009)

Log Message:
-----------
fixed some constness warnings

Modified Paths:
--------------
    scummvm/branches/gsoc2009-mods/sound/mods/tfmx.cpp
    scummvm/branches/gsoc2009-mods/sound/mods/tfmx.h

Modified: scummvm/branches/gsoc2009-mods/sound/mods/tfmx.cpp
===================================================================
--- scummvm/branches/gsoc2009-mods/sound/mods/tfmx.cpp	2009-08-02 00:08:32 UTC (rev 42983)
+++ scummvm/branches/gsoc2009-mods/sound/mods/tfmx.cpp	2009-08-02 00:15:38 UTC (rev 42984)
@@ -1096,7 +1096,7 @@
 	const byte command = patData[0];
 	if (command < 0xF0) { // Playnote
 		const byte flags = command >> 6; // 0-1 means note+detune, 2 means wait, 3 means portamento?
-		char *flagsSt[] = { "Note ", "Note ", "Wait ", "Porta" };
+		const char *flagsSt[] = { "Note ", "Note ", "Wait ", "Porta" };
 		debug("%s %02X%02X%02X%02X", flagsSt[flags], patData[0], patData[1], patData[2], patData[3]);
 	} else
 		debug("%s %02X%02X%02X",tablePatterns[command & 0xF], patData[1], patData[2], patData[3]);

Modified: scummvm/branches/gsoc2009-mods/sound/mods/tfmx.h
===================================================================
--- scummvm/branches/gsoc2009-mods/sound/mods/tfmx.h	2009-08-02 00:08:32 UTC (rev 42983)
+++ scummvm/branches/gsoc2009-mods/sound/mods/tfmx.h	2009-08-02 00:15:38 UTC (rev 42984)
@@ -200,28 +200,28 @@
 	} _playerCtx;
 
 	const byte *getSfxPtr(uint16 index = 0) const {
-		const byte *sfxPtr = (byte *)(_resource->mdatData + _resource->sfxTableOffset + index * 8);
+		const byte *sfxPtr = (const byte *)(_resource->mdatData + _resource->sfxTableOffset + index * 8);
 
 		_resource->boundaryCheck(sfxPtr, 8);
 		return sfxPtr;
 	}
 
 	const uint16 *getTrackPtr(uint16 trackstep = 0) const {
-		const uint16 *trackData = (uint16 *)(_resource->mdatData + _resource->trackstepOffset + 16 * trackstep);
+		const uint16 *trackData = (const uint16 *)(_resource->mdatData + _resource->trackstepOffset + 16 * trackstep);
 
 		_resource->boundaryCheck(trackData, 16);
 		return trackData;
 	}
 
 	const uint32 *getPatternPtr(uint32 offset) const {
-		const uint32 *pattData = (uint32 *)(_resource->mdatData + offset);
+		const uint32 *pattData = (const uint32 *)(_resource->mdatData + offset);
 
 		_resource->boundaryCheck(pattData, 4);
 		return pattData;
 	}
 
 	const uint32 *getMacroPtr(uint32 offset) const {
-		const uint32 *macroData = (uint32 *)(_resource->mdatData + offset);
+		const uint32 *macroData = (const uint32 *)(_resource->mdatData + offset);
 
 		_resource->boundaryCheck(macroData, 4);
 		return macroData;


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