aboutsummaryrefslogtreecommitdiff
path: root/engines/xeen/combat.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2017-12-28 23:36:29 -0500
committerPaul Gilbert2017-12-28 23:36:29 -0500
commita37b0e8181f055d4778c53aa873816af4349aa9d (patch)
treedfbf8025f2ade4c07f5770b9101f1d181d275b7d /engines/xeen/combat.cpp
parent26c096d39df27e8460af6ff8c28f381ca90e0422 (diff)
downloadscummvm-rg350-a37b0e8181f055d4778c53aa873816af4349aa9d.tar.gz
scummvm-rg350-a37b0e8181f055d4778c53aa873816af4349aa9d.tar.bz2
scummvm-rg350-a37b0e8181f055d4778c53aa873816af4349aa9d.zip
XEEN: Change _gameFlags to it's own class
Byte 6 of the flags data, for flags 48 to 55, is directly used in several places. I didn't think it was needed, but turns out it is. So I've had to refactor the bool array I had previously to have this as a bitset, so byte 6 can be accessed
Diffstat (limited to 'engines/xeen/combat.cpp')
-rw-r--r--engines/xeen/combat.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/xeen/combat.cpp b/engines/xeen/combat.cpp
index fe2eaa94bf..bcedff2229 100644
--- a/engines/xeen/combat.cpp
+++ b/engines/xeen/combat.cpp
@@ -1476,16 +1476,16 @@ void Combat::attack2(int damage, RangeType rangeType) {
if (monsterDied) {
if (!isDarkCc) {
if (_monster2Attack == 20 && party._mazeId == 41)
- party._gameFlags[0][11] = true;
+ party._gameFlags.set(11, true);
if (_monster2Attack == 8 && party._mazeId == 78) {
- party._gameFlags[0][60] = true;
+ party._gameFlags.set(60, true);
party._questFlags[0][23] = false;
for (uint idx = 0; idx < party._activeParty.size(); ++idx)
party._activeParty[idx].setAward(42, true);
if (_monster2Attack == 27 && party._mazeId == 29)
- party._gameFlags[0][104] = true;
+ party._gameFlags.set(104, true);
}
}