libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-14 05:38:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CRUISE: Fixed some warnings about unreachable code

Browse Source 
svn-id: r44293
This commit is contained in:
Filippos Karapetis 2009-09-24 09:40:12 +00:00
parent fe7a64d467
commit db63b401a6
4 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/cruise/dataLoader.cpp
View File

@ -171,7 +171,7 @@ int createResFileEntry(int width, int height, int size, int resType) {
int entryNumber;
int div = 0;
error("Executing untested createResFileEntry");
warning("Executing untested createResFileEntry");
for (i = 0; i < NUM_FILE_ENTRIES; i++) {
if (!filesDatabase[i].subData.ptr)

1
engines/cruise/object.cpp
View File

@ -118,7 +118,6 @@ void setObjectPosition(int16 ovlIdx, int16 objIdx, int16 param3, int16 param4) {
if (!ptr) {
return;
ASSERT(0);
}
//overlayTable[param1].ovlData

12
engines/cruise/script.cpp
View File

@ -97,15 +97,13 @@ int32 opcodeType0(void) {
if (size == 1) {
address += index;
pushVar((int16)READ_BE_UINT16(address));
return (0);
return 0;
} else if (size == 2) {
pushVar(*address);
return (0);
return 0;
} else {
error("Unsupported code in opcodeType0 case 1");
}
return (0);
}
case 2: {
int16 var_16;
@ -122,15 +120,11 @@ int32 opcodeType0(void) {
}
pushVar(var_16);
return (0);
break;
return 0;
}
default:
error("Unsupported type %d in opcodeType0", currentScriptOpcodeType);
}
return 0;
}
// save opcode

5
engines/cruise/volume.cpp
View File

@ -38,8 +38,8 @@ char currentBaseName[15] = "";
void loadPal(volumeDataStruct *entry) {
char name[20];
// This code isn't currently being used, so return
return;
// This code isn't currently being used
#if 0
if (PAL_file.isOpen())
PAL_file.close();
@ -54,6 +54,7 @@ void loadPal(volumeDataStruct *entry) {
fileData2 = PAL_file.readSint16BE();
PAL_ptr = (uint8 *)malloc(numLoadedPal * fileData2);
#endif
}
void closePal(void) {