[Scummvm-git-logs] scummvm master -> 396076c6fd9a74966357074ea9cc5b51f1181f96

[dreammaster]

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

Summary:
05c8c83b16 XEEN: Fix laugh sound in death cutscene
396076c6fd XEEN: Fix combat crash when additional monsters join the front row


Commit: 05c8c83b1652f8553c3be2783a40b2489355ae9e
    https://github.com/scummvm/scummvm/commit/05c8c83b1652f8553c3be2783a40b2489355ae9e
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-04-01T17:17:33-04:00

Commit Message:
XEEN: Fix laugh sound in death cutscene

Changed paths:
    engines/xeen/worldofxeen/worldofxeen.cpp


diff --git a/engines/xeen/worldofxeen/worldofxeen.cpp b/engines/xeen/worldofxeen/worldofxeen.cpp
index c4a861a..ecaae83 100644
--- a/engines/xeen/worldofxeen/worldofxeen.cpp
+++ b/engines/xeen/worldofxeen/worldofxeen.cpp
@@ -79,7 +79,7 @@ void WorldOfXeenEngine::death() {
 	w.update();
 	savedBg.blitFrom(*_screen);
 
-	_sound->playSound(_files->_ccNum ? "laff1.voc" : "xeenlaff.voc");
+	_sound->playSound(_files->_ccNum ? "laff1.voc" : "xeenlaff.voc", _files->_ccNum, 0);
 
 	// Animation of Xeen or Alamar laughing
 	for (int idx = 0, idx2 = 0; idx < (_files->_ccNum ? 10 : 23); ++idx) {


Commit: 396076c6fd9a74966357074ea9cc5b51f1181f96
    https://github.com/scummvm/scummvm/commit/396076c6fd9a74966357074ea9cc5b51f1181f96
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-04-01T17:18:37-04:00

Commit Message:
XEEN: Fix combat crash when additional monsters join the front row

Changed paths:
    engines/xeen/combat.h
    engines/xeen/interface.cpp


diff --git a/engines/xeen/combat.h b/engines/xeen/combat.h
index 6dc20a0..5d27dc5 100644
--- a/engines/xeen/combat.h
+++ b/engines/xeen/combat.h
@@ -151,7 +151,7 @@ private:
 public:
 	Common::Array<Character *> _combatParty;
 	bool _charsBlocked[PARTY_AND_MONSTERS];
-	Common::Array<int> _charsGone;
+	int _charsGone[PARTY_AND_MONSTERS];
 	SpriteResource _powSprites;
 	int _attackMonsters[ATTACK_MONSTERS_COUNT];
 	int _monster2Attack;
diff --git a/engines/xeen/interface.cpp b/engines/xeen/interface.cpp
index 8e973f7..8e52aae 100644
--- a/engines/xeen/interface.cpp
+++ b/engines/xeen/interface.cpp
@@ -1462,7 +1462,6 @@ void Interface::doCombat() {
 	mainIconsPrint();
 
 	combat._combatParty.clear();
-	combat._charsGone.clear();
 	combat.clearBlocked();
 	combat._pow[0]._duration = 0;
 	combat._pow[1]._duration = 0;
@@ -1475,9 +1474,8 @@ void Interface::doCombat() {
 	combat.setSpeedTable();
 
 	// Initialize arrays for character/monster states
-	combat._charsGone.resize(combat._speedTable.size());
-	Common::fill(&combat._charsGone[0], &combat._charsGone[0] + combat._speedTable.size(), 0);
-	Common::fill(&combat._charsBlocked[0], &combat._charsBlocked[0] + combat._speedTable.size(), false);
+	Common::fill(&combat._charsGone[0], &combat._charsGone[PARTY_AND_MONSTERS], 0);
+	Common::fill(&combat._charsBlocked[0], &combat._charsBlocked[PARTY_AND_MONSTERS], false);
 
 	combat._whosSpeed = -1;
 	combat._whosTurn = -1;
@@ -1657,7 +1655,7 @@ void Interface::doCombat() {
 
 			// Handling for if the combat turn is complete
 			if (combat.allHaveGone()) {
-				Common::fill(&combat._charsGone[0], &combat._charsGone[0] + combat._charsGone.size(), false);
+				Common::fill(&combat._charsGone[0], &combat._charsGone[PARTY_AND_MONSTERS], false);
 				combat.clearBlocked();
 				combat.setSpeedTable();
 				combat._whosTurn = -1;
@@ -1796,7 +1794,7 @@ void Interface::nextChar() {
 			combat.setSpeedTable();
 			combat._whosTurn = -1;
 			combat._whosSpeed = -1;
-			Common::fill(&combat._charsGone[0], &combat._charsGone[0] + combat._charsGone.size(), 0);
+			Common::fill(&combat._charsGone[0], &combat._charsGone[PARTY_AND_MONSTERS], false);
 			continue;
 		}