From 75e2770fae899fe5087fe7b711d636157cb9b980 Mon Sep 17 00:00:00 2001 From: Torbjörn Andersson Date: Mon, 28 Nov 2016 06:42:47 +0100 Subject: FULLPIPE: Silence GCC warnings (mostly signed/unsigned ones) --- engines/fullpipe/fullpipe.h | 2 +- engines/fullpipe/messagehandlers.cpp | 2 +- engines/fullpipe/scene.cpp | 2 +- engines/fullpipe/scene.h | 2 +- engines/fullpipe/scenes/sceneFinal.cpp | 2 +- engines/fullpipe/sound.cpp | 2 +- engines/fullpipe/stateloader.cpp | 8 ++++---- engines/fullpipe/statesaver.cpp | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) (limited to 'engines') diff --git a/engines/fullpipe/fullpipe.h b/engines/fullpipe/fullpipe.h index 9b755a6504..6c98ae20f4 100644 --- a/engines/fullpipe/fullpipe.h +++ b/engines/fullpipe/fullpipe.h @@ -184,7 +184,7 @@ public: int getSceneTrack(); void updateTrackDelay(); void startSceneTrack(); - void startSoundStream1(char *trackName); + void startSoundStream1(const char *trackName); void stopSoundStream2(); void stopAllSoundStreams(); void stopAllSoundInstances(int id); diff --git a/engines/fullpipe/messagehandlers.cpp b/engines/fullpipe/messagehandlers.cpp index b4338a237a..947caadbcc 100644 --- a/engines/fullpipe/messagehandlers.cpp +++ b/engines/fullpipe/messagehandlers.cpp @@ -200,7 +200,7 @@ int global_messageHandler1(ExCommand *cmd) { case '8': { int num = 32; - for (uint i = 0; i < g_fp->_gameLoader->_sc2array[num]._picAniInfosCount; i++) { + for (int i = 0; i < g_fp->_gameLoader->_sc2array[num]._picAniInfosCount; i++) { debug("pic %d, %d:", num, i); g_fp->_gameLoader->_sc2array[num]._picAniInfos[i]->print(); } diff --git a/engines/fullpipe/scene.cpp b/engines/fullpipe/scene.cpp index abbb90dba9..b5258183b0 100644 --- a/engines/fullpipe/scene.cpp +++ b/engines/fullpipe/scene.cpp @@ -506,7 +506,7 @@ void Scene::objectList_sortByPriority(Common::Array &list, bool } #else template -void Scene::objectList_sortByPriority(Common::Array &list, int startIndex) { +void Scene::objectList_sortByPriority(Common::Array &list, uint startIndex) { if (list.size() > startIndex) { int lastIndex = list.size() - 1; bool changed; diff --git a/engines/fullpipe/scene.h b/engines/fullpipe/scene.h index 5ff24074b2..55f07fbaac 100644 --- a/engines/fullpipe/scene.h +++ b/engines/fullpipe/scene.h @@ -87,7 +87,7 @@ class Scene : public Background { void objectList_sortByPriority(Common::Array &list, bool skipFirst = false); #else template - void objectList_sortByPriority(Common::Array &list, int startIndex = 0); + void objectList_sortByPriority(Common::Array &list, uint startIndex = 0); #endif }; diff --git a/engines/fullpipe/scenes/sceneFinal.cpp b/engines/fullpipe/scenes/sceneFinal.cpp index beda340109..2180edb94f 100644 --- a/engines/fullpipe/scenes/sceneFinal.cpp +++ b/engines/fullpipe/scenes/sceneFinal.cpp @@ -70,7 +70,7 @@ void sceneHandlerFinal_endFinal() { g_vars->sceneFinal_var01 = 0; } -void sceneHandlerFinal_startMusic(char *track) { +void sceneHandlerFinal_startMusic(const char *track) { g_fp->startSoundStream1(track); } diff --git a/engines/fullpipe/sound.cpp b/engines/fullpipe/sound.cpp index e68115a7dd..cc0bf13b60 100644 --- a/engines/fullpipe/sound.cpp +++ b/engines/fullpipe/sound.cpp @@ -367,7 +367,7 @@ int FullpipeEngine::getSceneTrack() { return res; } -void FullpipeEngine::startSoundStream1(char *trackName) { +void FullpipeEngine::startSoundStream1(const char *trackName) { stopAllSoundStreams(); #ifdef USE_VORBIS diff --git a/engines/fullpipe/stateloader.cpp b/engines/fullpipe/stateloader.cpp index f48d636ecd..4861699f7e 100644 --- a/engines/fullpipe/stateloader.cpp +++ b/engines/fullpipe/stateloader.cpp @@ -77,7 +77,7 @@ bool GameLoader::readSavegame(const char *fname) { delete saveFile; // Deobfuscate the data - for (uint i = 0; i < header.encSize; i++) + for (int i = 0; i < header.encSize; i++) data[i] -= i & 0x7f; MfcArchive *archive = new MfcArchive(new Common::MemoryReadStream(data, header.encSize)); @@ -100,7 +100,7 @@ bool GameLoader::readSavegame(const char *fname) { getGameLoaderInventory()->loadPartial(*archive); - int32 arrSize = archive->readUint32LE(); + uint32 arrSize = archive->readUint32LE(); debugC(3, kDebugLoading, "Reading %d infos", arrSize); @@ -113,7 +113,7 @@ bool GameLoader::readSavegame(const char *fname) { free(_sc2array[i]._picAniInfos); _sc2array[i]._picAniInfos = (PicAniInfo **)malloc(sizeof(PicAniInfo *) * _sc2array[i]._picAniInfosCount); - for (uint j = 0; j < _sc2array[i]._picAniInfosCount; j++) { + for (int j = 0; j < _sc2array[i]._picAniInfosCount; j++) { _sc2array[i]._picAniInfos[j] = new PicAniInfo(); _sc2array[i]._picAniInfos[j]->load(*archive); } @@ -196,7 +196,7 @@ bool readSavegameHeader(Common::InSaveFile *in, FullpipeSavegameHeader &header) in->seek(-4, SEEK_END); - uint headerOffset = in->readUint32LE(); + int headerOffset = in->readUint32LE(); // Sanity check if (headerOffset >= in->pos() || headerOffset == 0) { diff --git a/engines/fullpipe/statesaver.cpp b/engines/fullpipe/statesaver.cpp index e582d4b438..7fb56f0479 100644 --- a/engines/fullpipe/statesaver.cpp +++ b/engines/fullpipe/statesaver.cpp @@ -93,7 +93,7 @@ bool GameLoader::writeSavegame(Scene *sc, const char *fname) { if (_sc2array[i]._picAniInfosCount) debugC(3, kDebugLoading, "Count %d: %d", i, _sc2array[i]._picAniInfosCount); - for (uint j = 0; j < _sc2array[i]._picAniInfosCount; j++) { + for (int j = 0; j < _sc2array[i]._picAniInfosCount; j++) { _sc2array[i]._picAniInfos[j]->save(*archive); } } @@ -101,7 +101,7 @@ bool GameLoader::writeSavegame(Scene *sc, const char *fname) { header.encSize = stream.size(); // Now obfuscate the data - for (uint i = 0; i < header.encSize; i++) + for (int i = 0; i < header.encSize; i++) stream.getData()[i] += i & 0x7f; if (_savegameCallback) -- cgit v1.2.3