[Scummvm-cvs-logs] scummvm master -> 507b9a75e729eb50f2ef63d2234c3c1b434f2ee1

lordhoto lordhoto at gmail.com
Thu Sep 8 00:47:45 CEST 2011


This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
1fa858d339 KYRA: Made some more static data const.
5443ef943f SCI: Made some static data const.
07ec50224e SKY: Made some static data const.
507b9a75e7 AGOS: Made some static data const.


Commit: 1fa858d33910ae92cb19ac3cda8b77a2f104e8dc
    https://github.com/scummvm/scummvm/commit/1fa858d33910ae92cb19ac3cda8b77a2f104e8dc
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-09-07T15:33:10-07:00

Commit Message:
KYRA: Made some more static data const.

Changed paths:
    engines/kyra/animator_mr.cpp
    engines/kyra/kyra_hof.cpp
    engines/kyra/kyra_hof.h
    engines/kyra/kyra_mr.h
    engines/kyra/sequences_mr.cpp
    engines/kyra/sound_adlib.cpp
    engines/kyra/staticres.cpp
    engines/kyra/staticres_lol.cpp
    engines/kyra/text_hof.cpp
    engines/kyra/text_mr.cpp



diff --git a/engines/kyra/animator_mr.cpp b/engines/kyra/animator_mr.cpp
index 6414b99..31c5cd1 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 b82099f..c9603a2 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 2561171..916cac0 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 ec76340..473c037 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 d546d9c..76badb6 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 12c9804..67dc986 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 f6d5992..e03369f 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 ca35569..bf838cd 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 4406f3e..4a52d7d 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 fd4a00b..b680e9c 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",


Commit: 5443ef943fc4758ee9b1bf8842b0cde02d4f0a59
    https://github.com/scummvm/scummvm/commit/5443ef943fc4758ee9b1bf8842b0cde02d4f0a59
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-09-07T15:35:12-07:00

Commit Message:
SCI: Made some static data const.

Changed paths:
    engines/sci/engine/kernel_tables.h
    engines/sci/resource.cpp
    engines/sci/sound/drivers/gm_names.h



diff --git a/engines/sci/engine/kernel_tables.h b/engines/sci/engine/kernel_tables.h
index 0c5d4e6..3c5af6f 100644
--- a/engines/sci/engine/kernel_tables.h
+++ b/engines/sci/engine/kernel_tables.h
@@ -602,7 +602,7 @@ static SciKernelMapEntry s_kernelMap[] = {
 };
 
 /** Default kernel name table. */
-static const char *s_defaultKernelNames[] = {
+static const char *const s_defaultKernelNames[] = {
 	/*0x00*/ "Load",
 	/*0x01*/ "UnLoad",
 	/*0x02*/ "ScriptID",
@@ -751,7 +751,7 @@ static const char *s_defaultKernelNames[] = {
 
 // NOTE: 0x72-0x79, 0x85-0x86, 0x88 are from the GK2 demo (which has debug support) and are
 // just Dummy in other SCI2 games.
-static const char *sci2_default_knames[] = {
+static const char *const sci2_default_knames[] = {
 	/*0x00*/ "Load",
 	/*0x01*/ "UnLoad",
 	/*0x02*/ "ScriptID",
@@ -916,7 +916,7 @@ static const char *sci2_default_knames[] = {
 	/*0x9f*/ "MessageBox"
 };
 
-static const char *sci21_default_knames[] = {
+static const char *const sci21_default_knames[] = {
 	/*0x00*/ "Load",
 	/*0x01*/ "UnLoad",
 	/*0x02*/ "ScriptID",
diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp
index 1b8b7b2..17a4af9 100644
--- a/engines/sci/resource.cpp
+++ b/engines/sci/resource.cpp
@@ -93,7 +93,7 @@ const char *getSciVersionDesc(SciVersion version) {
 
 //#define SCI_VERBOSE_RESMAN 1
 
-static const char *sci_error_types[] = {
+static const char *const sci_error_types[] = {
 	"No error",
 	"I/O error",
 	"Resource is empty (size 0)",
@@ -107,7 +107,7 @@ static const char *sci_error_types[] = {
 	"SCI version is unsupported"
 };
 
-static const char *s_resourceTypeNames[] = {
+static const char *const s_resourceTypeNames[] = {
 	"view", "pic", "script", "text", "sound",
 	"memory", "vocab", "font", "cursor",
 	"patch", "bitmap", "palette", "cdaudio",
@@ -120,7 +120,7 @@ static const char *s_resourceTypeNames[] = {
 // Resource type suffixes. Note that the
 // suffic of SCI3 scripts has been changed from
 // scr to csc
-static const char *s_resourceTypeSuffixes[] = {
+static const char *const s_resourceTypeSuffixes[] = {
 	"v56", "p56", "scr", "tex", "snd",
 	   "", "voc", "fon", "cur", "pat",
 	"bit", "pal", "cda", "aud", "syn",
diff --git a/engines/sci/sound/drivers/gm_names.h b/engines/sci/sound/drivers/gm_names.h
index bfe5ff8..fbfa413 100644
--- a/engines/sci/sound/drivers/gm_names.h
+++ b/engines/sci/sound/drivers/gm_names.h
@@ -30,7 +30,7 @@ namespace Sci {
 // is defined
 #ifndef REDUCE_MEMORY_USAGE
 
-static const char *GmInstrumentNames[] = {
+static const char *const GmInstrumentNames[] = {
 	/*000*/  "Acoustic Grand Piano",
 	/*001*/  "Bright Acoustic Piano",
 	/*002*/  "Electric Grand Piano",
@@ -162,7 +162,7 @@ static const char *GmInstrumentNames[] = {
 };
 
 // The GM Percussion map is downwards compatible to the MT32 map, which is used in SCI
-static const char *GmPercussionNames[] = {
+static const char *const GmPercussionNames[] = {
 	/*00*/  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	/*10*/  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	/*20*/  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,


Commit: 07ec50224e98f85728188de9f931af39d04dcaec
    https://github.com/scummvm/scummvm/commit/07ec50224e98f85728188de9f931af39d04dcaec
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-09-07T15:36:42-07:00

Commit Message:
SKY: Made some static data const.

Changed paths:
    engines/sky/compact.cpp
    engines/sky/compact.h
    engines/sky/debug.cpp
    engines/sky/sound.cpp



diff --git a/engines/sky/compact.cpp b/engines/sky/compact.cpp
index 84609d5..fd81cb9 100644
--- a/engines/sky/compact.cpp
+++ b/engines/sky/compact.cpp
@@ -471,7 +471,7 @@ uint16 SkyCompact::giveDataListLen(uint16 listNum) {
 		return _dataListLen[listNum];
 }
 
-const char *SkyCompact::_typeNames[NUM_CPT_TYPES] = {
+const char *const SkyCompact::_typeNames[NUM_CPT_TYPES] = {
 	"null",
 	"COMPACT",
 	"TURNTABLE",
diff --git a/engines/sky/compact.h b/engines/sky/compact.h
index a7b8520..0bd5b49 100644
--- a/engines/sky/compact.h
+++ b/engines/sky/compact.h
@@ -88,7 +88,7 @@ private:
 	uint16  **_cptTypes;
 	Common::File	*_cptFile;
 	uint32	_resetDataPos;
-	static const char *_typeNames[NUM_CPT_TYPES];
+	static const char *const _typeNames[NUM_CPT_TYPES];
 };
 
 } // End of namespace Sky
diff --git a/engines/sky/debug.cpp b/engines/sky/debug.cpp
index ebc1ee3..a417bc2 100644
--- a/engines/sky/debug.cpp
+++ b/engines/sky/debug.cpp
@@ -35,7 +35,7 @@
 
 namespace Sky {
 
-static const char *logic_table_names[] = {
+static const char *const logic_table_names[] = {
 	"return",
 	"Logic::script",
 	"Logic::auto_route",
@@ -79,7 +79,7 @@ static const char opcode_par[] = {
 	0
 };
 
-static const char *opcodes[] = {
+static const char *const opcodes[] = {
 	"push_variable",
 	"less_than",
 	"push_number",
@@ -103,7 +103,7 @@ static const char *opcodes[] = {
 	"restart_script"
 };
 
-static const char *mcodes[] = {
+static const char *const mcodes[] = {
 	"fn_cache_chip",
 	"fn_cache_fast",
 	"fn_draw_screen",
@@ -221,7 +221,7 @@ static const char *mcodes[] = {
 	"fn_printf"
 };
 
-static const char *scriptVars[] = {
+static const char *const scriptVars[] = {
 	"result",
 	"screen",
 	"logic_list_no",
@@ -1121,12 +1121,12 @@ bool Debugger::Cmd_ReloadGrid(int argc, const char **argv) {
 	return true;
 }
 
-static const char *logicTypes[] = {
+static const char *const logicTypes[] = {
 	"(none)", "SCRIPT", "AUTOROUTE", "AR_ANIM", "AR_TURNING", "ALT", "MOD_ANIM", "TURNING", "CURSOR", "TALK", "LISTEN",
 	"STOPPED", "CHOOSE", "FRAMES", "PAUSE", "WAIT_SYNC", "SIMPLE MOD"
 };
 
-static const char *noYes[] = { "no", "yes" };
+static const char *const noYes[] = { "no", "yes" };
 
 void Debugger::dumpCompact(uint16 cptId) {
 	uint16 type, size;
diff --git a/engines/sky/sound.cpp b/engines/sky/sound.cpp
index e94a2a6..a60e3d9 100644
--- a/engines/sky/sound.cpp
+++ b/engines/sky/sound.cpp
@@ -872,7 +872,7 @@ static const Sfx fx_orifice_swallow_drip = {
 	}
 };
 
-static const Sfx *musicList[] = {
+static const Sfx *const musicList[] = {
 	&fx_press_bang, // 256 banging of the press
 	&fx_press_hiss, // 257 hissing press
 	&fx_wind_howl, // 258 howling wind


Commit: 507b9a75e729eb50f2ef63d2234c3c1b434f2ee1
    https://github.com/scummvm/scummvm/commit/507b9a75e729eb50f2ef63d2234c3c1b434f2ee1
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-09-07T15:38:39-07:00

Commit Message:
AGOS: Made some static data const.

Changed paths:
    engines/agos/animation.cpp
    engines/agos/animation.h
    engines/agos/detection.cpp
    engines/agos/res_snd.cpp
    engines/agos/string_pn.cpp
    engines/agos/verb_pn.cpp



diff --git a/engines/agos/animation.cpp b/engines/agos/animation.cpp
index b056235..d9d6b71 100644
--- a/engines/agos/animation.cpp
+++ b/engines/agos/animation.cpp
@@ -137,7 +137,7 @@ void MoviePlayer::handleNextFrame() {
 // Movie player for DXA movies
 ///////////////////////////////////////////////////////////////////////////////
 
-const char * MoviePlayerDXA::_sequenceList[90] = {
+const char *const MoviePlayerDXA::_sequenceList[90] = {
 	"agent32",
 	"Airlock",
 	"Badluck",
diff --git a/engines/agos/animation.h b/engines/agos/animation.h
index e1d7207..11936aa 100644
--- a/engines/agos/animation.h
+++ b/engines/agos/animation.h
@@ -73,7 +73,7 @@ protected:
 };
 
 class MoviePlayerDXA : public MoviePlayer, Video::DXADecoder {
-	static const char *_sequenceList[90];
+	static const char *const _sequenceList[90];
 	uint8 _sequenceNum;
 public:
 	MoviePlayerDXA(AGOSEngine_Feeble *vm, const char *name);
diff --git a/engines/agos/detection.cpp b/engines/agos/detection.cpp
index 861aa08..116e668 100644
--- a/engines/agos/detection.cpp
+++ b/engines/agos/detection.cpp
@@ -83,7 +83,7 @@ static const PlainGameDescriptor agosGames[] = {
 
 #include "agos/detection_tables.h"
 
-static const char *directoryGlobs[] = {
+static const char *const directoryGlobs[] = {
 	"execute", // Used by Simon1 Acorn CD
 	0
 };
diff --git a/engines/agos/res_snd.cpp b/engines/agos/res_snd.cpp
index 1d4e2d1..b5612d7 100644
--- a/engines/agos/res_snd.cpp
+++ b/engines/agos/res_snd.cpp
@@ -413,7 +413,7 @@ bool AGOSEngine::loadVGASoundFile(uint16 id, uint8 type) {
 	return true;
 }
 
-static const char *dimpSoundList[32] = {
+static const char *const dimpSoundList[32] = {
 	"Beep",
 	"Birth",
 	"Boiling",
diff --git a/engines/agos/string_pn.cpp b/engines/agos/string_pn.cpp
index 570fbc6..ac8c263 100644
--- a/engines/agos/string_pn.cpp
+++ b/engines/agos/string_pn.cpp
@@ -68,7 +68,7 @@ void AGOSEngine_PN::uncomstr(char *c, uint32 x) {
 	*c = 0;
 }
 
-static const char *objectNames[30] = {
+static const char *const objectNames[30] = {
 	"\0",
 	"Take \0",
 	"Inventory\r",
diff --git a/engines/agos/verb_pn.cpp b/engines/agos/verb_pn.cpp
index 19e8bb2..9dd0079 100644
--- a/engines/agos/verb_pn.cpp
+++ b/engines/agos/verb_pn.cpp
@@ -258,7 +258,7 @@ void AGOSEngine_PN::hitBox9(HitArea *ha) {
 	iconPage();
 }
 
-static const char *messageList[9] = {
+static const char *const messageList[9] = {
 	"North\r",
 	"East\r",
 	"South\r",






More information about the Scummvm-git-logs mailing list