diff options
| author | Paul Gilbert | 2018-02-12 20:19:42 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2018-02-12 20:19:42 -0500 |
| commit | 8559be1598066a822d20e6ebaab87a5765d402e0 (patch) | |
| tree | d7e0912ec385e2b98aa7947ab3a4e3e2c6c438cd /engines | |
| parent | f0c5b6e9a81bd718807c0b7d9f5ff8e811bdc3d4 (diff) | |
| download | scummvm-rg350-8559be1598066a822d20e6ebaab87a5765d402e0.tar.gz scummvm-rg350-8559be1598066a822d20e6ebaab87a5765d402e0.tar.bz2 scummvm-rg350-8559be1598066a822d20e6ebaab87a5765d402e0.zip | |
XEEN: Properly pause when listing treasure post-combat
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/xeen/combat.cpp | 8 | ||||
| -rw-r--r-- | engines/xeen/party.cpp | 7 |
2 files changed, 8 insertions, 7 deletions
diff --git a/engines/xeen/combat.cpp b/engines/xeen/combat.cpp index fa408307fa..8afe48da15 100644 --- a/engines/xeen/combat.cpp +++ b/engines/xeen/combat.cpp @@ -1532,7 +1532,7 @@ void Combat::attack2(int damage, RangeType rangeType) { for (int idx = 0; idx < MAX_TREASURE_ITEMS; ++idx) { if (party._treasure._weapons[idx]._id == 0) { party._treasure._weapons[idx] = tempChar._weapons[0]; - party._treasure._hasItems = 1; + party._treasure._hasItems = true; break; } } @@ -1541,7 +1541,7 @@ void Combat::attack2(int damage, RangeType rangeType) { for (int idx = 0; idx < MAX_TREASURE_ITEMS; ++idx) { if (party._treasure._armor[idx]._id == 0) { party._treasure._armor[idx] = tempChar._armor[0]; - party._treasure._hasItems = 1; + party._treasure._hasItems = true; break; } } @@ -1550,7 +1550,7 @@ void Combat::attack2(int damage, RangeType rangeType) { for (int idx = 0; idx < MAX_TREASURE_ITEMS; ++idx) { if (party._treasure._accessories[idx]._id == 0) { party._treasure._accessories[idx] = tempChar._accessories[0]; - party._treasure._hasItems = 1; + party._treasure._hasItems = true; break; } } @@ -1559,7 +1559,7 @@ void Combat::attack2(int damage, RangeType rangeType) { for (int idx = 0; idx < MAX_TREASURE_ITEMS; ++idx) { if (party._treasure._accessories[idx]._id == 0) { party._treasure._accessories[idx] = tempChar._accessories[0]; - party._treasure._hasItems = 1; + party._treasure._hasItems = true; break; } } diff --git a/engines/xeen/party.cpp b/engines/xeen/party.cpp index 2ef7ad7053..7e89cf170a 100644 --- a/engines/xeen/party.cpp +++ b/engines/xeen/party.cpp @@ -660,14 +660,15 @@ void Party::giveTreasure() { w.writeString(Res.HIT_A_KEY); w.update(); + events.clearEvents(); do { events.updateGameCounter(); intf.draw3d(true); - while (!events.isKeyMousePressed() && events.timeElapsed() < 1) - events.pollEventsAndWait(); - } while (!_vm->shouldExit() && events.timeElapsed() == 1); + events.wait(1, false); + } while (!_vm->shouldExit() && !events.isKeyMousePressed()); + events.clearEvents(); if (_vm->_mode != MODE_COMBAT) _vm->_mode = MODE_1; |