aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorD G Turner2017-09-08 02:58:41 +0100
committerThierry Crozat2018-01-23 02:15:32 +0000
commit2e79e243929dd7f2c3db83e79c673dee573c4875 (patch)
treeffe61f7cda3abd24c95510577e7dacc76c0e13a1 /engines
parentea955675db26106dfc22aaf5a9721c056437ddfc (diff)
downloadscummvm-rg350-2e79e243929dd7f2c3db83e79c673dee573c4875.tar.gz
scummvm-rg350-2e79e243929dd7f2c3db83e79c673dee573c4875.tar.bz2
scummvm-rg350-2e79e243929dd7f2c3db83e79c673dee573c4875.zip
SUPERNOVA: Fix GCC Signed vs. Unsigned Comparison Warnings.
Diffstat (limited to 'engines')
-rw-r--r--engines/supernova/state.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/supernova/state.cpp b/engines/supernova/state.cpp
index 28e35e35d0..52b7aaa7d7 100644
--- a/engines/supernova/state.cpp
+++ b/engines/supernova/state.cpp
@@ -1065,7 +1065,7 @@ void GameManager::edit(Common::String &input, int x, int y, uint length) {
bool isEditing = true;
uint cursorIndex = input.size();
// NOTE: Pixels for char needed = kFontWidth + 2px left and right side bearing
- int overdrawWidth = ((length + 1) * (kFontWidth + 2) > kScreenWidth - x) ?
+ int overdrawWidth = ((int)((length + 1) * (kFontWidth + 2)) > (kScreenWidth - x)) ?
kScreenWidth - x : (length + 1) * (kFontWidth + 2);
while (isEditing) {
@@ -1344,7 +1344,7 @@ bool GameManager::genericInteract(Action verb, Object &obj1, Object &obj2) {
edit(input, 91, 100, 5);
int seperator = -1;
- for (int i = 0; i < input.size(); ++i) {
+ for (uint i = 0; i < input.size(); ++i) {
if (input[i] == ':') {
seperator = i;
break;
@@ -1366,7 +1366,7 @@ bool GameManager::genericInteract(Action verb, Object &obj1, Object &obj2) {
}
}
decimalPlace = 1;
- for (int i = seperator + 1; i < input.size(); ++i) {
+ for (uint i = seperator + 1; i < input.size(); ++i) {
if (Common::isDigit(input[i])) {
minutes = minutes * decimalPlace + (input[i] - '0');
decimalPlace *= 10;