[Scummvm-cvs-logs] scummvm master -> b8dfd3366bc2a183d527dda20c67ffd5a273549b
lordhoto
lordhoto at gmail.com
Thu Sep 8 20:26:32 CEST 2011
This automated email contains information about 9 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
5739e86e0c CINE: Made some static data const.
16344ab6a8 HUGO: Made some static data const.
fdfbf4133e TUCKER: Made some static data const.
2b3da93a95 SKY: Made some more static data const.
e4a94d865f DRACI: Made some static data const.
44068338e5 GOB: Made some static data const.
af19990980 QUEEN: Made some static data const.
6fe7b020a8 SCUMM: Made some static data const.
b8dfd3366b TINSEL: Made some static data const.
Commit: 5739e86e0c6472f1b8d61710c1a9de56774314e3
https://github.com/scummvm/scummvm/commit/5739e86e0c6472f1b8d61710c1a9de56774314e3
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-09-08T10:51:05-07:00
Commit Message:
CINE: Made some static data const.
Changed paths:
engines/cine/texte.cpp
engines/cine/texte.h
diff --git a/engines/cine/texte.cpp b/engines/cine/texte.cpp
index dc18d08..33ea569 100644
--- a/engines/cine/texte.cpp
+++ b/engines/cine/texte.cpp
@@ -28,13 +28,13 @@
namespace Cine {
-const char **failureMessages;
+const char *const *failureMessages;
const CommandeType *defaultActionCommand;
const CommandeType *systemMenu;
const CommandeType *confirmMenu;
-const char **otherMessages;
+const char *const *otherMessages;
const char *defaultCommandPreposition;
-const char **commandPrepositionTable;
+const char *const *commandPrepositionTable;
/**
* Loads font data from the given file.
@@ -152,7 +152,7 @@ static const CharacterEntry fontParamTable_alt[NUM_FONT_CHARS] = {
};
void initLanguage(Common::Language lang) {
- static const char *failureMessages_EN[] = {
+ static const char *const failureMessages_EN[] = {
// EXAMINE
"I don't see anything unusual.",
"There's nothing of interest here.",
@@ -195,7 +195,7 @@ void initLanguage(Common::Language lang) {
"NOACTION"
};
- static const char *commandPrepositionTable_EN[] = {
+ static const char *const commandPrepositionTable_EN[] = {
"", // EXAMINE
"", // TAKE
"", // INVENTORY
@@ -214,7 +214,7 @@ void initLanguage(Common::Language lang) {
"Save game"
};
- static const char *otherMessages_EN[] = {
+ static const char *const otherMessages_EN[] = {
"This backup doesn't exist ...",
"Could not create save file ...",
"PAUSE",
@@ -229,7 +229,7 @@ void initLanguage(Common::Language lang) {
"Absolutely Not!"
};
- static const char *failureMessages_FR[] = {
+ static const char *const failureMessages_FR[] = {
// EXAMINER
"Je ne vois rien de special.",
"Il n'y a rien d'int\x82ressant.",
@@ -272,7 +272,7 @@ void initLanguage(Common::Language lang) {
"NOACTION"
};
- static const char *commandPrepositionTable_FR[] = {
+ static const char *const commandPrepositionTable_FR[] = {
"", // EXAMINER
"", // PRENDRE
"", // INVENTAIRE
@@ -296,7 +296,7 @@ void initLanguage(Common::Language lang) {
"Surtout Pas !"
};
- static const char *otherMessages_FR[] = {
+ static const char *const otherMessages_FR[] = {
"Cette sauvegarde n'existe pas ...",
"Could not create save file ...", //
"PAUSE",
@@ -306,7 +306,7 @@ void initLanguage(Common::Language lang) {
"Veuillez entrer le Nom de la Sauvegarde ."
};
- static const char *failureMessages_ES[] = {
+ static const char *const failureMessages_ES[] = {
// EXAMINE
"No veo nada especial",
"No hay nada interesante",
@@ -349,7 +349,7 @@ void initLanguage(Common::Language lang) {
"NOACTION"
};
- static const char *commandPrepositionTable_ES[] = {
+ static const char *const commandPrepositionTable_ES[] = {
"", // EXAMINAR
"", // COGER
"", // INVENTARIO
@@ -373,7 +373,7 @@ void initLanguage(Common::Language lang) {
"Nade de nada !"
};
- static const char *otherMessages_ES[] = {
+ static const char *const otherMessages_ES[] = {
"Esta granacion no existe",
"Could not create save file ...", //
"PAUSE",
@@ -383,7 +383,7 @@ void initLanguage(Common::Language lang) {
"Teclea el nombre de la partida grabada"
};
- static const char *failureMessages_DE[] = {
+ static const char *const failureMessages_DE[] = {
// EXAMINE
"Ich sehe nichts Besonderes",
"Es gibt hier nichts Interessantes",
@@ -426,7 +426,7 @@ void initLanguage(Common::Language lang) {
"NOACTION"
};
- static const char *commandPrepositionTable_DE[] = {
+ static const char *const commandPrepositionTable_DE[] = {
"", // Prufe
"", // Nimm
"", // Bestand
@@ -450,7 +450,7 @@ void initLanguage(Common::Language lang) {
"Absolut Nicht!"
};
- static const char *otherMessages_DE[] = {
+ static const char *const otherMessages_DE[] = {
"Diese Sicherungskopie gibt es nicht",
"Could not create save file ...", //
"PAUSE",
@@ -460,7 +460,7 @@ void initLanguage(Common::Language lang) {
"Geben Sie den Namen|der Sicherungsdiskette ein"
};
- static const char *failureMessages_IT[] = {
+ static const char *const failureMessages_IT[] = {
// EXAMINE
"Non vedo nula di speciale",
"Non c'\x8a niente di interessante",
@@ -503,7 +503,7 @@ void initLanguage(Common::Language lang) {
"NOACTION"
};
- static const char *commandPrepositionTable_IT[] = {
+ static const char *const commandPrepositionTable_IT[] = {
"", // ESAMINARE
"", // PRENDERE
"", // INVENTARIO
@@ -527,7 +527,7 @@ void initLanguage(Common::Language lang) {
"Supratutto non!"
};
- static const char *otherMessages_IT[] = {
+ static const char *const otherMessages_IT[] = {
"Questo salvataggio non esiste...",
"Could not create save file ...", //
"PAUSE",
@@ -612,7 +612,7 @@ void loadErrmessDat(const char *fname) {
ptr[i] = (char *)ptr + (sizeof(char *) * 6 * 4) + 60 * i;
in.read(ptr[i], 60);
}
- failureMessages = const_cast<const char **>(ptr);
+ failureMessages = const_cast<const char *const *>(ptr);
in.close();
} else {
@@ -621,7 +621,7 @@ void loadErrmessDat(const char *fname) {
}
void freeErrmessDat() {
- free(failureMessages);
+ free(const_cast<const char **>(failureMessages));
failureMessages = 0;
}
diff --git a/engines/cine/texte.h b/engines/cine/texte.h
index f82127d..dd4b7e0 100644
--- a/engines/cine/texte.h
+++ b/engines/cine/texte.h
@@ -50,13 +50,13 @@ struct TextHandler {
CharacterEntry fontParamTable[NUM_FONT_CHARS];
};
-extern const char **failureMessages;
+extern const char *const *failureMessages;
extern const CommandeType *defaultActionCommand;
extern const CommandeType *systemMenu;
extern const CommandeType *confirmMenu;
-extern const char **otherMessages;
+extern const char *const *otherMessages;
extern const char *defaultCommandPreposition;
-extern const char **commandPrepositionTable;
+extern const char *const *commandPrepositionTable;
void loadTextData(const char *filename);
void loadErrmessDat(const char *fname);
Commit: 16344ab6a82be048fd45581a83b5dd99db1d741d
https://github.com/scummvm/scummvm/commit/16344ab6a82be048fd45581a83b5dd99db1d741d
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-09-08T10:51:51-07:00
Commit Message:
HUGO: Made some static data const.
Changed paths:
engines/hugo/parser.cpp
diff --git a/engines/hugo/parser.cpp b/engines/hugo/parser.cpp
index 38a8e4e..bbf6c39 100644
--- a/engines/hugo/parser.cpp
+++ b/engines/hugo/parser.cpp
@@ -449,7 +449,7 @@ const char *Parser::findVerb() const {
*/
void Parser::showDosInventory() const {
debugC(1, kDebugParser, "showDosInventory()");
- static const char *blanks = " ";
+ static const char *const blanks = " ";
uint16 index = 0, len1 = 0, len2 = 0;
for (int i = 0; i < _vm->_object->_numObj; i++) { // Find widths of 2 columns
Commit: fdfbf4133eae73177968131385f559572d6bdeeb
https://github.com/scummvm/scummvm/commit/fdfbf4133eae73177968131385f559572d6bdeeb
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-09-08T10:53:35-07:00
Commit Message:
TUCKER: Made some static data const.
Changed paths:
engines/tucker/staticres.cpp
engines/tucker/tucker.h
diff --git a/engines/tucker/staticres.cpp b/engines/tucker/staticres.cpp
index ef778b6f..388f5ba 100644
--- a/engines/tucker/staticres.cpp
+++ b/engines/tucker/staticres.cpp
@@ -340,7 +340,7 @@ const SoundSequenceDataList AnimationSequencePlayer::_soundSeqDataList[] = {
{ 0, 0, 4, 0, 7, _soundDataSeq19_20 }
};
-const char *AnimationSequencePlayer::_audioFileNamesTable[] = {
+const char *const AnimationSequencePlayer::_audioFileNamesTable[] = {
"demomenu.raw",
"demorolc.raw",
"fx101.wav",
diff --git a/engines/tucker/tucker.h b/engines/tucker/tucker.h
index e676369..3daf75d 100644
--- a/engines/tucker/tucker.h
+++ b/engines/tucker/tucker.h
@@ -989,7 +989,7 @@ private:
Audio::SoundHandle _musicHandle;
static const SoundSequenceDataList _soundSeqDataList[];
- static const char *_audioFileNamesTable[];
+ static const char *const _audioFileNamesTable[];
};
} // namespace Tucker
Commit: 2b3da93a95e9b1cfbb7f4eb18cbf96154ea2e943
https://github.com/scummvm/scummvm/commit/2b3da93a95e9b1cfbb7f4eb18cbf96154ea2e943
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-09-08T10:58:28-07:00
Commit Message:
SKY: Made some more static data const.
Changed paths:
engines/sky/disk.cpp
diff --git a/engines/sky/disk.cpp b/engines/sky/disk.cpp
index a06c5c9..99b707d 100644
--- a/engines/sky/disk.cpp
+++ b/engines/sky/disk.cpp
@@ -32,8 +32,8 @@
namespace Sky {
-static const char *dataFilename = "sky.dsk";
-static const char *dinnerFilename = "sky.dnr";
+static const char *const dataFilename = "sky.dsk";
+static const char *const dinnerFilename = "sky.dnr";
Disk::Disk() {
_dataDiskHandle = new Common::File();
Commit: e4a94d865fe9fbd72d1d2b3e21f9425eb1d82bf9
https://github.com/scummvm/scummvm/commit/e4a94d865fe9fbd72d1d2b3e21f9425eb1d82bf9
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-09-08T10:59:36-07:00
Commit Message:
DRACI: Made some static data const.
Changed paths:
engines/draci/game.cpp
engines/draci/saveload.cpp
diff --git a/engines/draci/game.cpp b/engines/draci/game.cpp
index 893e321..c4108cc 100644
--- a/engines/draci/game.cpp
+++ b/engines/draci/game.cpp
@@ -39,7 +39,7 @@
namespace Draci {
-static const char *dialoguePath = "ROZH";
+static const char *const dialoguePath = "ROZH";
static double real_to_double(byte real[6]);
diff --git a/engines/draci/saveload.cpp b/engines/draci/saveload.cpp
index 78315d1..b3bf0cb 100644
--- a/engines/draci/saveload.cpp
+++ b/engines/draci/saveload.cpp
@@ -33,7 +33,7 @@
namespace Draci {
-static const char *draciIdentString = "DRACI";
+static const char *const draciIdentString = "DRACI";
bool readSavegameHeader(Common::InSaveFile *in, DraciSavegameHeader &header) {
char saveIdentBuffer[6];
Commit: 44068338e57a70a3ea8953c269b523006a0dba28
https://github.com/scummvm/scummvm/commit/44068338e57a70a3ea8953c269b523006a0dba28
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-09-08T11:03:30-07:00
Commit Message:
GOB: Made some static data const.
Changed paths:
engines/gob/init.cpp
engines/gob/init.h
engines/gob/inter_bargon.cpp
engines/gob/sound/sound.cpp
engines/gob/videoplayer.cpp
engines/gob/videoplayer.h
diff --git a/engines/gob/init.cpp b/engines/gob/init.cpp
index 90c2a16..a61261f 100644
--- a/engines/gob/init.cpp
+++ b/engines/gob/init.cpp
@@ -40,7 +40,7 @@
namespace Gob {
-const char *Init::_fontNames[] = { "jeulet1.let", "jeulet2.let", "jeucar1.let", "jeumath.let" };
+const char *const Init::_fontNames[] = { "jeulet1.let", "jeulet2.let", "jeucar1.let", "jeumath.let" };
Init::Init(GobEngine *vm) : _vm(vm) {
_palDesc = 0;
diff --git a/engines/gob/init.h b/engines/gob/init.h
index e8c948c..ac460fd 100644
--- a/engines/gob/init.h
+++ b/engines/gob/init.h
@@ -41,7 +41,7 @@ public:
protected:
Video::PalDesc *_palDesc;
- static const char *_fontNames[4];
+ static const char *const _fontNames[4];
GobEngine *_vm;
void cleanup();
diff --git a/engines/gob/inter_bargon.cpp b/engines/gob/inter_bargon.cpp
index c2e6a2e..134203f 100644
--- a/engines/gob/inter_bargon.cpp
+++ b/engines/gob/inter_bargon.cpp
@@ -120,7 +120,7 @@ void Inter_Bargon::oBargon_intro2(OpGobParams ¶ms) {
SurfacePtr surface;
SoundDesc samples[4];
int16 comp[5] = { 0, 1, 2, 3, -1 };
- static const char *sndFiles[] = {"1INTROII.snd", "2INTROII.snd", "1INTRO3.snd", "2INTRO3.snd"};
+ static const char *const sndFiles[] = {"1INTROII.snd", "2INTROII.snd", "1INTRO3.snd", "2INTRO3.snd"};
surface = _vm->_video->initSurfDesc(320, 200);
_vm->_video->drawPackedSprite("2ille.ims", *surface);
@@ -169,8 +169,8 @@ void Inter_Bargon::oBargon_intro3(OpGobParams ¶ms) {
SoundDesc samples[2];
int16 comp[3] = { 0, 1, -1 };
byte *palettes[4];
- static const char *sndFiles[] = {"1INTROIV.snd", "2INTROIV.snd"};
- static const char *palFiles[] = {"2ou2.clt", "2ou3.clt", "2ou4.clt", "2ou5.clt"};
+ static const char *const sndFiles[] = {"1INTROIV.snd", "2INTROIV.snd"};
+ static const char *const palFiles[] = {"2ou2.clt", "2ou3.clt", "2ou4.clt", "2ou5.clt"};
int32 size;
diff --git a/engines/gob/sound/sound.cpp b/engines/gob/sound/sound.cpp
index 212116f..e064a31 100644
--- a/engines/gob/sound/sound.cpp
+++ b/engines/gob/sound/sound.cpp
@@ -330,7 +330,7 @@ void Sound::adlibPlayBgMusic() {
if (!_adlPlayer)
_adlPlayer = new ADLPlayer(*_vm->_mixer);
- static const char *tracksMac[] = {
+ static const char *const tracksMac[] = {
// "musmac1.adl", // TODO: This track isn't played correctly at all yet
"musmac2.adl",
"musmac3.adl",
@@ -339,7 +339,7 @@ void Sound::adlibPlayBgMusic() {
"musmac6.adl"
};
- static const char *tracksWin[] = {
+ static const char *const tracksWin[] = {
"musmac1.mid",
"musmac2.mid",
"musmac3.mid",
@@ -534,7 +534,7 @@ void Sound::cdPlayBgMusic() {
if (!_cdrom)
return;
- static const char *tracks[][2] = {
+ static const char *const tracks[][2] = {
{"avt00.tot", "mine"},
{"avt001.tot", "nuit"},
{"avt002.tot", "campagne"},
@@ -571,7 +571,7 @@ void Sound::cdPlayMultMusic() {
if (!_cdrom)
return;
- static const char *tracks[][6] = {
+ static const char *const tracks[][6] = {
{"avt005.tot", "fra1", "all1", "ang1", "esp1", "ita1"},
{"avt006.tot", "fra2", "all2", "ang2", "esp2", "ita2"},
{"avt012.tot", "fra3", "all3", "ang3", "esp3", "ita3"},
diff --git a/engines/gob/videoplayer.cpp b/engines/gob/videoplayer.cpp
index c032184..221f5ab 100644
--- a/engines/gob/videoplayer.cpp
+++ b/engines/gob/videoplayer.cpp
@@ -61,7 +61,7 @@ void VideoPlayer::Video::close() {
}
-const char *VideoPlayer::_extensions[] = { "IMD", "IMD", "VMD", "RMD", "SMD" };
+const char *const VideoPlayer::_extensions[] = { "IMD", "IMD", "VMD", "RMD", "SMD" };
VideoPlayer::VideoPlayer(GobEngine *vm) : _vm(vm), _needBlit(false),
_noCursorSwitch(false), _woodruffCohCottWorkaround(false) {
diff --git a/engines/gob/videoplayer.h b/engines/gob/videoplayer.h
index 3738329..bc7cb48 100644
--- a/engines/gob/videoplayer.h
+++ b/engines/gob/videoplayer.h
@@ -167,7 +167,7 @@ private:
static const int kVideoSlotCount = 32;
- static const char *_extensions[];
+ static const char *const _extensions[];
GobEngine *_vm;
Commit: af19990980906acd21424e764463c18344948efc
https://github.com/scummvm/scummvm/commit/af19990980906acd21424e764463c18344948efc
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-09-08T11:07:36-07:00
Commit Message:
QUEEN: Made some static data const.
Changed paths:
engines/queen/graphics.cpp
engines/queen/input.cpp
engines/queen/input.h
engines/queen/musicdata.cpp
engines/queen/resource.cpp
engines/queen/resource.h
engines/queen/sound.h
diff --git a/engines/queen/graphics.cpp b/engines/queen/graphics.cpp
index d9a8a10..fbb72fd 100644
--- a/engines/queen/graphics.cpp
+++ b/engines/queen/graphics.cpp
@@ -1201,7 +1201,7 @@ void BamScene::updateCarAnimation() {
}
void BamScene::updateFightAnimation() {
- static const BamDataBlock *fightDataBlocks[] = {
+ static const BamDataBlock *const fightDataBlocks[] = {
_fight1Data,
_fight2Data,
_fight3Data
diff --git a/engines/queen/input.cpp b/engines/queen/input.cpp
index 5a04b0f..30bf681 100644
--- a/engines/queen/input.cpp
+++ b/engines/queen/input.cpp
@@ -30,7 +30,7 @@
namespace Queen {
-const char *Input::_commandKeys[] = {
+const char *const Input::_commandKeys[] = {
"ocmglptu", // English
"osbgpnre", // German
"ofdnepau", // French
diff --git a/engines/queen/input.h b/engines/queen/input.h
index 93e2bde..0aa04dd 100644
--- a/engines/queen/input.h
+++ b/engines/queen/input.h
@@ -141,7 +141,7 @@ private:
const char *_currentCommandKeys;
//! command keys for all languages
- static const char *_commandKeys[];
+ static const char *const _commandKeys[];
//! verbs matching the command keys
static const Verb _verbKeys[];
diff --git a/engines/queen/musicdata.cpp b/engines/queen/musicdata.cpp
index d3974dc..a046355 100644
--- a/engines/queen/musicdata.cpp
+++ b/engines/queen/musicdata.cpp
@@ -1495,7 +1495,7 @@ const TuneData Sound::_tune[] = {
{ { 77, 1017, 0 }, { 0, 0 }, 1, 0 }
};
-const char *Sound::_sfxName[] = {
+const char *const Sound::_sfxName[] = {
/* 1 - Door Open (standard) */
"116Bssss",
diff --git a/engines/queen/resource.cpp b/engines/queen/resource.cpp
index d837a63..84043fa 100644
--- a/engines/queen/resource.cpp
+++ b/engines/queen/resource.cpp
@@ -30,7 +30,7 @@
namespace Queen {
-const char *Resource::_tableFilename = "queen.tbl";
+const char *const Resource::_tableFilename = "queen.tbl";
const RetailGameVersion Resource::_gameVersions[] = {
{ "PEM10", 1, 0x00000008, 22677657 },
diff --git a/engines/queen/resource.h b/engines/queen/resource.h
index 5c6746e..ef8e463 100644
--- a/engines/queen/resource.h
+++ b/engines/queen/resource.h
@@ -158,7 +158,7 @@ protected:
static const RetailGameVersion *detectGameVersionFromSize(uint32 size);
//! resource table filename (queen.tbl)
- static const char *_tableFilename;
+ static const char *const _tableFilename;
//! known FOTAQ versions
static const RetailGameVersion _gameVersions[];
diff --git a/engines/queen/sound.h b/engines/queen/sound.h
index 2aabb0d..371500f 100644
--- a/engines/queen/sound.h
+++ b/engines/queen/sound.h
@@ -104,7 +104,7 @@ public:
static const SongData _song[];
static const TuneData _tuneDemo[];
static const TuneData _tune[];
- static const char *_sfxName[];
+ static const char *const _sfxName[];
static const int16 _jungleList[];
protected:
Commit: 6fe7b020a8befa82b815f098a095190511bd450e
https://github.com/scummvm/scummvm/commit/6fe7b020a8befa82b815f098a095190511bd450e
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-09-08T11:13:13-07:00
Commit Message:
SCUMM: Made some static data const.
Changed paths:
engines/scumm/actor.cpp
engines/scumm/detection.cpp
engines/scumm/detection_tables.h
engines/scumm/dialogs.cpp
engines/scumm/he/logic/basketball.cpp
engines/scumm/script_v0.cpp
diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index 20b929d..eb23c30 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -2287,7 +2287,7 @@ void Actor::setActorCostume(int c) {
}
}
-static const char* v0ActorNames_English[25] = {
+static const char *const v0ActorNames_English[25] = {
"Syd",
"Razor",
"Dave",
@@ -2313,7 +2313,7 @@ static const char* v0ActorNames_English[25] = {
"Sandy"
};
-static const char* v0ActorNames_German[25] = {
+static const char *const v0ActorNames_German[25] = {
"Syd",
"Razor",
"Dave",
diff --git a/engines/scumm/detection.cpp b/engines/scumm/detection.cpp
index 037c12b..3ed9218 100644
--- a/engines/scumm/detection.cpp
+++ b/engines/scumm/detection.cpp
@@ -436,7 +436,7 @@ static void computeGameSettingsFromMD5(const Common::FSList &fslist, const GameF
}
}
-static void composeFileHashMap(DescMap &fileMD5Map, const Common::FSList &fslist, int depth, const char **globs) {
+static void composeFileHashMap(DescMap &fileMD5Map, const Common::FSList &fslist, int depth, const char *const *globs) {
if (depth <= 0)
return;
@@ -454,7 +454,7 @@ static void composeFileHashMap(DescMap &fileMD5Map, const Common::FSList &fslist
continue;
bool matched = false;
- for (const char **glob = globs; *glob; glob++)
+ for (const char *const *glob = globs; *glob; glob++)
if (file->getName().matchString(*glob, true)) {
matched = true;
break;
diff --git a/engines/scumm/detection_tables.h b/engines/scumm/detection_tables.h
index 78645ea..7463fa7 100644
--- a/engines/scumm/detection_tables.h
+++ b/engines/scumm/detection_tables.h
@@ -49,7 +49,7 @@ namespace Scumm {
* This table contains list of directories which could contain game data
* and which should be looked into during detection.
*/
-static const char *directoryGlobs[] = {
+static const char *const directoryGlobs[] = {
"rooms *", // Mac version of indy3/loom
0
};
diff --git a/engines/scumm/dialogs.cpp b/engines/scumm/dialogs.cpp
index 74a92f2..20aedae 100644
--- a/engines/scumm/dialogs.cpp
+++ b/engines/scumm/dialogs.cpp
@@ -593,7 +593,7 @@ void SubtitleSettingsDialog::open() {
}
void SubtitleSettingsDialog::cycleValue() {
- static const char* subtitleDesc[] = {
+ static const char *const subtitleDesc[] = {
_s("Speech Only"),
_s("Speech and Subtitles"),
_s("Subtitles Only")
diff --git a/engines/scumm/he/logic/basketball.cpp b/engines/scumm/he/logic/basketball.cpp
index 8352aa4..a4da8e0 100644
--- a/engines/scumm/he/logic/basketball.cpp
+++ b/engines/scumm/he/logic/basketball.cpp
@@ -157,7 +157,7 @@ int LogicHEbasketball::op_1012() {
int LogicHEbasketball::op_1050(int32 *args) {
// This function loads the court data
- static const char *courtNames[] = {
+ static const char *const courtNames[] = {
"Dobbaguchi", "Jocindas", "SandyFlats", "Queens",
"Park", "Scheffler", "Polk", "McMillan",
"CrownHill", "Memorial", "TechState", "Garden",
diff --git a/engines/scumm/script_v0.cpp b/engines/scumm/script_v0.cpp
index 1ef16d7..e2d3f40 100644
--- a/engines/scumm/script_v0.cpp
+++ b/engines/scumm/script_v0.cpp
@@ -442,7 +442,7 @@ void ScummEngine_v0::drawSentenceWord(int object, bool usePrep, bool objInInvent
// The prepositions, like the fonts, were hard code in the engine. Thus
// we have to do that, too, and provde localized versions for all the
// languages MM/Zak are available in.
- static const char *prepositions[][5] = {
+ static const char *const prepositions[][5] = {
{ " ", " in", " with", " on", " to" }, // English
{ " ", " mit", " mit", " mit", " zu" }, // German
{ " ", " dans", " avec", " sur", " <" }, // French
Commit: b8dfd3366bc2a183d527dda20c67ffd5a273549b
https://github.com/scummvm/scummvm/commit/b8dfd3366bc2a183d527dda20c67ffd5a273549b
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-09-08T11:15:07-07:00
Commit Message:
TINSEL: Made some static data const.
Changed paths:
engines/tinsel/tinsel.cpp
engines/tinsel/tinsel.h
diff --git a/engines/tinsel/tinsel.cpp b/engines/tinsel/tinsel.cpp
index 80f02ff..635845a 100644
--- a/engines/tinsel/tinsel.cpp
+++ b/engines/tinsel/tinsel.cpp
@@ -778,7 +778,7 @@ static const GameSettings tinselSettings[] = {
// For the languages, refer to the LANGUAGE enum in dw.h
-const char *TinselEngine::_sampleIndices[][3] = {
+const char *const TinselEngine::_sampleIndices[][3] = {
{ "english.idx", "english1.idx", "english2.idx" }, // English
{ "french.idx", "french1.idx", "french2.idx" }, // French
{ "german.idx", "german1.idx", "german2.idx" }, // German
@@ -789,7 +789,7 @@ const char *TinselEngine::_sampleIndices[][3] = {
{ "english.idx", "english1.idx", "english2.idx" }, // Japanese (FIXME: not sure if this is correct)
{ "us.idx", "us1.idx", "us2.idx" } // US English
};
-const char *TinselEngine::_sampleFiles[][3] = {
+const char *const TinselEngine::_sampleFiles[][3] = {
{ "english.smp", "english1.smp", "english2.smp" }, // English
{ "french.smp", "french1.smp", "french2.smp" }, // French
{ "german.smp", "german1.smp", "german2.smp" }, // German
@@ -800,7 +800,7 @@ const char *TinselEngine::_sampleFiles[][3] = {
{ "english.smp", "english1.smp", "english2.smp" }, // Japanese (FIXME: not sure if this is correct)
{ "us.smp", "us1.smp", "us2.smp" }, // US English
};
-const char *TinselEngine::_textFiles[][3] = {
+const char *const TinselEngine::_textFiles[][3] = {
{ "english.txt", "english1.txt", "english2.txt" }, // English
{ "french.txt", "french1.txt", "french2.txt" }, // French
{ "german.txt", "german1.txt", "german2.txt" }, // German
diff --git a/engines/tinsel/tinsel.h b/engines/tinsel/tinsel.h
index e18216c..59344c4 100644
--- a/engines/tinsel/tinsel.h
+++ b/engines/tinsel/tinsel.h
@@ -156,9 +156,9 @@ class TinselEngine : public Engine {
Console *_console;
Scheduler *_scheduler;
- static const char *_sampleIndices[][3];
- static const char *_sampleFiles[][3];
- static const char *_textFiles[][3];
+ static const char *const _sampleIndices[][3];
+ static const char *const _sampleFiles[][3];
+ static const char *const _textFiles[][3];
protected:
More information about the Scummvm-git-logs
mailing list