aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlyssa Milburn2011-08-17 10:50:26 +0200
committerAlyssa Milburn2011-08-17 10:50:26 +0200
commita9f002897ea344d8851d66a9a3fa27dd3d457fa7 (patch)
treeb373ce2145ffcc42ed58ca98dea93bc4bb43dfb5
parent9a94a239b8b9099ebfb8b4061ca68a0a7b1174b7 (diff)
downloadscummvm-rg350-a9f002897ea344d8851d66a9a3fa27dd3d457fa7.tar.gz
scummvm-rg350-a9f002897ea344d8851d66a9a3fa27dd3d457fa7.tar.bz2
scummvm-rg350-a9f002897ea344d8851d66a9a3fa27dd3d457fa7.zip
CGE: Preserve const in cast.
-rw-r--r--engines/cge/snddrv.h2
-rw-r--r--engines/cge/sound.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/cge/snddrv.h b/engines/cge/snddrv.h
index 0678971d0c..7af214365f 100644
--- a/engines/cge/snddrv.h
+++ b/engines/cge/snddrv.h
@@ -45,7 +45,7 @@ namespace CGE {
// sample info
struct SmpInfo {
- uint8 *_saddr; // address
+ const uint8 *_saddr; // address
uint16 _slen; // length
uint16 _span; // left/right pan (0-15)
int _sflag; // flag
diff --git a/engines/cge/sound.cpp b/engines/cge/sound.cpp
index a3895958f0..8a199c7ee2 100644
--- a/engines/cge/sound.cpp
+++ b/engines/cge/sound.cpp
@@ -61,7 +61,7 @@ void Sound::open() {
void Sound::play(DataCk *wav, int pan, int cnt) {
if (wav) {
stop();
- _smpinf._saddr = (uint8 *) &*(wav->addr());
+ _smpinf._saddr = &*(wav->addr());
_smpinf._slen = (uint16)wav->size();
_smpinf._span = pan;
_smpinf._sflag = cnt;