[Scummvm-git-logs] scummvm master -> 8559be1598066a822d20e6ebaab87a5765d402e0

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
8559be1598 XEEN: Properly pause when listing treasure post-combat


Commit: 8559be1598066a822d20e6ebaab87a5765d402e0
    https://github.com/scummvm/scummvm/commit/8559be1598066a822d20e6ebaab87a5765d402e0
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-02-12T20:19:42-05:00

Commit Message:
XEEN: Properly pause when listing treasure post-combat

Changed paths:
    engines/xeen/combat.cpp
    engines/xeen/party.cpp


diff --git a/engines/xeen/combat.cpp b/engines/xeen/combat.cpp
index fa40830..8afe48d 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 2ef7ad7..7e89cf1 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;