aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorPaul Gilbert2009-04-04 01:21:25 +0000
committerPaul Gilbert2009-04-04 01:21:25 +0000
commit07fb7735b5859c216e3de96aa75bcb738d55ec5c (patch)
treeb7a445907bc9eeb1c50657ac81f68bf38473a981 /engines
parent3d608dda3e63da9159c38d9a41960dea1cc16e24 (diff)
downloadscummvm-rg350-07fb7735b5859c216e3de96aa75bcb738d55ec5c.tar.gz
scummvm-rg350-07fb7735b5859c216e3de96aa75bcb738d55ec5c.tar.bz2
scummvm-rg350-07fb7735b5859c216e3de96aa75bcb738d55ec5c.zip
Replaced all occurrences of the constant '257' with the existing constant 'NUM_FILE_ENTRIES'
svn-id: r39824
Diffstat (limited to 'engines')
-rw-r--r--engines/cruise/backgroundIncrust.cpp2
-rw-r--r--engines/cruise/cruise_main.cpp6
-rw-r--r--engines/cruise/dataLoader.cpp4
-rw-r--r--engines/cruise/function.cpp6
-rw-r--r--engines/cruise/saveload.cpp8
5 files changed, 13 insertions, 13 deletions
diff --git a/engines/cruise/backgroundIncrust.cpp b/engines/cruise/backgroundIncrust.cpp
index 1f5a9d8513..8d4bb70128 100644
--- a/engines/cruise/backgroundIncrust.cpp
+++ b/engines/cruise/backgroundIncrust.cpp
@@ -191,7 +191,7 @@ void regenerateBackgroundIncrust(backgroundIncrustStruct *pHead) {
//int screen = pl->backgroundIdx;
if ((filesDatabase[frame].subData.ptr == NULL) || (strcmp(pl->name, filesDatabase[frame].subData.name))) {
- frame = 257 - 1;
+ frame = NUM_FILE_ENTRIES - 1;
if (loadFile(pl->name, frame, pl->spriteId) >= 0) {
bLoad = true;
} else {
diff --git a/engines/cruise/cruise_main.cpp b/engines/cruise/cruise_main.cpp
index 79c62225d4..f260551841 100644
--- a/engines/cruise/cruise_main.cpp
+++ b/engines/cruise/cruise_main.cpp
@@ -150,7 +150,7 @@ void changeScriptParamInList(int param1, int param2, scriptInstanceStruct *pScri
void initBigVar3() {
int i;
- for (i = 0; i < 257; i++) {
+ for (i = 0; i < NUM_FILE_ENTRIES; i++) {
if (filesDatabase[i].subData.ptr) {
free(filesDatabase[i].subData.ptr);
}
@@ -362,7 +362,7 @@ int loadFileSub1(uint8 **ptr, const char *name, uint8 *ptr2) {
}
void resetFileEntry(int32 entryNumber) {
- if (entryNumber >= 257)
+ if (entryNumber >= NUM_FILE_ENTRIES)
return;
if (!filesDatabase[entryNumber].subData.ptr)
@@ -416,7 +416,7 @@ int initAllData(void) {
backgroundTable[i].name[0] = 0;
}
- for (i = 0; i < 257; i++) {
+ for (i = 0; i < NUM_FILE_ENTRIES; i++) {
filesDatabase[i].subData.ptr = NULL;
filesDatabase[i].subData.ptrMask = NULL;
}
diff --git a/engines/cruise/dataLoader.cpp b/engines/cruise/dataLoader.cpp
index 1bdfde89ef..5602bdfec1 100644
--- a/engines/cruise/dataLoader.cpp
+++ b/engines/cruise/dataLoader.cpp
@@ -176,12 +176,12 @@ int createResFileEntry(int width, int height, int resType) {
printf("Executing untested createResFileEntry!\n");
exit(1);
- for (i = 0; i < 257; i++) {
+ for (i = 0; i < NUM_FILE_ENTRIES; i++) {
if (!filesDatabase[i].subData.ptr)
break;
}
- if (i >= 257) {
+ if (i >= NUM_FILE_ENTRIES) {
return (-19);
}
diff --git a/engines/cruise/function.cpp b/engines/cruise/function.cpp
index ee22669b08..5cd0cdbc12 100644
--- a/engines/cruise/function.cpp
+++ b/engines/cruise/function.cpp
@@ -294,7 +294,7 @@ int16 Op_FindSet(void) {
strcpy(name, ptr);
strToUpper(name);
- for (i = 0; i < 257; i++) {
+ for (i = 0; i < NUM_FILE_ENTRIES; i++) {
if (!strcmp(name, filesDatabase[i].subData.name)) {
return (i);
}
@@ -471,7 +471,7 @@ int16 Op_LoadFrame(void) {
param2 = popVar();
param3 = popVar();
- if (param3 >= 0 || param3 < 257) {
+ if (param3 >= 0 || param3 < NUM_FILE_ENTRIES) {
strToUpper(name);
gfxModuleData_gfxWaitVSync();
@@ -502,7 +502,7 @@ int16 Op_LoadAbs(void) {
param1 = popVar();
- if (param1 >= 0 || param1 < 257) {
+ if (param1 >= 0 || param1 < NUM_FILE_ENTRIES) {
strToUpper(name);
gfxModuleData_gfxWaitVSync();
diff --git a/engines/cruise/saveload.cpp b/engines/cruise/saveload.cpp
index 37107be58e..8d9b321955 100644
--- a/engines/cruise/saveload.cpp
+++ b/engines/cruise/saveload.cpp
@@ -605,7 +605,7 @@ void unloadOverlay(const char*name, int overlayNumber) {
void initVars(void) {
closeAllMenu();
- resetFileEntryRange(0, 257);
+ resetFileEntryRange(0, NUM_FILE_ENTRIES);
resetPreload();
freeCTP();
@@ -659,7 +659,7 @@ void initVars(void) {
backgroundTable[i].name[0] = 0;
}
- for (unsigned long int i = 0; i < 257; i++) {
+ for (unsigned long int i = 0; i < NUM_FILE_ENTRIES; i++) {
filesDatabase[i].subData.ptr = NULL;
filesDatabase[i].subData.ptrMask = NULL;
}
@@ -828,12 +828,12 @@ int loadSavegameData(int saveGameIdx) {
lowMemorySave = lowMemory;
- for (int i = 0; i < 257; i++) {
+ for (int i = 0; i < NUM_FILE_ENTRIES; i++) {
if (filesDatabase[i].subData.ptr) {
int j;
int k;
- for (j = i + 1; j < 257 && filesDatabase[j].subData.ptr && !strcmp(filesDatabase[i].subData.name, filesDatabase[j].subData.name) && (filesDatabase[j].subData.index == (j - i)); j++)
+ for (j = i + 1; j < NUM_FILE_ENTRIES && filesDatabase[j].subData.ptr && !strcmp(filesDatabase[i].subData.name, filesDatabase[j].subData.name) && (filesDatabase[j].subData.index == (j - i)); j++)
;
for (k = i; k < j; k++) {