diff options
| author | Johannes Schickel | 2011-09-08 00:36:42 +0200 |
|---|---|---|
| committer | Johannes Schickel | 2011-09-08 00:36:42 +0200 |
| commit | 07ec50224e98f85728188de9f931af39d04dcaec (patch) | |
| tree | 0066668c174124bf101f3ca211b62a6e22641cfd | |
| parent | 5443ef943fc4758ee9b1bf8842b0cde02d4f0a59 (diff) | |
| download | scummvm-rg350-07ec50224e98f85728188de9f931af39d04dcaec.tar.gz scummvm-rg350-07ec50224e98f85728188de9f931af39d04dcaec.tar.bz2 scummvm-rg350-07ec50224e98f85728188de9f931af39d04dcaec.zip | |
SKY: Made some static data const.
| -rw-r--r-- | engines/sky/compact.cpp | 2 | ||||
| -rw-r--r-- | engines/sky/compact.h | 2 | ||||
| -rw-r--r-- | engines/sky/debug.cpp | 12 | ||||
| -rw-r--r-- | engines/sky/sound.cpp | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/engines/sky/compact.cpp b/engines/sky/compact.cpp index 84609d5500..fd81cb9bea 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 a7b8520539..0bd5b4943b 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 ebc1ee377d..a417bc2ece 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 e94a2a61d9..a60e3d9e38 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 |