aboutsummaryrefslogtreecommitdiff
path: root/engines/gob
diff options
context:
space:
mode:
Diffstat (limited to 'engines/gob')
-rw-r--r--engines/gob/inter_bargon.cpp4
-rw-r--r--engines/gob/sound/sound.cpp2
-rw-r--r--engines/gob/sound/sound.h2
-rw-r--r--engines/gob/sound/soundblaster.cpp2
-rw-r--r--engines/gob/sound/soundblaster.h2
5 files changed, 6 insertions, 6 deletions
diff --git a/engines/gob/inter_bargon.cpp b/engines/gob/inter_bargon.cpp
index 134203fa9d..029f7c697b 100644
--- a/engines/gob/inter_bargon.cpp
+++ b/engines/gob/inter_bargon.cpp
@@ -119,7 +119,7 @@ void Inter_Bargon::oBargon_intro2(OpGobParams &params) {
MouseButtons buttons;
SurfacePtr surface;
SoundDesc samples[4];
- int16 comp[5] = { 0, 1, 2, 3, -1 };
+ static const int16 comp[5] = { 0, 1, 2, 3, -1 };
static const char *const sndFiles[] = {"1INTROII.snd", "2INTROII.snd", "1INTRO3.snd", "2INTRO3.snd"};
surface = _vm->_video->initSurfDesc(320, 200);
@@ -167,8 +167,8 @@ void Inter_Bargon::oBargon_intro3(OpGobParams &params) {
MouseButtons buttons;
Video::Color *palBak;
SoundDesc samples[2];
- int16 comp[3] = { 0, 1, -1 };
byte *palettes[4];
+ static const int16 comp[3] = { 0, 1, -1 };
static const char *const sndFiles[] = {"1INTROIV.snd", "2INTROIV.snd"};
static const char *const palFiles[] = {"2ou2.clt", "2ou3.clt", "2ou4.clt", "2ou5.clt"};
diff --git a/engines/gob/sound/sound.cpp b/engines/gob/sound/sound.cpp
index 403bd632a1..69a668e5fb 100644
--- a/engines/gob/sound/sound.cpp
+++ b/engines/gob/sound/sound.cpp
@@ -458,7 +458,7 @@ void Sound::blasterStop(int16 fadeLength, SoundDesc *sndDesc) {
_blaster->stopSound(fadeLength, sndDesc);
}
-void Sound::blasterPlayComposition(int16 *composition, int16 freqVal,
+void Sound::blasterPlayComposition(const int16 *composition, int16 freqVal,
SoundDesc *sndDescs, int8 sndCount) {
if (!_blaster)
return;
diff --git a/engines/gob/sound/sound.h b/engines/gob/sound/sound.h
index 6ad0ec5483..7beffb5dc7 100644
--- a/engines/gob/sound/sound.h
+++ b/engines/gob/sound/sound.h
@@ -60,7 +60,7 @@ public:
int16 frequency, int16 fadeLength = 0);
void blasterStop(int16 fadeLength, SoundDesc *sndDesc = 0);
- void blasterPlayComposition(int16 *composition, int16 freqVal,
+ void blasterPlayComposition(const int16 *composition, int16 freqVal,
SoundDesc *sndDescs = 0, int8 sndCount = kSoundsCount);
void blasterStopComposition();
void blasterRepeatComposition(int32 repCount);
diff --git a/engines/gob/sound/soundblaster.cpp b/engines/gob/sound/soundblaster.cpp
index 19c2346448..f267eee32d 100644
--- a/engines/gob/sound/soundblaster.cpp
+++ b/engines/gob/sound/soundblaster.cpp
@@ -88,7 +88,7 @@ void SoundBlaster::nextCompositionPos() {
_compositionPos = -1;
}
-void SoundBlaster::playComposition(int16 *composition, int16 freqVal,
+void SoundBlaster::playComposition(const int16 *composition, int16 freqVal,
SoundDesc *sndDescs, int8 sndCount) {
_compositionSamples = sndDescs;
diff --git a/engines/gob/sound/soundblaster.h b/engines/gob/sound/soundblaster.h
index c740ba2269..3c4968d611 100644
--- a/engines/gob/sound/soundblaster.h
+++ b/engines/gob/sound/soundblaster.h
@@ -41,7 +41,7 @@ public:
int16 frequency, int16 fadeLength = 0);
void stopSound(int16 fadeLength, SoundDesc *sndDesc = 0);
- void playComposition(int16 *composition, int16 freqVal,
+ void playComposition(const int16 *composition, int16 freqVal,
SoundDesc *sndDescs = 0, int8 sndCount = 60);
void stopComposition();
void endComposition();