ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing some signed/unsigned comparison warnings

Browse Source 
svn-id: r43570
This commit is contained in:
Sven Hesse
2009-08-20 20:59:22 +00:00
parent b4c7cd0484
commit 79c2dc7980
5 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engines/gob/save/saveload_playtoons.cpp
+8 -8
View File
@@ -93,20 +93,20 @@ bool SaveLoad_Playtoons::GameHandler::load(int16 dataVar, int32 size, int32 offs
size = varSize;
}
if (offset < kPropsSize) {
if (((uint32) offset) < kPropsSize) {
// Properties
if ((offset + size) > kPropsSize) {
if (((uint32) (offset + size)) > kPropsSize) {
warning("Wrong index size (%d, %d)", size, offset);
return false;
}
_vm->_inter->_variables->copyFrom(dataVar, _props + offset, size);
} else if (offset < kPropsSize + kIndexSize) {
} else if (((uint32) offset) < kPropsSize + kIndexSize) {
// Save index
if (size != kIndexSize) {
if (((uint32) size) != kIndexSize) {
warning("Wrong index size (%d, %d)", size, offset);
return false;
}
@@ -180,20 +180,20 @@ bool SaveLoad_Playtoons::GameHandler::save(int16 dataVar, int32 size, int32 offs
size = varSize;
}
if (offset < kPropsSize) {
if (((uint32) offset) < kPropsSize) {
// Properties
if ((offset + size) > kPropsSize) {
if (((uint32) (offset + size)) > kPropsSize) {
warning("Wrong index size (%d, %d)", size, offset);
return false;
}
_vm->_inter->_variables->copyTo(dataVar, _props + offset, size);
} else if (offset < kPropsSize + kIndexSize) {
} else if (((uint32) offset) < kPropsSize + kIndexSize) {
// Save index
if (size != kIndexSize) {
if (((uint32) size) != kIndexSize) {
warning("Wrong index size (%d, %d)", size, offset);
return false;
}
engines/gob/save/saveload_v2.cpp
+2 -2
View File
@@ -99,7 +99,7 @@ bool SaveLoad_v2::GameHandler::load(int16 dataVar, int32 size, int32 offset) {
if (offset == 0) {
// Save index
if (size != kIndexSize) {
if (((uint32) size) != kIndexSize) {
warning("Requested index has wrong size (%d)", size);
return false;
}
@@ -184,7 +184,7 @@ bool SaveLoad_v2::GameHandler::save(int16 dataVar, int32 size, int32 offset) {
if (offset == 0) {
// Save index
if (size != kIndexSize) {
if (((uint32) size) != kIndexSize) {
warning("Requested index has wrong size (%d)", size);
return false;
}
engines/gob/save/saveload_v3.cpp
+8 -8
View File
@@ -119,22 +119,22 @@ bool SaveLoad_v3::GameHandler::load(int16 dataVar, int32 size, int32 offset) {
size = varSize;
}
if (offset < kPropsSize) {
if (((uint32) offset) < kPropsSize) {
// Global properties, like joker usage
debugC(3, kDebugSaveLoad, "Loading global properties");
if ((size + offset) > kPropsSize) {
if (((uint32) (offset + size)) > kPropsSize) {
warning("Wrong global properties list size (%d, %d)", size, offset);
return false;
}
_vm->_inter->_variables->copyFrom(dataVar, _props + offset, size);
} else if (offset == kPropsSize) {
} else if (((uint32) offset) == kPropsSize) {
// Save index
if (size != kIndexSize) {
if (((uint32) size) != kIndexSize) {
warning("Requested index has wrong size (%d)", size);
return false;
}
@@ -193,22 +193,22 @@ bool SaveLoad_v3::GameHandler::save(int16 dataVar, int32 size, int32 offset) {
size = varSize;
}
if (offset < kPropsSize) {
if (((uint32) offset) < kPropsSize) {
// Global properties, like joker usage
debugC(3, kDebugSaveLoad, "Saving global properties");
if ((size + offset) > kPropsSize) {
if (((uint32) (offset + size)) > kPropsSize) {
warning("Wrong global properties list size (%d, %d)", size, offset);
return false;
}
_vm->_inter->_variables->copyTo(dataVar, _props + offset, size);
} else if (offset == kPropsSize) {
} else if (((uint32) offset) == kPropsSize) {
// Save index
if (size != kIndexSize) {
if (((uint32) size) != kIndexSize) {
warning("Requested index has wrong size (%d)", size);
return false;
}
engines/gob/save/saveload_v4.cpp
+8 -8
View File
@@ -127,22 +127,22 @@ bool SaveLoad_v4::GameHandler::load(int16 dataVar, int32 size, int32 offset) {
size = varSize;
}
if (offset < kPropsSize) {
if (((uint32) offset) < kPropsSize) {
// Global properties
debugC(3, kDebugSaveLoad, "Loading global properties");
if ((size + offset) > kPropsSize) {
if (((uint32) (offset + size)) > kPropsSize) {
warning("Wrong global properties list size (%d, %d)", size, offset);
return false;
}
_vm->_inter->_variables->copyFrom(dataVar, _props + offset, size);
} else if (offset == kPropsSize) {
} else if (((uint32) offset) == kPropsSize) {
// Save index
if (size != kIndexSize) {
if (((uint32) size) != kIndexSize) {
warning("Requested index has wrong size (%d)", size);
return false;
}
@@ -202,22 +202,22 @@ bool SaveLoad_v4::GameHandler::save(int16 dataVar, int32 size, int32 offset) {
size = varSize;
}
if (offset < kPropsSize) {
if (((uint32) offset) < kPropsSize) {
// Global properties
debugC(3, kDebugSaveLoad, "Saving global properties");
if ((size + offset) > kPropsSize) {
if (((uint32) (offset + size)) > kPropsSize) {
warning("Wrong global properties list size (%d, %d)", size, offset);
return false;
}
_vm->_inter->_variables->copyTo(dataVar, _props + offset, size);
} else if (offset == kPropsSize) {
} else if (((uint32) offset) == kPropsSize) {
// Save index
if (size != kIndexSize) {
if (((uint32) size) != kIndexSize) {
warning("Requested index has wrong size (%d)", size);
return false;
}
engines/gob/save/saveload_v6.cpp
+8 -8
View File
@@ -95,22 +95,22 @@ bool SaveLoad_v6::GameHandler::load(int16 dataVar, int32 size, int32 offset) {
size = varSize;
}
if (offset < kPropsSize) {
if (((uint32) offset) < kPropsSize) {
// Properties
refreshProps();
if ((offset + size) > kPropsSize) {
if (((uint32) (offset + size)) > kPropsSize) {
warning("Wrong index size (%d, %d)", size, offset);
return false;
}
_vm->_inter->_variables->copyFrom(dataVar, _props + offset, size);
} else if (offset < kPropsSize + kIndexSize) {
} else if (((uint32) offset) < kPropsSize + kIndexSize) {
// Save index
if (size != kIndexSize) {
if (((uint32) size) != kIndexSize) {
warning("Wrong index size (%d, %d)", size, offset);
return false;
}
@@ -191,10 +191,10 @@ bool SaveLoad_v6::GameHandler::save(int16 dataVar, int32 size, int32 offset) {
size = varSize;
}
if (offset < kPropsSize) {
if (((uint32) offset) < kPropsSize) {
// Properties
if ((offset + size) > kPropsSize) {
if (((uint32) (offset + size)) > kPropsSize) {
warning("Wrong index size (%d, %d)", size, offset);
return false;
}
@@ -203,10 +203,10 @@ bool SaveLoad_v6::GameHandler::save(int16 dataVar, int32 size, int32 offset) {
refreshProps();
} else if (offset < kPropsSize + kIndexSize) {
} else if (((uint32) offset) < kPropsSize + kIndexSize) {
// Save index
if (size != kIndexSize) {
if (((uint32) size) != kIndexSize) {
warning("Wrong index size (%d, %d)", size, offset);
return false;
}