aboutsummaryrefslogtreecommitdiff
path: root/engines/cryomni3d/versailles/saveload.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/versailles/saveload.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/versailles/saveload.cpp')
-rw-r--r--engines/cryomni3d/versailles/saveload.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/cryomni3d/versailles/saveload.cpp b/engines/cryomni3d/versailles/saveload.cpp
index 2c14c3d624..1cdf8e9a51 100644
--- a/engines/cryomni3d/versailles/saveload.cpp
+++ b/engines/cryomni3d/versailles/saveload.cpp
@@ -154,7 +154,7 @@ void CryOmni3DEngine_Versailles::saveGame(bool visit, uint saveNum,
// Inventory
assert(_inventory.size() == 50);
for (Inventory::const_iterator it = _inventory.begin(); it != _inventory.end(); it++) {
- uint objId = -1;
+ uint objId = uint(-1);
if (*it != nullptr) {
// Inventory contains pointers to objects stored in _objects
objId = *it - _objects.begin();
@@ -244,9 +244,9 @@ bool CryOmni3DEngine_Versailles::loadGame(bool visit, uint saveNum) {
for (Inventory::iterator it = _inventory.begin(); it != _inventory.end(); it++) {
uint objId = in->readUint32BE();
if (objId >= _objects.size()) {
- objId = -1;
+ objId = uint(-1);
}
- if (objId != -1u) {
+ if (objId != uint(-1)) {
*it = _objects.begin() + objId;
} else {
*it = nullptr;