aboutsummaryrefslogtreecommitdiff
path: root/engines/cine
diff options
context:
space:
mode:
authorMax Horn2006-02-25 00:33:12 +0000
committerMax Horn2006-02-25 00:33:12 +0000
commitf39699517320cbccca7f2705c451efa60c781773 (patch)
tree83068eca9a9d8eeda5adea2aa8190e0c2b75ce63 /engines/cine
parent2fc23c85da1c69eb6a88fecf51f677bbeeca2b96 (diff)
downloadscummvm-rg350-f39699517320cbccca7f2705c451efa60c781773.tar.gz
scummvm-rg350-f39699517320cbccca7f2705c451efa60c781773.tar.bz2
scummvm-rg350-f39699517320cbccca7f2705c451efa60c781773.zip
Use static/const on data tables when possible (this helps the compiler to optimize things better)
svn-id: r20853
Diffstat (limited to 'engines/cine')
-rw-r--r--engines/cine/auto00.cpp4
-rw-r--r--engines/cine/auto00.h2
-rw-r--r--engines/cine/font.cpp2
-rw-r--r--engines/cine/font.h4
-rw-r--r--engines/cine/part.cpp2
-rw-r--r--engines/cine/prc.cpp2
6 files changed, 8 insertions, 8 deletions
diff --git a/engines/cine/auto00.cpp b/engines/cine/auto00.cpp
index b18b08dd3b..8db2adf752 100644
--- a/engines/cine/auto00.cpp
+++ b/engines/cine/auto00.cpp
@@ -22,9 +22,11 @@
*
*/
+#include "cine/auto00.h"
+
namespace Cine {
-unsigned char AUT000[] = {
+const unsigned char AUT000[] = {
0x00, 0x32, 0x00, 0x00, 0x00, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
diff --git a/engines/cine/auto00.h b/engines/cine/auto00.h
index ec291189d6..23159bb30b 100644
--- a/engines/cine/auto00.h
+++ b/engines/cine/auto00.h
@@ -27,7 +27,7 @@
namespace Cine {
-extern unsigned char AUT000[];
+extern const unsigned char AUT000[];
#define AUT000_size sizeof(AUT000);
diff --git a/engines/cine/font.cpp b/engines/cine/font.cpp
index e1581b2502..0cd96af135 100644
--- a/engines/cine/font.cpp
+++ b/engines/cine/font.cpp
@@ -26,7 +26,7 @@
namespace Cine {
-characterEntry fontParamTable[256] = {
+const characterEntry fontParamTable[256] = {
{ 0, 0}, { 0, 0}, { 0, 0}, { 0, 0}, { 0, 0}, { 0, 0}, { 0, 0}, { 0, 0},
{ 0, 0}, { 0, 0}, { 0, 0}, { 0, 0}, { 0, 0}, { 0, 0}, { 0, 0}, { 0, 0},
{ 0, 0}, { 0, 0}, { 0, 0}, { 0, 0}, { 0, 0}, { 0, 0}, { 0, 0}, { 0, 0},
diff --git a/engines/cine/font.h b/engines/cine/font.h
index 1cfdbede9d..c86f552ccf 100644
--- a/engines/cine/font.h
+++ b/engines/cine/font.h
@@ -32,9 +32,7 @@ struct characterEntry {
uint8 characterWidth;
};
-typedef struct characterEntry characterEntry;
-
-extern characterEntry fontParamTable[256];
+extern const characterEntry fontParamTable[256];
} // End of namespace Cine
diff --git a/engines/cine/part.cpp b/engines/cine/part.cpp
index ea627c9b90..7f1e8a2b8e 100644
--- a/engines/cine/part.cpp
+++ b/engines/cine/part.cpp
@@ -103,7 +103,7 @@ void freePartRange(uint8 startIdx, uint8 numIdx) {
void closePart(void) {
}
-const char *bundleNames[] = {
+static const char *bundleNames[] = {
"EGOUBASE",
"LABYBASE",
"PROCEGOU",
diff --git a/engines/cine/prc.cpp b/engines/cine/prc.cpp
index 2151271029..6ae7bebef1 100644
--- a/engines/cine/prc.cpp
+++ b/engines/cine/prc.cpp
@@ -73,7 +73,7 @@ void loadPrc(const char *pPrcName) {
checkDataDisk(-1);
if ((gameType == Cine::GID_FW) && (!strcmp(pPrcName, "AUTO00.PRC"))) {
- unsigned char *readPtr = AUT000;
+ const unsigned char *readPtr = AUT000;
processPendingUpdates(1);