aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorlukaslw2014-05-23 00:48:52 +0200
committerlukaslw2014-06-22 20:08:12 +0200
commit555672618f270c29a7649bb3615a7ce9e5b3459f (patch)
treea991a08bf6e620db8b2b9cf59575e6a8960c8633 /engines
parente366a21f18eaf42ed0ff3eab56dc91183842ca53 (diff)
downloadscummvm-rg350-555672618f270c29a7649bb3615a7ce9e5b3459f.tar.gz
scummvm-rg350-555672618f270c29a7649bb3615a7ce9e5b3459f.tar.bz2
scummvm-rg350-555672618f270c29a7649bb3615a7ce9e5b3459f.zip
PRINCE: Cleaning up warnings
Diffstat (limited to 'engines')
-rw-r--r--engines/prince/archive.cpp2
-rw-r--r--engines/prince/debugger.cpp6
-rw-r--r--engines/prince/hero.cpp4
-rw-r--r--engines/prince/mob.cpp1
-rw-r--r--engines/prince/prince.cpp4
5 files changed, 9 insertions, 8 deletions
diff --git a/engines/prince/archive.cpp b/engines/prince/archive.cpp
index d1b680c204..ac00261337 100644
--- a/engines/prince/archive.cpp
+++ b/engines/prince/archive.cpp
@@ -51,7 +51,7 @@ bool PtcArchive::open(const Common::String &filename) {
if (!_stream)
return false;
- uint32 magic = _stream->readUint32LE();
+ _stream->readUint32LE(); // magic
uint32 fileTableOffset = _stream->readUint32LE() ^ 0x4D4F4B2D; // MOK-
uint32 fileTableSize = _stream->readUint32LE() ^ 0x534F4654; // SOFT
diff --git a/engines/prince/debugger.cpp b/engines/prince/debugger.cpp
index 58c10f1200..95df1ec4bf 100644
--- a/engines/prince/debugger.cpp
+++ b/engines/prince/debugger.cpp
@@ -78,7 +78,7 @@ bool Debugger::Cmd_SetFlag(int argc, const char **argv) {
return true;
}
- int flagNum = strToInt(argv[1]);
+ //int flagNum = strToInt(argv[1]);
//g_globals->setFlag(flagNum);
return true;
}
@@ -93,7 +93,7 @@ bool Debugger::Cmd_GetFlag(int argc, const char **argv) {
return true;
}
- int flagNum = strToInt(argv[1]);
+ //int flagNum = strToInt(argv[1]);
//DebugPrintf("Value: %d\n", g_globals->getFlag(flagNum));
return true;
}
@@ -108,7 +108,7 @@ bool Debugger::Cmd_ClearFlag(int argc, const char **argv) {
return true;
}
- int flagNum = strToInt(argv[1]);
+ //int flagNum = strToInt(argv[1]);
//g_globals->clearFlag(flagNum);
return true;
}
diff --git a/engines/prince/hero.cpp b/engines/prince/hero.cpp
index 215ca6cef0..3e8b2ac5b5 100644
--- a/engines/prince/hero.cpp
+++ b/engines/prince/hero.cpp
@@ -392,7 +392,7 @@ void Hero::showHeroShadow(Graphics::Surface *heroFrame) {
int shadBitMaskCopyTrans = shadBitMask;
int shadBitAddrCopyTrans = shadBitAddr;
//ct_loop:
- for (int j = 0; j < ct_loop; j++) {
+ for (int l = 0; l < ct_loop; l++) {
shadZoomX -= 100;
if (shadZoomX < 0 && _scaleValue != 10000) {
shadZoomX += _scaleValue;
@@ -449,7 +449,7 @@ void Hero::showHeroShadow(Graphics::Surface *heroFrame) {
int backgroundDiffWall = 0;
int shadowHeroXWall = 0;
//ct_loop:
- for (int j = 0; j < ct_loop; j++) {
+ for (int m = 0; m < ct_loop; m++) {
shadZoomX -= 100;
if (shadZoomX < 0 && _scaleValue != 10000) {
shadZoomX += _scaleValue;
diff --git a/engines/prince/mob.cpp b/engines/prince/mob.cpp
index 1ca9931a59..7ddb13dc64 100644
--- a/engines/prince/mob.cpp
+++ b/engines/prince/mob.cpp
@@ -97,6 +97,7 @@ uint16 Mob::getData(AttrId dataId) {
return _examPosition.y;
default:
assert(false);
+ return 0;
}
}
diff --git a/engines/prince/prince.cpp b/engines/prince/prince.cpp
index a575d15820..4ef4e88685 100644
--- a/engines/prince/prince.cpp
+++ b/engines/prince/prince.cpp
@@ -115,7 +115,7 @@ PrinceEngine::~PrinceEngine() {
}
_objList.clear();
- for (uint32 i = 0; i < _backAnimList.size(); i++) {
+ for (uint i = 0; i < _backAnimList.size(); i++) {
delete _backAnimList[i]._animData;
delete _backAnimList[i]._shadowData;
}
@@ -727,7 +727,7 @@ void PrinceEngine::drawScreen() {
}
}
*/
- for (int i = 0; i < _backAnimList.size() ; i++) {
+ for (uint i = 0; i < _backAnimList.size() ; i++) {
Graphics::Surface *backAnimSurface = _backAnimList[i]._animData->getFrame(testAnimFrame);
_graph->drawTransparent(_backAnimList[i]._x, _backAnimList[i]._y, backAnimSurface); // out of range now - crash .exe
backAnimSurface->free();