diff options
author | Johannes Schickel | 2011-09-08 20:13:13 +0200 |
---|---|---|
committer | Johannes Schickel | 2011-09-08 20:13:13 +0200 |
commit | 6fe7b020a8befa82b815f098a095190511bd450e (patch) | |
tree | 24e66fa432c715c7c27845bf6b544fe032a4f7e2 | |
parent | af19990980906acd21424e764463c18344948efc (diff) | |
download | scummvm-rg350-6fe7b020a8befa82b815f098a095190511bd450e.tar.gz scummvm-rg350-6fe7b020a8befa82b815f098a095190511bd450e.tar.bz2 scummvm-rg350-6fe7b020a8befa82b815f098a095190511bd450e.zip |
SCUMM: Made some static data const.
-rw-r--r-- | engines/scumm/actor.cpp | 4 | ||||
-rw-r--r-- | engines/scumm/detection.cpp | 4 | ||||
-rw-r--r-- | engines/scumm/detection_tables.h | 2 | ||||
-rw-r--r-- | engines/scumm/dialogs.cpp | 2 | ||||
-rw-r--r-- | engines/scumm/he/logic/basketball.cpp | 2 | ||||
-rw-r--r-- | engines/scumm/script_v0.cpp | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp index 20b929dfd4..eb23c30ebe 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 037c12bdbf..3ed9218776 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 78645ea8d5..7463fa7dcc 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 74a92f2204..20aedae089 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 8352aa4357..a4da8e05dc 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 1ef16d7106..e2d3f40e8e 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 |