aboutsummaryrefslogtreecommitdiff
path: root/engines/cryomni3d/fixed_image.cpp
diff options
context:
space:
mode:
authorLe Philousophe2019-06-30 16:43:32 +0200
committerLe Philousophe2019-06-30 16:46:32 +0200
commit38bead0c37c61e118378053659a2874830bbb85a (patch)
treeaf55ad641838a27c288076a91dee6c14d9ff8469 /engines/cryomni3d/fixed_image.cpp
parentcabcf240b40c67d4777031bdef28e2a36c81c26d (diff)
downloadscummvm-rg350-38bead0c37c61e118378053659a2874830bbb85a.tar.gz
scummvm-rg350-38bead0c37c61e118378053659a2874830bbb85a.tar.bz2
scummvm-rg350-38bead0c37c61e118378053659a2874830bbb85a.zip
JANITORIAL/CRYOMNI3D: Fix warnings in MSVC
Most of them were due to setting -1 to unsigned values Else it was bogus unintialized values
Diffstat (limited to 'engines/cryomni3d/fixed_image.cpp')
-rw-r--r--engines/cryomni3d/fixed_image.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/cryomni3d/fixed_image.cpp b/engines/cryomni3d/fixed_image.cpp
index 16a35f8f1a..de685fedc2 100644
--- a/engines/cryomni3d/fixed_image.cpp
+++ b/engines/cryomni3d/fixed_image.cpp
@@ -125,8 +125,8 @@ void ZonFixedImage::loadZones(const Common::String &image) {
int32 zonesNumber = zonFile.size() / 26;
_zones.reserve(zonesNumber);
- _highLeftId = -1;
- _highRightId = -1;
+ _highLeftId = Common::Array<CryOmni3D::ZonFixedImage::Zone>::size_type(-1);
+ _highRightId = Common::Array<CryOmni3D::ZonFixedImage::Zone>::size_type(-1);
int leftSeen = 0x7fffffff; // MAX_INT
int rightSeen = 0;
@@ -173,7 +173,7 @@ Common::Point ZonFixedImage::getZoneCenter(uint zoneId) const {
}
void ZonFixedImage::manage() {
- _currentZone = -1;
+ _currentZone = uint(-1);
_zoneLow = false;
_zoneHigh = false;
_zoneHighLeft = false;
@@ -242,7 +242,7 @@ void ZonFixedImage::manage() {
if (zoneIt != _zones.end()) {
_currentZone = zoneIt - _zones.begin();
} else {
- _currentZone = -1;
+ _currentZone = uint(-1);
}
if (_zonesMode == kZonesMode_Standard) {