libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-24 05:01:43 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

DIRECTOR: Fix Various Compiler Warnings.

Browse Source
This commit is contained in:
D G Turner 2017-04-25 00:53:48 +01:00
parent ae8944e104
commit 827e4efb09
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engines/director/cast.cpp
View File

@ -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();

6
engines/director/score.cpp
View File

@ -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;
}

2
engines/director/score.h
View File

@ -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();

2
engines/director/util.cpp
View File

@ -120,7 +120,7 @@ Common::String convertPath(Common::String &path) {
}
Common::String res;
int idx = 0;
uint32 idx = 0;
if (path.hasPrefix(":::")) {
res = "../";