diff options
| author | Paul Gilbert | 2015-02-28 22:53:17 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2015-02-28 22:53:17 -0500 |
| commit | 07f504fe160d051c458e1f0035d4784ac74e2530 (patch) | |
| tree | 5df86d1e990315ee7d0baecd14d785cc250af4d4 /engines/xeen/combat.cpp | |
| parent | 9789962605a30e8a993370d3de3c1a30582f3964 (diff) | |
| download | scummvm-rg350-07f504fe160d051c458e1f0035d4784ac74e2530.tar.gz scummvm-rg350-07f504fe160d051c458e1f0035d4784ac74e2530.tar.bz2 scummvm-rg350-07f504fe160d051c458e1f0035d4784ac74e2530.zip | |
XEEN: Fix ordering of spell list and methods
Diffstat (limited to 'engines/xeen/combat.cpp')
| -rw-r--r-- | engines/xeen/combat.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/engines/xeen/combat.cpp b/engines/xeen/combat.cpp index 7cc2ab6b22..1d03a5128d 100644 --- a/engines/xeen/combat.cpp +++ b/engines/xeen/combat.cpp @@ -64,10 +64,6 @@ static const int MONSTER_GRID_BITINDEX2[48] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; -static const int MONSTER_GRID_BITMASK[12] = { - 0xC, 8, 4, 0, 0xF, 0xF000, 0xF00, 0xF0, 0xF00, 0xF0, 0x0F, 0xF000 -}; - static const int ATTACK_TYPE_FX[23] = { 49, 18, 13, 14, 15, 17, 16, 0, 6, 1, 2, 3, 4, 5, 4, 9, 27, 29, 44, 51, 53, 61, 71 @@ -1598,7 +1594,7 @@ void Combat::quickFight() { break; case QUICK_SPELL: if (c->_currentSpell != -1) { - spells.castSpell(c, SPELLS_ALLOWED[c->getClassCategory()][c->_currentSpell]); + spells.castSpell(c, (MagicSpell)SPELLS_ALLOWED[c->getClassCategory()][c->_currentSpell]); } break; case QUICK_BLOCK: |