diff options
author | Colin Snover | 2016-07-01 15:54:52 -0500 |
---|---|---|
committer | Colin Snover | 2016-07-01 15:58:43 -0500 |
commit | 948e4487389f6ae99d4a61e0cf6d995d16e62c82 (patch) | |
tree | db0f6657766ab2e3398d0a72d7006880a25cd625 /engines/sci/graphics | |
parent | 6c8661d144ddf5f36b22d70169c3005f830f08d4 (diff) | |
download | scummvm-rg350-948e4487389f6ae99d4a61e0cf6d995d16e62c82.tar.gz scummvm-rg350-948e4487389f6ae99d4a61e0cf6d995d16e62c82.tar.bz2 scummvm-rg350-948e4487389f6ae99d4a61e0cf6d995d16e62c82.zip |
SCI32: Fix signed comparison warnings
Diffstat (limited to 'engines/sci/graphics')
-rw-r--r-- | engines/sci/graphics/frameout.cpp | 8 | ||||
-rw-r--r-- | engines/sci/graphics/plane32.h | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/engines/sci/graphics/frameout.cpp b/engines/sci/graphics/frameout.cpp index fd37020896..140c27a6d7 100644 --- a/engines/sci/graphics/frameout.cpp +++ b/engines/sci/graphics/frameout.cpp @@ -696,7 +696,7 @@ void GfxFrameout::calcLists(ScreenItemListList &drawLists, EraseListList &eraseL } PlaneList::size_type planeCount = _planes.size(); - for (int outerPlaneIndex = 0; outerPlaneIndex < planeCount; ++outerPlaneIndex) { + for (PlaneList::size_type outerPlaneIndex = 0; outerPlaneIndex < planeCount; ++outerPlaneIndex) { const Plane *outerPlane = _planes[outerPlaneIndex]; const Plane *visiblePlane = _visiblePlanes.findByObject(outerPlane->_object); @@ -742,7 +742,7 @@ void GfxFrameout::calcLists(ScreenItemListList &drawLists, EraseListList &eraseL } if (addedToEraseList) { - for (int rectIndex = 0; rectIndex < eraseList.size(); ++rectIndex) { + for (RectList::size_type rectIndex = 0; rectIndex < eraseList.size(); ++rectIndex) { const Common::Rect &rect = *eraseList[rectIndex]; for (int innerPlaneIndex = planeCount - 1; innerPlaneIndex >= 0; --innerPlaneIndex) { const Plane &innerPlane = *_planes[innerPlaneIndex]; @@ -813,7 +813,7 @@ void GfxFrameout::calcLists(ScreenItemListList &drawLists, EraseListList &eraseL eraseList.add(outerPlane._screenRect.findIntersectingRect(visibleOuterPlane->_screenRect)); - for (PlaneList::size_type innerIndex = planeCount - 1; innerIndex >= 0; --innerIndex) { + for (int innerIndex = (int)planeCount - 1; innerIndex >= 0; --innerIndex) { // "inner" just refers to the inner loop const Plane &innerPlane = *_planes[innerIndex]; const Plane *visibleInnerPlane = _visiblePlanes.findByObject(innerPlane._object); @@ -903,7 +903,7 @@ void GfxFrameout::calcLists(ScreenItemListList &drawLists, EraseListList &eraseL } if (_planes[planeIndex]->_type == kPlaneTypeTransparent) { - for (PlaneList::size_type i = planeIndex - 1; i >= 0; --i) { + for (int i = (int)planeIndex - 1; i >= 0; --i) { _planes[i]->filterDownEraseRects(drawLists[i], eraseLists[i], eraseLists[planeIndex]); } diff --git a/engines/sci/graphics/plane32.h b/engines/sci/graphics/plane32.h index acd535e75a..a1739264e8 100644 --- a/engines/sci/graphics/plane32.h +++ b/engines/sci/graphics/plane32.h @@ -495,8 +495,6 @@ private: using PlaneListBase::push_back; public: - typedef int size_type; - // A method for finding the index of a plane inside a // PlaneList is used because entries in the main plane // list and visible plane list of GfxFrameout are |