aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--engines/kyra/animator_mr.cpp2
-rw-r--r--engines/kyra/kyra_hof.cpp4
-rw-r--r--engines/kyra/kyra_hof.h4
-rw-r--r--engines/kyra/kyra_mr.h2
-rw-r--r--engines/kyra/sequences_mr.cpp4
-rw-r--r--engines/kyra/sound_adlib.cpp4
-rw-r--r--engines/kyra/staticres.cpp22
-rw-r--r--engines/kyra/staticres_lol.cpp12
-rw-r--r--engines/kyra/text_hof.cpp2
-rw-r--r--engines/kyra/text_mr.cpp2
10 files changed, 29 insertions, 29 deletions
diff --git a/engines/kyra/animator_mr.cpp b/engines/kyra/animator_mr.cpp
index 6414b99ffd..31c5cd1a53 100644
--- a/engines/kyra/animator_mr.cpp
+++ b/engines/kyra/animator_mr.cpp
@@ -445,7 +445,7 @@ void KyraEngine_MR::showIdleAnim() {
if (!_nextIdleType && !talkObjectsInCurScene()) {
randomSceneChat();
} else {
- static const char *facingTable[] = {
+ static const char *const facingTable[] = {
"A", "R", "R", "FR", "FX", "FL", "L", "L"
};
diff --git a/engines/kyra/kyra_hof.cpp b/engines/kyra/kyra_hof.cpp
index b82099f058..c9603a2523 100644
--- a/engines/kyra/kyra_hof.cpp
+++ b/engines/kyra/kyra_hof.cpp
@@ -857,7 +857,7 @@ void KyraEngine_HoF::loadOptionsBuffer(const char *file) {
void KyraEngine_HoF::loadChapterBuffer(int chapter) {
char tempString[14];
- static const char *chapterFilenames[] = {
+ static const char *const chapterFilenames[] = {
"CH1.XXX", "CH2.XXX", "CH3.XXX", "CH4.XXX", "CH5.XXX"
};
@@ -1413,7 +1413,7 @@ void KyraEngine_HoF::runIdleScript(int script) {
setNextIdleAnimTimer();
} else {
// FIXME: move this to staticres.cpp?
- static const char *idleScriptFiles[] = {
+ static const char *const idleScriptFiles[] = {
"_IDLHAIR.EMC", "_IDLDUST.EMC", "_IDLLEAN.EMC", "_IDLDIRT.EMC", "_IDLTOSS.EMC", "_IDLNOSE.EMC",
"_IDLBRSH.EMC", "_Z3IDLE.EMC", "_Z4IDLE.EMC", "_Z6IDLE.EMC", "_Z7IDLE.EMC", "_Z8IDLE.EMC"
};
diff --git a/engines/kyra/kyra_hof.h b/engines/kyra/kyra_hof.h
index 2561171598..916cac0c9d 100644
--- a/engines/kyra/kyra_hof.h
+++ b/engines/kyra/kyra_hof.h
@@ -566,8 +566,8 @@ protected:
// -
char _internStringBuf[200];
- static const char *_languageExtension[];
- static const char *_scriptLangExt[];
+ static const char *const _languageExtension[];
+ static const char *const _scriptLangExt[];
// character
bool _useCharPal;
diff --git a/engines/kyra/kyra_mr.h b/engines/kyra/kyra_mr.h
index ec76340638..473c0371dc 100644
--- a/engines/kyra/kyra_mr.h
+++ b/engines/kyra/kyra_mr.h
@@ -659,7 +659,7 @@ private:
// resource specific
private:
- static const char *_languageExtension[];
+ static const char *const _languageExtension[];
static const int _languageExtensionSize;
int loadLanguageFile(const char *file, uint8 *&buffer);
diff --git a/engines/kyra/sequences_mr.cpp b/engines/kyra/sequences_mr.cpp
index d546d9c25b..76badb63f5 100644
--- a/engines/kyra/sequences_mr.cpp
+++ b/engines/kyra/sequences_mr.cpp
@@ -57,7 +57,7 @@ void KyraEngine_MR::showBadConscience() {
talkObject.x = 30;
talkObject.y = 30;
- static const char *animFilenames[] = {
+ static const char *const animFilenames[] = {
"GUNFL00.WSA", "GUNFL01.WSA", "GUNFL02.WSA", "GUNFL03.WSA", "GUNFL04.WSA", "GUNFL05.WSA", "GUNFL06.WSA", "GUNFL07.WSA",
"GUNFR00.WSA", "GUNFR01.WSA", "GUNFR02.WSA", "GUNFR03.WSA", "GUNFR04.WSA", "GUNFR05.WSA", "GUNFR06.WSA", "GUNFR07.WSA"
};
@@ -128,7 +128,7 @@ void KyraEngine_MR::showGoodConscience() {
talkObject.x = 30;
talkObject.y = 30;
- static const char *animFilenames[] = {
+ static const char *const animFilenames[] = {
"STUFL00.WSA", "STUFL02.WSA", "STUFL04.WSA", "STUFL03.WSA", "STUFL01.WSA",
"STUFR00.WSA", "STUFR02.WSA", "STUFR04.WSA", "STUFR03.WSA", "STUFR01.WSA"
};
diff --git a/engines/kyra/sound_adlib.cpp b/engines/kyra/sound_adlib.cpp
index 12c980486c..67dc9863a8 100644
--- a/engines/kyra/sound_adlib.cpp
+++ b/engines/kyra/sound_adlib.cpp
@@ -395,7 +395,7 @@ private:
static const uint8 _regOffset[];
static const uint16 _unkTable[];
- static const uint8 *_unkTable2[];
+ static const uint8 *const _unkTable2[];
static const uint8 _unkTable2_1[];
static const uint8 _unkTable2_2[];
static const uint8 _unkTable2_3[];
@@ -2074,7 +2074,7 @@ const uint16 AdLibDriver::_unkTable[] = {
// These tables are currently only used by updateCallback46(), which only ever
// uses the first element of one of the sub-tables.
-const uint8 *AdLibDriver::_unkTable2[] = {
+const uint8 *const AdLibDriver::_unkTable2[] = {
AdLibDriver::_unkTable2_1,
AdLibDriver::_unkTable2_2,
AdLibDriver::_unkTable2_1,
diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp
index f6d59922b1..e03369f700 100644
--- a/engines/kyra/staticres.cpp
+++ b/engines/kyra/staticres.cpp
@@ -794,8 +794,8 @@ void KyraEngine_LoK::initStaticResource() {
}
// audio data tables
- static const char *tIntro98[] = { "INTRO%d.DAT" };
- static const char *tIngame98[] = { "KYRAM%d.DAT" };
+ static const char *const tIntro98[] = { "INTRO%d.DAT" };
+ static const char *const tIngame98[] = { "KYRAM%d.DAT" };
// FIXME: It seems Kyra1 MAC CD includes AdLib and MIDI music and sfx, thus we enable
// support for those for now. (Based on patch #2767489 "Support for Mac Kyrandia 1 CD" by satz).
@@ -1011,13 +1011,13 @@ void KyraEngine_HoF::initStaticResource() {
_sequenceSoundList = tmpSndLst;
// assign music data
- static const char *fmtMusicFileListIntro[] = { "intro%d.twn" };
- static const char *fmtMusicFileListFinale[] = { "finale%d.twn" };
- static const char *fmtMusicFileListIngame[] = { "km%02d.twn" };
+ static const char *const fmtMusicFileListIntro[] = { "intro%d.twn" };
+ static const char *const fmtMusicFileListFinale[] = { "finale%d.twn" };
+ static const char *const fmtMusicFileListIngame[] = { "km%02d.twn" };
- static const char *pc98MusicFileListIntro[] = { "intro%d.86" };
- static const char *pc98MusicFileListFinale[] = { "finale%d.86" };
- static const char *pc98MusicFileListIngame[] = { "km%02d.86" };
+ static const char *const pc98MusicFileListIntro[] = { "intro%d.86" };
+ static const char *const pc98MusicFileListFinale[] = { "finale%d.86" };
+ static const char *const pc98MusicFileListIngame[] = { "km%02d.86" };
memset(_soundData, 0, sizeof(_soundData));
if (_flags.platform == Common::kPlatformPC) {
@@ -1387,7 +1387,7 @@ const int GUI_v2::_sliderBarsPosition[] = {
const uint8 KyraEngine_HoF::_seqTextColorPresets[] = { 0x01, 0x01, 0x00, 0x3f, 0x3f, 0x3f };
-const char *KyraEngine_HoF::_languageExtension[] = {
+const char *const KyraEngine_HoF::_languageExtension[] = {
"ENG",
"FRE",
"GER",/*,
@@ -1396,7 +1396,7 @@ const char *KyraEngine_HoF::_languageExtension[] = {
"JPN",
};
-const char *KyraEngine_HoF::_scriptLangExt[] = {
+const char *const KyraEngine_HoF::_scriptLangExt[] = {
"EMC",
"FMC",
"GMC",/*,
@@ -1885,7 +1885,7 @@ const uint8 KyraEngine_HoF::_rainbowRoomData[] = {
// kyra 3 static res
-const char *KyraEngine_MR::_languageExtension[] = {
+const char *const KyraEngine_MR::_languageExtension[] = {
"TRE",
"TRF",
"TRG"/*,
diff --git a/engines/kyra/staticres_lol.cpp b/engines/kyra/staticres_lol.cpp
index ca35569afa..bf838cd572 100644
--- a/engines/kyra/staticres_lol.cpp
+++ b/engines/kyra/staticres_lol.cpp
@@ -261,13 +261,13 @@ void StaticResource::freeButtonDefs(void *&ptr, int &size) {
void LoLEngine::initStaticResource() {
// assign music data
- static const char *pcMusicFileListIntro[] = { "LOREINTR" };
- static const char *pcMusicFileListFinale[] = { "LOREFINL" };
- static const char *pcMusicFileListIngame[] = { "LORE%02d%c" };
+ static const char *const pcMusicFileListIntro[] = { "LOREINTR" };
+ static const char *const pcMusicFileListFinale[] = { "LOREFINL" };
+ static const char *const pcMusicFileListIngame[] = { "LORE%02d%c" };
- static const char *pc98MusicFileListIntro[] = { 0, "lore84.86", "lore82.86", 0, 0, 0, "lore83.86", "lore81.86" };
- static const char *pc98MusicFileListFinale[] = { 0, 0, "lore85.86", "lore86.86", "lore87.86" };
- static const char *pc98MusicFileListIngame[] = { "lore%02d.86" };
+ static const char *const pc98MusicFileListIntro[] = { 0, "lore84.86", "lore82.86", 0, 0, 0, "lore83.86", "lore81.86" };
+ static const char *const pc98MusicFileListFinale[] = { 0, 0, "lore85.86", "lore86.86", "lore87.86" };
+ static const char *const pc98MusicFileListIngame[] = { "lore%02d.86" };
memset(_soundData, 0, sizeof(_soundData));
if (_flags.platform == Common::kPlatformPC) {
diff --git a/engines/kyra/text_hof.cpp b/engines/kyra/text_hof.cpp
index 4406f3ec41..4a52d7d740 100644
--- a/engines/kyra/text_hof.cpp
+++ b/engines/kyra/text_hof.cpp
@@ -194,7 +194,7 @@ void KyraEngine_HoF::objectChat(const char *str, int object, int vocHigh, int vo
assert(_mainCharacter.facing * 3 + chatType < ARRAYSIZE(talkScriptTable));
int script = talkScriptTable[_mainCharacter.facing * 3 + chatType];
- static const char *chatScriptFilenames[] = {
+ static const char *const chatScriptFilenames[] = {
"_Z1FSTMT.EMC",
"_Z1FQUES.EMC",
"_Z1FEXCL.EMC",
diff --git a/engines/kyra/text_mr.cpp b/engines/kyra/text_mr.cpp
index fd4a00b73c..b680e9c6f9 100644
--- a/engines/kyra/text_mr.cpp
+++ b/engines/kyra/text_mr.cpp
@@ -216,7 +216,7 @@ void KyraEngine_MR::objectChat(const char *str, int object, int vocHigh, int voc
0x08, 0x09, 0x0A, 0x0B
};
- static const char *talkFilenameTable[] = {
+ static const char *const talkFilenameTable[] = {
"MTFL00S.EMC", "MTFL00Q.EMC", "MTFL00E.EMC", "MTFL00T.EMC",
"MTFR00S.EMC", "MTFR00Q.EMC", "MTFR00E.EMC", "MTFR00T.EMC",
"MTL00S.EMC", "MTL00Q.EMC", "MTL00E.EMC", "MTL00T.EMC",
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-05 02:18:09 +0000