[Scummvm-cvs-logs] SF.net SVN: scummvm:[39824] scummvm/trunk/engines/cruise
dreammaster at users.sourceforge.net
dreammaster at users.sourceforge.net
Sat Apr 4 03:21:30 CEST 2009
Revision: 39824
http://scummvm.svn.sourceforge.net/scummvm/?rev=39824&view=rev
Author: dreammaster
Date: 2009-04-04 01:21:25 +0000 (Sat, 04 Apr 2009)
Log Message:
-----------
Replaced all occurrences of the constant '257' with the existing constant 'NUM_FILE_ENTRIES'
Modified Paths:
--------------
scummvm/trunk/engines/cruise/backgroundIncrust.cpp
scummvm/trunk/engines/cruise/cruise_main.cpp
scummvm/trunk/engines/cruise/dataLoader.cpp
scummvm/trunk/engines/cruise/function.cpp
scummvm/trunk/engines/cruise/saveload.cpp
Modified: scummvm/trunk/engines/cruise/backgroundIncrust.cpp
===================================================================
--- scummvm/trunk/engines/cruise/backgroundIncrust.cpp 2009-04-04 00:19:34 UTC (rev 39823)
+++ scummvm/trunk/engines/cruise/backgroundIncrust.cpp 2009-04-04 01:21:25 UTC (rev 39824)
@@ -191,7 +191,7 @@
//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 {
Modified: scummvm/trunk/engines/cruise/cruise_main.cpp
===================================================================
--- scummvm/trunk/engines/cruise/cruise_main.cpp 2009-04-04 00:19:34 UTC (rev 39823)
+++ scummvm/trunk/engines/cruise/cruise_main.cpp 2009-04-04 01:21:25 UTC (rev 39824)
@@ -150,7 +150,7 @@
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 @@
}
void resetFileEntry(int32 entryNumber) {
- if (entryNumber >= 257)
+ if (entryNumber >= NUM_FILE_ENTRIES)
return;
if (!filesDatabase[entryNumber].subData.ptr)
@@ -416,7 +416,7 @@
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;
}
Modified: scummvm/trunk/engines/cruise/dataLoader.cpp
===================================================================
--- scummvm/trunk/engines/cruise/dataLoader.cpp 2009-04-04 00:19:34 UTC (rev 39823)
+++ scummvm/trunk/engines/cruise/dataLoader.cpp 2009-04-04 01:21:25 UTC (rev 39824)
@@ -176,12 +176,12 @@
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);
}
Modified: scummvm/trunk/engines/cruise/function.cpp
===================================================================
--- scummvm/trunk/engines/cruise/function.cpp 2009-04-04 00:19:34 UTC (rev 39823)
+++ scummvm/trunk/engines/cruise/function.cpp 2009-04-04 01:21:25 UTC (rev 39824)
@@ -294,7 +294,7 @@
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 @@
param2 = popVar();
param3 = popVar();
- if (param3 >= 0 || param3 < 257) {
+ if (param3 >= 0 || param3 < NUM_FILE_ENTRIES) {
strToUpper(name);
gfxModuleData_gfxWaitVSync();
@@ -502,7 +502,7 @@
param1 = popVar();
- if (param1 >= 0 || param1 < 257) {
+ if (param1 >= 0 || param1 < NUM_FILE_ENTRIES) {
strToUpper(name);
gfxModuleData_gfxWaitVSync();
Modified: scummvm/trunk/engines/cruise/saveload.cpp
===================================================================
--- scummvm/trunk/engines/cruise/saveload.cpp 2009-04-04 00:19:34 UTC (rev 39823)
+++ scummvm/trunk/engines/cruise/saveload.cpp 2009-04-04 01:21:25 UTC (rev 39824)
@@ -605,7 +605,7 @@
void initVars(void) {
closeAllMenu();
- resetFileEntryRange(0, 257);
+ resetFileEntryRange(0, NUM_FILE_ENTRIES);
resetPreload();
freeCTP();
@@ -659,7 +659,7 @@
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 @@
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++) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list