[Scummvm-cvs-logs] SF.net SVN: scummvm:[53099] scummvm/trunk/engines/toon
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Sat Oct 9 13:18:20 CEST 2010
Revision: 53099
http://scummvm.svn.sourceforge.net/scummvm/?rev=53099&view=rev
Author: lordhoto
Date: 2010-10-09 11:18:19 +0000 (Sat, 09 Oct 2010)
Log Message:
-----------
TOON: Constify some more tables.
Modified Paths:
--------------
scummvm/trunk/engines/toon/character.cpp
scummvm/trunk/engines/toon/detection.cpp
scummvm/trunk/engines/toon/drew.cpp
scummvm/trunk/engines/toon/flux.cpp
scummvm/trunk/engines/toon/toon.cpp
Modified: scummvm/trunk/engines/toon/character.cpp
===================================================================
--- scummvm/trunk/engines/toon/character.cpp 2010-10-09 11:11:26 UTC (rev 53098)
+++ scummvm/trunk/engines/toon/character.cpp 2010-10-09 11:18:19 UTC (rev 53099)
@@ -899,7 +899,7 @@
{ "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,
Modified: scummvm/trunk/engines/toon/detection.cpp
===================================================================
--- scummvm/trunk/engines/toon/detection.cpp 2010-10-09 11:11:26 UTC (rev 53098)
+++ scummvm/trunk/engines/toon/detection.cpp 2010-10-09 11:18:19 UTC (rev 53099)
@@ -102,7 +102,7 @@
} // End of namespace Toon
-static const char *directoryGlobs[] = {
+static const char * const directoryGlobs[] = {
"misc",
"act1",
"arcaddbl",
Modified: scummvm/trunk/engines/toon/drew.cpp
===================================================================
--- scummvm/trunk/engines/toon/drew.cpp 2010-10-09 11:11:26 UTC (rev 53098)
+++ scummvm/trunk/engines/toon/drew.cpp 2010-10-09 11:18:19 UTC (rev 53099)
@@ -115,7 +115,7 @@
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
Modified: scummvm/trunk/engines/toon/flux.cpp
===================================================================
--- scummvm/trunk/engines/toon/flux.cpp 2010-10-09 11:11:26 UTC (rev 53098)
+++ scummvm/trunk/engines/toon/flux.cpp 2010-10-09 11:18:19 UTC (rev 53099)
@@ -100,7 +100,7 @@
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)];
}
Modified: scummvm/trunk/engines/toon/toon.cpp
===================================================================
--- scummvm/trunk/engines/toon/toon.cpp 2010-10-09 11:11:26 UTC (rev 53098)
+++ scummvm/trunk/engines/toon/toon.cpp 2010-10-09 11:18:19 UTC (rev 53099)
@@ -1532,8 +1532,8 @@
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 ...
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list