diff options
| author | Max Horn | 2007-12-20 15:00:09 +0000 |
|---|---|---|
| committer | Max Horn | 2007-12-20 15:00:09 +0000 |
| commit | 1b285398b3551242828c95101d9baae2a227e887 (patch) | |
| tree | 76e6a4085c4cc4ca4f939bb93c256b18e85f3d12 /engines | |
| parent | 44effa32eb748e6d7d8458f9833de659411f1c08 (diff) | |
| download | scummvm-rg350-1b285398b3551242828c95101d9baae2a227e887.tar.gz scummvm-rg350-1b285398b3551242828c95101d9baae2a227e887.tar.bz2 scummvm-rg350-1b285398b3551242828c95101d9baae2a227e887.zip | |
Fix compiler warnings
svn-id: r29922
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/cruise/cruise_main.cpp | 2 | ||||
| -rw-r--r-- | engines/cruise/saveload.cpp | 5 | ||||
| -rw-r--r-- | engines/cruise/script.cpp | 3 |
3 files changed, 3 insertions, 7 deletions
diff --git a/engines/cruise/cruise_main.cpp b/engines/cruise/cruise_main.cpp index 5ae67dae4d..2d7695b7b6 100644 --- a/engines/cruise/cruise_main.cpp +++ b/engines/cruise/cruise_main.cpp @@ -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); diff --git a/engines/cruise/saveload.cpp b/engines/cruise/saveload.cpp index 73bb54a3b0..fa7aa56525 100644 --- a/engines/cruise/saveload.cpp +++ b/engines/cruise/saveload.cpp @@ -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); diff --git a/engines/cruise/script.cpp b/engines/cruise/script.cpp index cb801964d7..5606d637a2 100644 --- a/engines/cruise/script.cpp +++ b/engines/cruise/script.cpp @@ -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; |