aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schickel2013-01-09 06:47:50 +0100
committerJohannes Schickel2013-01-09 07:24:37 +0100
commitfa967e92b72d1e76cc0775e626c552f5bd9d4d0b (patch)
tree4c58a98198bcfde113f1cae6193f279fd5bc3541
parentb27736fc3f84d061c15795b1d72c989857596c2d (diff)
downloadscummvm-rg350-fa967e92b72d1e76cc0775e626c552f5bd9d4d0b.tar.gz
scummvm-rg350-fa967e92b72d1e76cc0775e626c552f5bd9d4d0b.tar.bz2
scummvm-rg350-fa967e92b72d1e76cc0775e626c552f5bd9d4d0b.zip
AGI: Silence C++11 narrowing warning.
-rw-r--r--engines/agi/op_cmd.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/agi/op_cmd.cpp b/engines/agi/op_cmd.cpp
index 5334407eb8..9d899b1855 100644
--- a/engines/agi/op_cmd.cpp
+++ b/engines/agi/op_cmd.cpp
@@ -1399,7 +1399,7 @@ void cmdDistance(AgiGame *state, uint8 *p) {
// a zombie or the zombie getting turned away by the scarab) we make it appear the
// zombie is far away from Rosella if the zombie is not already up and chasing her.
enum zombieStates {ZOMBIE_SET_TO_RISE_UP, ZOMBIE_RISING_UP, ZOMBIE_CHASING_EGO};
- uint8 zombieStateVarNumList[] = {155, 156, (_v[vCurRoom] == 16) ? 162 : 158};
+ uint8 zombieStateVarNumList[] = {155, 156, (uint8)((_v[vCurRoom] == 16) ? 162 : 158)};
uint8 zombieNum = p2 - 221; // Zombie's number (In range 0-2)
uint8 zombieStateVarNum = zombieStateVarNumList[zombieNum]; // Number of the variable containing zombie's state
uint8 zombieState = _v[zombieStateVarNum]; // Zombie's state