thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replaced all occurrences of the constant '257' with the existing constant 'NUM_FILE_ENTRIES'

Browse source 
svn-id: r39824
This commit is contained in:
Paul Gilbert 2009-04-04 01:21:25 +00:00
parent 3d608dda3e
commit 07fb7735b5
5 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/cruise/backgroundIncrust.cpp
View file

@ -191,7 +191,7 @@ void regenerateBackgroundIncrust(backgroundIncrustStruct *pHead) {
//int screen = pl->backgroundIdx; //int screen = pl->backgroundIdx;
if ((filesDatabase[frame].subData.ptr == NULL) || (strcmp(pl->name, filesDatabase[frame].subData.name))) { 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) { if (loadFile(pl->name, frame, pl->spriteId) >= 0) {
bLoad = true; bLoad = true;
} else { } else {

6
engines/cruise/cruise_main.cpp
View file

@ -150,7 +150,7 @@ void changeScriptParamInList(int param1, int param2, scriptInstanceStruct *pScri
void initBigVar3() { void initBigVar3() {
int i; int i;
for (i = 0; i < 257; i++) { for (i = 0; i < NUM_FILE_ENTRIES; i++) {
if (filesDatabase[i].subData.ptr) { if (filesDatabase[i].subData.ptr) {
free(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) { void resetFileEntry(int32 entryNumber) {
if (entryNumber >= 257) if (entryNumber >= NUM_FILE_ENTRIES)
return; return;
if (!filesDatabase[entryNumber].subData.ptr) if (!filesDatabase[entryNumber].subData.ptr)
@ -416,7 +416,7 @@ int initAllData(void) {
backgroundTable[i].name[0] = 0; 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.ptr = NULL;
filesDatabase[i].subData.ptrMask = NULL; filesDatabase[i].subData.ptrMask = NULL;
} }

4
engines/cruise/dataLoader.cpp
View file

@ -176,12 +176,12 @@ int createResFileEntry(int width, int height, int resType) {
printf("Executing untested createResFileEntry!\n"); printf("Executing untested createResFileEntry!\n");
exit(1); exit(1);
for (i = 0; i < 257; i++) { for (i = 0; i < NUM_FILE_ENTRIES; i++) {
if (!filesDatabase[i].subData.ptr) if (!filesDatabase[i].subData.ptr)
break; break;
} }
if (i >= 257) { if (i >= NUM_FILE_ENTRIES) {
return (-19); return (-19);
} }

6
engines/cruise/function.cpp
View file

@ -294,7 +294,7 @@ int16 Op_FindSet(void) {
strcpy(name, ptr); strcpy(name, ptr);
strToUpper(name); strToUpper(name);
for (i = 0; i < 257; i++) { for (i = 0; i < NUM_FILE_ENTRIES; i++) {
if (!strcmp(name, filesDatabase[i].subData.name)) { if (!strcmp(name, filesDatabase[i].subData.name)) {
return (i); return (i);
} }
@ -471,7 +471,7 @@ int16 Op_LoadFrame(void) {
param2 = popVar(); param2 = popVar();
param3 = popVar(); param3 = popVar();
if (param3 >= 0 || param3 < 257) { if (param3 >= 0 || param3 < NUM_FILE_ENTRIES) {
strToUpper(name); strToUpper(name);
gfxModuleData_gfxWaitVSync(); gfxModuleData_gfxWaitVSync();
@ -502,7 +502,7 @@ int16 Op_LoadAbs(void) {
param1 = popVar(); param1 = popVar();
if (param1 >= 0 || param1 < 257) { if (param1 >= 0 || param1 < NUM_FILE_ENTRIES) {
strToUpper(name); strToUpper(name);
gfxModuleData_gfxWaitVSync(); gfxModuleData_gfxWaitVSync();

8
engines/cruise/saveload.cpp
View file

@ -605,7 +605,7 @@ void unloadOverlay(const char*name, int overlayNumber) {
void initVars(void) { void initVars(void) {
closeAllMenu(); closeAllMenu();
resetFileEntryRange(0, 257); resetFileEntryRange(0, NUM_FILE_ENTRIES);
resetPreload(); resetPreload();
freeCTP(); freeCTP();
@ -659,7 +659,7 @@ void initVars(void) {
backgroundTable[i].name[0] = 0; 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.ptr = NULL;
filesDatabase[i].subData.ptrMask = NULL; filesDatabase[i].subData.ptrMask = NULL;
} }
@ -828,12 +828,12 @@ int loadSavegameData(int saveGameIdx) {
lowMemorySave = lowMemory; lowMemorySave = lowMemory;
for (int i = 0; i < 257; i++) { for (int i = 0; i < NUM_FILE_ENTRIES; i++) {
if (filesDatabase[i].subData.ptr) { if (filesDatabase[i].subData.ptr) {
int j; int j;
int k; 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++) { for (k = i; k < j; k++) {