diff options
| author | Eugene Sandulenko | 2018-06-29 09:20:20 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2018-06-29 09:20:20 +0200 |
| commit | aeb1e2e07d57af6672d9718a6378b27a2087cefb (patch) | |
| tree | 3bd7d3be01631c196d792dac815d86ddaa286afc /engines/bladerunner | |
| parent | a6d900db88a4346a677006af33426effbc7a9c30 (diff) | |
| download | scummvm-rg350-aeb1e2e07d57af6672d9718a6378b27a2087cefb.tar.gz scummvm-rg350-aeb1e2e07d57af6672d9718a6378b27a2087cefb.tar.bz2 scummvm-rg350-aeb1e2e07d57af6672d9718a6378b27a2087cefb.zip | |
BLADERUNNER: Fix warnings
Diffstat (limited to 'engines/bladerunner')
| -rw-r--r-- | engines/bladerunner/actor.cpp | 4 | ||||
| -rw-r--r-- | engines/bladerunner/actor_clues.cpp | 4 | ||||
| -rw-r--r-- | engines/bladerunner/rect.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/engines/bladerunner/actor.cpp b/engines/bladerunner/actor.cpp index f9446aae0a..a2595b6ad6 100644 --- a/engines/bladerunner/actor.cpp +++ b/engines/bladerunner/actor.cpp @@ -888,7 +888,7 @@ void Actor::setFriendlinessToOther(int otherActorId, int friendliness) { bool Actor::checkFriendlinessAndHonesty(int otherActorId) { int honestyDiff = 2 * _friendlinessToOther[otherActorId] - _honesty; - int friendlinessRange; + uint friendlinessRange; if (honestyDiff > 30) { friendlinessRange = 100; @@ -1137,7 +1137,7 @@ void Actor::copyClues(int actorId) { void Actor::acquireCluesByRelations() { if (_setId >= 0 && _setId != kSetFreeSlotG && _setId != _vm->_actors[0]->_setId) { - for (int i = 0; i < _vm->_gameInfo->getActorCount(); i++) { + for (uint i = 0; i < _vm->_gameInfo->getActorCount(); i++) { if (i != _id && _vm->_actors[i]->_setId == _setId && i && _id && checkFriendlinessAndHonesty(i) && _vm->_actors[i]->checkFriendlinessAndHonesty(_id)) { diff --git a/engines/bladerunner/actor_clues.cpp b/engines/bladerunner/actor_clues.cpp index b34e67b46e..761a31a1a5 100644 --- a/engines/bladerunner/actor_clues.cpp +++ b/engines/bladerunner/actor_clues.cpp @@ -113,7 +113,7 @@ int ActorClues::getModifier(int actorId, int otherActorId, int clueId) { modifier2 = 0; modifier3 = _vm->_aiScripts->callGetFriendlinessModifierIfGetsClue(otherActorId, actorId, clueId); - for (int i = 0; i < _vm->_gameInfo->getActorCount(); i++) { + for (uint i = 0; i < _vm->_gameInfo->getActorCount(); i++) { if (i != actorId && i != otherActorId) { modifier2 += (friendliness - 50) * _vm->_aiScripts->callGetFriendlinessModifierIfGetsClue(i, otherActorId, clueId) / 100; } @@ -157,7 +157,7 @@ void ActorClues::acquireCluesByRelations(int actorId, int otherActorId) { Actor *actor = _vm->_actors[actorId]; Actor *otherActor = _vm->_actors[otherActorId]; - int avgParameters = (otherActor->getHonesty() + otherActor->getIntelligence() + actor->getFriendlinessToOther(otherActorId)) / 3; + uint avgParameters = (otherActor->getHonesty() + otherActor->getIntelligence() + actor->getFriendlinessToOther(otherActorId)) / 3; int clue1count = avgParameters * count1 / 100; if (avgParameters >= 50 && !clue1count && count1 == 1) { diff --git a/engines/bladerunner/rect.h b/engines/bladerunner/rect.h index da01af389d..a44ad87040 100644 --- a/engines/bladerunner/rect.h +++ b/engines/bladerunner/rect.h @@ -38,8 +38,8 @@ struct Rect { Rect() : x0(0.0f), y0(0.0f), x1(0.0f), y1(0.0f) {} - Rect(float x0, float y0, float x1, float y1) - : x0(x0), y0(y0), x1(x1), y1(y1) + Rect(float x0_, float y0_, float x1_, float y1_) + : x0(x0_), y0(y0_), x1(x1_), y1(y1_) {} void expand(float d) { |