diff options
| author | Johannes Schickel | 2010-10-09 11:18:19 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2010-10-09 11:18:19 +0000 |
| commit | 571fe5d21eb7967974e5492ff8beab4545de7720 (patch) | |
| tree | 7cf1678d0e4fc96672346dea2a952cc604e0e4fb | |
| parent | eef9f7b57b493cfb7712fd47cb961d16e8ce878d (diff) | |
| download | scummvm-rg350-571fe5d21eb7967974e5492ff8beab4545de7720.tar.gz scummvm-rg350-571fe5d21eb7967974e5492ff8beab4545de7720.tar.bz2 scummvm-rg350-571fe5d21eb7967974e5492ff8beab4545de7720.zip | |
TOON: Constify some more tables.
svn-id: r53099
| -rw-r--r-- | engines/toon/character.cpp | 2 | ||||
| -rw-r--r-- | engines/toon/detection.cpp | 2 | ||||
| -rw-r--r-- | engines/toon/drew.cpp | 2 | ||||
| -rw-r--r-- | engines/toon/flux.cpp | 2 | ||||
| -rw-r--r-- | engines/toon/toon.cpp | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/engines/toon/character.cpp b/engines/toon/character.cpp index 2de846bfe5..c0612b5f00 100644 --- a/engines/toon/character.cpp +++ b/engines/toon/character.cpp @@ -899,7 +899,7 @@ const SpecialCharacterAnimation *Character::getSpecialAnimation(int32 characterI { "BRTKB1", 17, 0, 0, 0, 0, 255, 255, 255, 255, 2, 14, 0, 255 } }; - static int32 characterAnims[] = { + static const int32 characterAnims[] = { 0, 39, 81, 89, 91, 108, 117, 124, 138, 146, 148, 156, 164, 169, 174, 179, 184, 193, 197, 207, 213, 218, 233, 235, 244, 245, 246, 246, 246, 246, diff --git a/engines/toon/detection.cpp b/engines/toon/detection.cpp index 4c5996edd8..a0017f2571 100644 --- a/engines/toon/detection.cpp +++ b/engines/toon/detection.cpp @@ -102,7 +102,7 @@ static const ADFileBasedFallback fileBasedFallback[] = { } // End of namespace Toon -static const char *directoryGlobs[] = { +static const char * const directoryGlobs[] = { "misc", "act1", "arcaddbl", diff --git a/engines/toon/drew.cpp b/engines/toon/drew.cpp index 5d60e5bdbd..b50a8db3dc 100644 --- a/engines/toon/drew.cpp +++ b/engines/toon/drew.cpp @@ -115,7 +115,7 @@ void CharacterDrew::update(int32 timeIncrement) { int32 CharacterDrew::getRandomIdleAnim() { debugC(3, kDebugCharacter, "getRandomIdleAnim()"); - static int32 idle[] = { 6, 9, 10, 11, 12 }; + static const int32 idle[] = { 6, 9, 10, 11, 12 }; return idle[_vm->randRange(0, 4)]; } } // End of namespace Toon diff --git a/engines/toon/flux.cpp b/engines/toon/flux.cpp index 0d5ee06d2f..f7c6bebf0b 100644 --- a/engines/toon/flux.cpp +++ b/engines/toon/flux.cpp @@ -100,7 +100,7 @@ void CharacterFlux::update(int32 timeIncrement) { int32 CharacterFlux::getRandomIdleAnim() { debugC(3, kDebugCharacter, "getRandomIdleAnim()"); - static int32 idle[] = { 0xe, 0xf, 0x21, 0x22, 0x24, 0x25, 0x27 }; + static const int32 idle[] = { 0xe, 0xf, 0x21, 0x22, 0x24, 0x25, 0x27 }; return idle[_vm->randRange(0, 6)]; } diff --git a/engines/toon/toon.cpp b/engines/toon/toon.cpp index afabba920f..f1a31323c7 100644 --- a/engines/toon/toon.cpp +++ b/engines/toon/toon.cpp @@ -1532,8 +1532,8 @@ void ToonEngine::drawInfoLine() { if (_currentHotspotItem >= 0 && _currentHotspotItem < 2000) { infoTool = _roomTexts->getText(_currentHotspotItem); } else if (_currentHotspotItem <= -1) { -// static char *specialInfoLine[] = { "Exit non defined", "Bottomless Bag", "Flux", "Drew Blanc" }; - infoTool = _specialInfoLine[-1-_currentHotspotItem ]; +// static const char * const specialInfoLine[] = { "Exit non defined", "Bottomless Bag", "Flux", "Drew Blanc" }; + infoTool = _specialInfoLine[-1 - _currentHotspotItem]; } else { int32 loc = _currentHotspotItem - 2000; // location names are hardcoded ... |