diff options
-rw-r--r-- | engines/director/cast.cpp | 6 | ||||
-rw-r--r-- | engines/director/score.cpp | 6 | ||||
-rw-r--r-- | engines/director/score.h | 2 | ||||
-rw-r--r-- | engines/director/util.cpp | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/engines/director/cast.cpp b/engines/director/cast.cpp index 1772dd4442..d71ae32521 100644 --- a/engines/director/cast.cpp +++ b/engines/director/cast.cpp @@ -71,13 +71,13 @@ BitmapCast::BitmapCast(Common::ReadStreamEndian &stream, uint32 castTag, uint16 stream.readUint32(); uint32 stringLength = stream.readUint32(); - for (int s = 0; s < stringLength; s++) + for (uint32 s = 0; s < stringLength; s++) stream.readByte(); - uint16 width = stream.readUint16LE(); //maybe? + /*uint16 width =*/ stream.readUint16LE(); //maybe? initialRect = Score::readRect(stream); - uint32 somethingElse = stream.readUint32(); + /*uint32 somethingElse =*/ stream.readUint32(); boundingRect = Score::readRect(stream); bitsPerPixel = stream.readUint16(); diff --git a/engines/director/score.cpp b/engines/director/score.cpp index fd9e4022c9..355900e15c 100644 --- a/engines/director/score.cpp +++ b/engines/director/score.cpp @@ -324,7 +324,7 @@ void Score::loadFrames(Common::SeekableSubReadStreamEndian &stream) { stream.readUint32(); stream.readUint32(); stream.readUint32(); - for (int skip = 0; skip < blockSize * 4; skip++) + for (uint32 skip = 0; skip < blockSize * 4; skip++) stream.readByte(); //header number two... this is our actual score entry point. @@ -542,7 +542,7 @@ void Score::loadCastData(Common::SeekableSubReadStreamEndian &stream, uint16 id, if (castType == 1) { if (size3 == 0) return; - for (int skip = 0; skip < (size1 - 4) / 4; skip++) + for (uint32 skip = 0; skip < (size1 - 4) / 4; skip++) stream.readUint32(); } @@ -763,7 +763,7 @@ void Score::loadActions(Common::SeekableSubReadStreamEndian &stream) { subId = nextSubId; stringPos = nextStringPos; - if (stringPos == stream.size()) + if ((int32)stringPos == stream.size()) break; } diff --git a/engines/director/score.h b/engines/director/score.h index 021dcb5577..7b11e0d242 100644 --- a/engines/director/score.h +++ b/engines/director/score.h @@ -77,7 +77,7 @@ public: void loadCastData(Common::SeekableSubReadStreamEndian &stream, uint16 id, Resource *res); void loadCastInfo(Common::SeekableSubReadStreamEndian &stream, uint16 id); void setCurrentFrame(uint16 frameId) { _currentFrame = frameId; } - int getCurrentFrame() { return _currentFrame; } + uint16 getCurrentFrame() { return _currentFrame; } Common::String getMacName() const { return _macName; } Sprite *getSpriteById(uint16 id); void setSpriteCasts(); diff --git a/engines/director/util.cpp b/engines/director/util.cpp index cf7e122cd5..55a9893dfc 100644 --- a/engines/director/util.cpp +++ b/engines/director/util.cpp @@ -120,7 +120,7 @@ Common::String convertPath(Common::String &path) { } Common::String res; - int idx = 0; + uint32 idx = 0; if (path.hasPrefix(":::")) { res = "../"; |