XEEN: Method rename and compilation warning fixes

scummvm · Feb 26, 2015 · 4191335 · 4191335
1 parent b4c8c81
commit 4191335
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -158,7 +158,7 @@ class Combat {
 
 	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
@@ -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)