From 4191335dfabc0baff9459a61e5453dad6270582f Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 25 Feb 2015 22:03:57 -0500
Subject: XEEN: Method rename and compilation warning fixes

---
 engines/xeen/combat.cpp    | 8 ++++----
 engines/xeen/combat.h      | 2 +-
 engines/xeen/interface.cpp | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/engines/xeen/combat.cpp b/engines/xeen/combat.cpp
index c3590e7cdd..1aa41fb52b 100644
--- a/engines/xeen/combat.cpp
+++ b/engines/xeen/combat.cpp
@@ -621,7 +621,7 @@ void Combat::monstersAttack() {
 
 	for (int idx = 0; idx < 36; ++idx) {
 		if (_gmonHit[idx] != -1)
-			attackMonster(_gmonHit[idx]);
+			doMonsterTurn(_gmonHit[idx]);
 	}
 
 	_monstersAttacking = false;
@@ -770,7 +770,7 @@ void Combat::monsterOvercome() {
 	}
 }
 
-void Combat::attackMonster(int monsterId) {
+void Combat::doMonsterTurn(int monsterId) {
 	Interface &intf = *_vm->_interface;
 	Map &map = *_vm->_map;
 	Party &party = *_vm->_party;
@@ -808,7 +808,7 @@ void Combat::attackMonster(int monsterId) {
 	intf.draw3d(true);
 	intf.draw3d(true);
 
-	File f(monsterData._attackVoc);
+	File f(Common::String::format("%s.voc", monsterData._attackVoc.c_str()));
 	sound.playSample(&f, 0);
 	bool flag = false;
 
@@ -1073,7 +1073,7 @@ void Combat::setupCombatParty() {
 void Combat::setSpeedTable() {
 	Map &map = *_vm->_map;
 	Common::Array<int> charSpeeds;
-	bool hasSpeed = _whosSpeed != -1 && _whosSpeed < _speedTable.size();
+	bool hasSpeed = _whosSpeed != -1 && _whosSpeed < (int)_speedTable.size();
 	int oldSpeed = hasSpeed ? _speedTable[_whosSpeed] : 0;
 
 	// Set up speeds for party membres
diff --git a/engines/xeen/combat.h b/engines/xeen/combat.h
index d4cb87ea39..4783819c70 100644
--- a/engines/xeen/combat.h
+++ b/engines/xeen/combat.h
@@ -158,7 +158,7 @@ public:
 
 	void moveMonster(int monsterId, const Common::Point &moveDelta);
 
-	void attackMonster(int monsterId);
+	void doMonsterTurn(int monsterId);
 
 	void endAttack();
 
diff --git a/engines/xeen/interface.cpp b/engines/xeen/interface.cpp
index 74749d4f9a..c06ef79dc9 100644
--- a/engines/xeen/interface.cpp
+++ b/engines/xeen/interface.cpp
@@ -2218,7 +2218,7 @@ void Interface::nextChar() {
 			break;
 		} else {
 			// It's a monster's turn to attack
-			combat.attackMonster(0);
+			combat.doMonsterTurn(0);
 			if (!party._dead) {
 				party.checkPartyDead();
 				if (party._dead)
-- 
cgit v1.2.3