aboutsummaryrefslogtreecommitdiff
path: root/scumm/sound.h
diff options
context:
space:
mode:
authorMax Horn2003-05-21 18:09:49 +0000
committerMax Horn2003-05-21 18:09:49 +0000
commit86d57f3c7af8fd0d4c6a4d1751ccdaac77c3b2e8 (patch)
treeaa7c2126baa9dd2ca7dd80910f5835b6aa861294 /scumm/sound.h
parent11d29b71ab4400e6e732ba7cd49a343150360eaf (diff)
downloadscummvm-rg350-86d57f3c7af8fd0d4c6a4d1751ccdaac77c3b2e8.tar.gz
scummvm-rg350-86d57f3c7af8fd0d4c6a4d1751ccdaac77c3b2e8.tar.bz2
scummvm-rg350-86d57f3c7af8fd0d4c6a4d1751ccdaac77c3b2e8.zip
many pedantic warning fixes (and some actual potential buglets fixed, too)
svn-id: r7795
Diffstat (limited to 'scumm/sound.h')
-rw-r--r--scumm/sound.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/scumm/sound.h b/scumm/sound.h
index 3afac58f80..468422e554 100644
--- a/scumm/sound.h
+++ b/scumm/sound.h
@@ -42,8 +42,8 @@ enum {
bool _soundsPaused2;
bool _soundVolumePreset;
- char *_nameBundleMusic;
- char *_newNameBundleMusic;
+ const char *_nameBundleMusic;
+ const char *_newNameBundleMusic;
byte _musicDisk;
byte _voiceDisk;
int32 _currentSampleBundleMusic;
@@ -162,7 +162,7 @@ public:
void stopSfxSound();
bool isSfxFinished();
uint32 decode12BitsSample(byte *src, byte **dst, uint32 size, bool stereo);
- void playBundleMusic(char *song);
+ void playBundleMusic(const char *song);
void pauseBundleMusic(bool state);
void bundleMusicHandler(Scumm *scumm);
void stopBundleMusic();