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

Fix compiler warnings

Browse source 
svn-id: r29922
This commit is contained in:
Max Horn 2007-12-20 15:00:09 +00:00
parent 44effa32eb
commit 1b285398b3
3 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/cruise/cruise_main.cpp
View file

@ -990,7 +990,7 @@ bool findRelation(int objOvl, int objIdx, int x, int y) {
thisOvl = j;
}
const char* pName = getObjectName(ptrHead->obj1Number, overlayTable[thisOvl].ovlData->arrayNameObj);
//const char* pName = getObjectName(ptrHead->obj1Number, overlayTable[thisOvl].ovlData->arrayNameObj);
objDataStruct* pObject = getObjectDataFromOverlay(thisOvl, ptrHead->obj1Number);

5
engines/cruise/saveload.cpp
View file

@ -565,7 +565,7 @@ int saveSavegameData(int saveGameIdx) {
currentSaveFile->write(musicName, 15);
char dummy[6] = { 0, 0, 0, 0, 0, 0 };
const char dummy[6] = { 0, 0, 0, 0, 0, 0 };
currentSaveFile->write(dummy, 6);
currentSaveFile->write(currentCtpName, 40);
@ -593,7 +593,6 @@ int saveSavegameData(int saveGameIdx) {
}
currentSaveFile->writeUint16LE(filesDatabase[i].subData.index);
currentSaveFile->write(filesDatabase[i].subData.name, 13);
char dummy[1] = {0};
currentSaveFile->write(dummy, 1);
currentSaveFile->writeUint16LE(filesDatabase[i].subData.transparency);
if(filesDatabase[i].subData.ptrMask) {
@ -609,7 +608,6 @@ int saveSavegameData(int saveGameIdx) {
for(int i=0; i<numOfLoadedOverlay; i++)
{
currentSaveFile->write(overlayTable[i].overlayName, 13);
char dummy[4] = { 0, 0, 0, 0 };
currentSaveFile->write(dummy, 1);
currentSaveFile->write(dummy, 4);
currentSaveFile->writeUint16LE(overlayTable[i].alreadyLoaded);
@ -624,7 +622,6 @@ int saveSavegameData(int saveGameIdx) {
for(int i=0; i<64; i++)
{
currentSaveFile->write(preloadData[i].name, 15);
char dummy[4] = { 0, 0, 0, 0 };
currentSaveFile->write(dummy, 1);
currentSaveFile->writeUint32LE(preloadData[i].size);
currentSaveFile->writeUint32LE(preloadData[i].sourceSize);

3
engines/cruise/script.cpp
View file

@ -67,8 +67,7 @@ int32 opcodeType0(void) {
uint8 *address = 0;
int type = getByteFromScript();
int ovl = getByteFromScript();
short int offset;
short int firstOffset = offset = getShortFromScript();
short int offset = getShortFromScript();
offset += index;
int typ7 = type & 7;