aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schickel2009-08-15 14:59:11 +0000
committerJohannes Schickel2009-08-15 14:59:11 +0000
commit02e3f31bf59cbec905c014e5a4cbca6dda417d28 (patch)
treedd742bbc296074b78954bbf53773d9895e797826
parent762d2dc03a7ae28dc49ad4e13720c4071cb6bae5 (diff)
downloadscummvm-rg350-02e3f31bf59cbec905c014e5a4cbca6dda417d28.tar.gz
scummvm-rg350-02e3f31bf59cbec905c014e5a4cbca6dda417d28.tar.bz2
scummvm-rg350-02e3f31bf59cbec905c014e5a4cbca6dda417d28.zip
Added const qualifiers to static data.
svn-id: r43411
-rw-r--r--engines/cruise/staticres.cpp14
-rw-r--r--engines/cruise/staticres.h14
2 files changed, 14 insertions, 14 deletions
diff --git a/engines/cruise/staticres.cpp b/engines/cruise/staticres.cpp
index fa77555314..1ffdc5628a 100644
--- a/engines/cruise/staticres.cpp
+++ b/engines/cruise/staticres.cpp
@@ -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 @@ int actor_invstat[][13] = {
// 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 @@ int16 english_fontCharacterTable[256] = {
-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 @@ int16 german_fontCharacterTable[256] = {
-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,
diff --git a/engines/cruise/staticres.h b/engines/cruise/staticres.h
index 964bf294dc..f17e435acd 100644
--- a/engines/cruise/staticres.h
+++ b/engines/cruise/staticres.h
@@ -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 ? \