diff options
| author | Paul Gilbert | 2016-08-28 16:14:38 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-08-28 16:14:38 -0400 |
| commit | dffa696b7beea02782579a004862f4aa86e8f3e6 (patch) | |
| tree | b4884bfe9b41232fa2b42a6e66d04332e536e15a /engines/xeen/combat.cpp | |
| parent | ef6253fb19822b9a2e9a1ba00418f1d33afff65f (diff) | |
| download | scummvm-rg350-dffa696b7beea02782579a004862f4aa86e8f3e6.tar.gz scummvm-rg350-dffa696b7beea02782579a004862f4aa86e8f3e6.tar.bz2 scummvm-rg350-dffa696b7beea02782579a004862f4aa86e8f3e6.zip | |
XEEN: gcc compilation fixes
Diffstat (limited to 'engines/xeen/combat.cpp')
| -rw-r--r-- | engines/xeen/combat.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/engines/xeen/combat.cpp b/engines/xeen/combat.cpp index 13efe912de..c8cece7b10 100644 --- a/engines/xeen/combat.cpp +++ b/engines/xeen/combat.cpp @@ -496,11 +496,12 @@ void Combat::moveMonsters() { if (monsterCanMove(pt, MONSTER_GRID_BITMASK[MONSTER_GRID_BITINDEX2[arrIndex]], arrIndex >= 21 && arrIndex <= 27 ? MONSTER_GRID3[arrIndex] : 0, arrIndex >= 21 && arrIndex <= 27 ? 0 : MONSTER_GRID3[arrIndex], - idx)) - if (arrIndex >= 21 && arrIndex <= 27) { - moveMonster(idx, Common::Point(MONSTER_GRID3[arrIndex], 0)); - } else { - moveMonster(idx, Common::Point(0, MONSTER_GRID3[arrIndex])); + idx)) { + if (arrIndex >= 21 && arrIndex <= 27) { + moveMonster(idx, Common::Point(MONSTER_GRID3[arrIndex], 0)); + } else { + moveMonster(idx, Common::Point(0, MONSTER_GRID3[arrIndex])); + } } } break; @@ -520,6 +521,9 @@ void Combat::moveMonsters() { MONSTER_GRID_X[arrIndex], MONSTER_GRID_Y[arrIndex], idx)) { moveMonster(idx, Common::Point(MONSTER_GRID_X[arrIndex], MONSTER_GRID_Y[arrIndex])); } + + default: + break; } } } |