diff options
| author | Norbert Lange | 2009-08-02 00:15:38 +0000 |
|---|---|---|
| committer | Norbert Lange | 2009-08-02 00:15:38 +0000 |
| commit | 2dd551695478eb6fc56cf13c791dd31600de7b8f (patch) | |
| tree | f331401087a68fc91ac1a403446636358b659cd0 /sound | |
| parent | 92d292a3f66fa6b0e85ae5a870d44b4d9762f946 (diff) | |
| download | scummvm-rg350-2dd551695478eb6fc56cf13c791dd31600de7b8f.tar.gz scummvm-rg350-2dd551695478eb6fc56cf13c791dd31600de7b8f.tar.bz2 scummvm-rg350-2dd551695478eb6fc56cf13c791dd31600de7b8f.zip | |
fixed some constness warnings
svn-id: r42984
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/mods/tfmx.cpp | 2 | ||||
| -rw-r--r-- | sound/mods/tfmx.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sound/mods/tfmx.cpp b/sound/mods/tfmx.cpp index 32003e19ee..de8f9d797d 100644 --- a/sound/mods/tfmx.cpp +++ b/sound/mods/tfmx.cpp @@ -1096,7 +1096,7 @@ void displayPatternstep(const void *const vptr) { 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]); diff --git a/sound/mods/tfmx.h b/sound/mods/tfmx.h index f7905b70b9..539a36e4d0 100644 --- a/sound/mods/tfmx.h +++ b/sound/mods/tfmx.h @@ -200,28 +200,28 @@ private: } _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; |