[Scummvm-cvs-logs] SF.net SVN: scummvm:[43411] scummvm/trunk/engines/cruise

[lordhoto at users.sourceforge.net]

Revision: 43411
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43411&view=rev
Author:   lordhoto
Date:     2009-08-15 14:59:11 +0000 (Sat, 15 Aug 2009)

Log Message:
-----------
Added const qualifiers to static data.

Modified Paths:
--------------
    scummvm/trunk/engines/cruise/staticres.cpp
    scummvm/trunk/engines/cruise/staticres.h

Modified: scummvm/trunk/engines/cruise/staticres.cpp
===================================================================
--- scummvm/trunk/engines/cruise/staticres.cpp	2009-08-15 14:50:21 UTC (rev 43410)
+++ scummvm/trunk/engines/cruise/staticres.cpp	2009-08-15 14:59:11 UTC (rev 43411)
@@ -29,28 +29,28 @@
 
 namespace Cruise {
 
-int actor_move[][13] = {
+const int actor_move[][13] = {
 	{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 0},						// back
 	{13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 0},			// right side
 	{25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 0},			// front
 	{ -13, -14, -15, -16, -17, -18, -19, -20, -21, -22, -23, -24, 0}// left side
 };
 
-int actor_end[][13] = {
+const int actor_end[][13] = {
 	{37, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},	// stat back
 	{38, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},	// stat right-side
 	{39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},	// stat front
 	{ -38, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}	// stat left-side
 };
 
-int actor_stat[][13] = {
+const int actor_stat[][13] = {
 	{53, 54, 55, 56, 57, 0, 0, 0, 0, 0, 0, 0, 0},
 	{59, 60, 62, 63, 78, 0, 0, 0, 0, 0, 0, 0, 0},
 	{ -78, -63, -62, -60, -59, 0, 0, 0, 0, 0, 0, 0, 0},
 	{ -57, -56, -55, -54, -53, 0, 0, 0, 0, 0, 0, 0, 0}
 };
 
-int actor_invstat[][13] = {
+const int actor_invstat[][13] = {
 	{ -53, -54, -55, -56, -57, 0, 0, 0, 0, 0, 0, 0, 0},
 	{57, 56, 55, 54, 53, 0, 0, 0, 0, 0, 0, 0, 0},
 	{78, 63, 62, 60, 59, 0, 0, 0, 0, 0, 0, 0, 0},
@@ -59,7 +59,7 @@
 
 // font character lookup tables
 
-int16 english_fontCharacterTable[256] = {
+const int16 english_fontCharacterTable[256] = {
 	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
 	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
 	-1,
@@ -122,7 +122,7 @@
 	-1,
 };
 
-int16 german_fontCharacterTable[256] = {
+const int16 german_fontCharacterTable[256] = {
 	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
 	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
 	-1,
@@ -168,7 +168,7 @@
 	-1, -1, -1, -1
 };
 
-int16 spanish_fontCharacterTable[256] = {
+const int16 spanish_fontCharacterTable[256] = {
 	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
 	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
 	-1,

Modified: scummvm/trunk/engines/cruise/staticres.h
===================================================================
--- scummvm/trunk/engines/cruise/staticres.h	2009-08-15 14:50:21 UTC (rev 43410)
+++ scummvm/trunk/engines/cruise/staticres.h	2009-08-15 14:59:11 UTC (rev 43411)
@@ -31,17 +31,17 @@
 
 namespace Cruise {
 
-extern int actor_move[][13];
+extern const int actor_move[][13];
 
-extern int actor_end[][13];
+extern const int actor_end[][13];
 
-extern int actor_stat[][13];
+extern const int actor_stat[][13];
 
-extern int actor_invstat[][13];
+extern const int actor_invstat[][13];
 
-extern short int english_fontCharacterTable[256];
-extern short int german_fontCharacterTable[256];
-extern short int spanish_fontCharacterTable[256];
+extern const int16 english_fontCharacterTable[256];
+extern const int16 german_fontCharacterTable[256];
+extern const int16 spanish_fontCharacterTable[256];
 
 #define fontCharacterTable (_vm->getLanguage() == Common::DE_DEU ? \
 	german_fontCharacterTable : (_vm->getLanguage() == Common::ES_ESP ? \


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.