From 1a99d8ee8d25701ad991a67d65e68d1f3d1c7f86 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 4 Sep 2016 22:01:16 -0400
Subject: XEEN: Fix compiler warnings

---
 engines/xeen/dialogs_party.cpp  | 6 +++---
 engines/xeen/dialogs_party.h    | 2 +-
 engines/xeen/dialogs_spells.cpp | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'engines/xeen')

diff --git a/engines/xeen/dialogs_party.cpp b/engines/xeen/dialogs_party.cpp
index 18f5f3af10..a03e2d763d 100644
--- a/engines/xeen/dialogs_party.cpp
+++ b/engines/xeen/dialogs_party.cpp
@@ -614,7 +614,7 @@ void PartyDialog::createChar() {
 		case Common::KEYCODE_c: {
 			_vm->_mode = MODE_FF;
 			bool result = saveCharacter(party._roster[freeCharList[charIndex]],
-				(CharacterClass)classId, race, sex, attribs);
+				classId, race, sex, attribs);
 			_vm->_mode = MODE_4;
 
 			if (result)
@@ -966,7 +966,7 @@ int PartyDialog::exchangeAttribute(int srcAttr) {
 	return result;
 }
 
-bool PartyDialog::saveCharacter(Character &c, CharacterClass classId,
+bool PartyDialog::saveCharacter(Character &c, int classId,
 		Race race, Sex sex, uint attribs[TOTAL_ATTRIBUTES]) {
 	if (classId == -1) {
 		ErrorScroll::show(_vm, SELECT_CLASS_BEFORE_SAVING);
@@ -997,7 +997,7 @@ bool PartyDialog::saveCharacter(Character &c, CharacterClass classId,
 	c._xeenSide = map._loadDarkSide;
 	c._sex = sex;
 	c._race = race;
-	c._class = classId;
+	c._class = (CharacterClass)classId;
 	c._level._permanent = isDarkCc ? 5 : 1;
 
 	c._might._permanent = attribs[MIGHT];
diff --git a/engines/xeen/dialogs_party.h b/engines/xeen/dialogs_party.h
index 2ad2daea0d..17ec4fd300 100644
--- a/engines/xeen/dialogs_party.h
+++ b/engines/xeen/dialogs_party.h
@@ -100,7 +100,7 @@ private:
 	/**
 	 * Saves the rolled character into the roster
 	 */
-	bool saveCharacter(Character &c, CharacterClass classId, Race race,
+	bool saveCharacter(Character &c, int classId, Race race,
 		Sex sex, uint attribs[TOTAL_ATTRIBUTES]);
 public:
 	static void show(XeenEngine *vm);
diff --git a/engines/xeen/dialogs_spells.cpp b/engines/xeen/dialogs_spells.cpp
index a10dab650b..e5d8cd0f9a 100644
--- a/engines/xeen/dialogs_spells.cpp
+++ b/engines/xeen/dialogs_spells.cpp
@@ -233,7 +233,7 @@ Character *SpellsDialog::execute(ButtonContainer *priorDialog, Character *c, int
 				} else {
 					Common::String spellName = _spells[newSelection]._name;
 					Common::String msg = (castingCopy & 0x80) ?
-						Common::String::format(SPELLS_PRESS_A_KEY, msg.c_str()) :
+						Common::String::format(SPELLS_PRESS_A_KEY, spellName.c_str()) :
 						Common::String::format(SPELLS_PURCHASE, spellName.c_str(), spellCost);
 
 					if (Confirm::show(_vm, msg, castingCopy + 1)) {
-- 
cgit v1.2.3