XEEN: Change bool _isDarkCc to int _ccNum

Originally the flag was whether the party was on the Dark Side,
but as a bool I was having to cast it to an int side/cc number in
more and more places. So now I've converted it to _ccNum, and it
can be used directly as an int

5 files changed, 19 insertions, 19 deletions

diff --git a/engines/xeen/dialogs/dialogs.cpp b/engines/xeen/dialogs/dialogs.cpp
index d7a696b8d5..ba7fe783c3 100644
--- a/engines/xeen/dialogs/dialogs.cpp
+++ b/engines/xeen/dialogs/dialogs.cpp
@@ -153,7 +153,7 @@ void ButtonContainer::drawButtons(XSurface *surface) {
 }
 
 bool ButtonContainer::doScroll(bool rollUp, bool fadeIn) {
-	if (_vm->_files->_isDarkCc) {
+	if (_vm->_files->_ccNum) {
 		return Cutscenes::doScroll(rollUp, fadeIn);
 	} else {
 		saveButtons();
diff --git a/engines/xeen/dialogs/dialogs_create_char.cpp b/engines/xeen/dialogs/dialogs_create_char.cpp
index 577ae5314b..72f1b749ac 100644
--- a/engines/xeen/dialogs/dialogs_create_char.cpp
+++ b/engines/xeen/dialogs/dialogs_create_char.cpp
@@ -579,7 +579,7 @@ bool CreateCharacterDialog::saveCharacter(Character &c, int classId, Race race,
 	Window &w = windows[6];
 	Common::String name;
 	int result;
-	bool isDarkCc = _vm->_files->_isDarkCc;
+	int ccNum = _vm->_files->_ccNum;
 
 	// Prompt for a character name
 	w.open();
@@ -601,7 +601,7 @@ bool CreateCharacterDialog::saveCharacter(Character &c, int classId, Race race,
 	c._sex = sex;
 	c._race = race;
 	c._class = (CharacterClass)classId;
-	c._level._permanent = isDarkCc ? 5 : 1;
+	c._level._permanent = ccNum ? 5 : 1;
 
 	c._might._permanent = _attribs[MIGHT];
 	c._intellect._permanent = _attribs[INTELLECT];
diff --git a/engines/xeen/dialogs/dialogs_input.cpp b/engines/xeen/dialogs/dialogs_input.cpp
index 1d05c81f32..0ac8f3612b 100644
--- a/engines/xeen/dialogs/dialogs_input.cpp
+++ b/engines/xeen/dialogs/dialogs_input.cpp
@@ -168,14 +168,14 @@ int StringInput::execute(bool type, const Common::String &expected,
 			MirrorEntry me;
 			scripts._mirror.clear();
 
-			File f(Common::String::format("%smirr.txt", files._isDarkCc ? "dark" : "xeen"), 1);
+			File f(Common::String::format("%smirr.txt", files._ccNum ? "dark" : "xeen"), 1);
 			while (me.synchronize(f))
 				scripts._mirror.push_back(me);
 			f.close();
 
 			// Load in any extended mirror entries
 			Common::File f2;
-			if (f2.open(Common::String::format("%smirr.ext", files._isDarkCc ? "dark" : "xeen"))) {
+			if (f2.open(Common::String::format("%smirr.ext", files._ccNum ? "dark" : "xeen"))) {
 				while (me.synchronize(f2))
 					scripts._mirror.push_back(me);
 				f2.close();
@@ -184,7 +184,7 @@ int StringInput::execute(bool type, const Common::String &expected,
 			for (uint idx = 0; idx < scripts._mirror.size(); ++idx) {
 				if (!line.compareToIgnoreCase(scripts._mirror[idx]._name)) {
 					result = idx + 1;
-					sound.playFX(_vm->_files->_isDarkCc ? 35 : 61);
+					sound.playFX(_vm->_files->_ccNum ? 35 : 61);
 					break;
 				}
 			}
diff --git a/engines/xeen/dialogs/dialogs_items.cpp b/engines/xeen/dialogs/dialogs_items.cpp
index ab2269b2d7..0f6d60890f 100644
--- a/engines/xeen/dialogs/dialogs_items.cpp
+++ b/engines/xeen/dialogs/dialogs_items.cpp
@@ -742,7 +742,7 @@ int ItemsDialog::doItemOptions(Character &c, int actionIndex, int itemIndex, Ite
 	Sound &sound = *_vm->_sound;
 	Spells &spells = *_vm->_spells;
 	Windows &windows = *_vm->_windows;
-	bool isDarkCc = _vm->_files->_isDarkCc;
+	int ccNum = _vm->_files->_ccNum;
 
 	InventoryItems &items = c._items[category];
 	if (items[0].empty())
@@ -834,7 +834,7 @@ int ItemsDialog::doItemOptions(Character &c, int actionIndex, int itemIndex, Ite
 				if (Confirm::show(_vm, Common::String::format(Res.BUY_X_FOR_Y_GOLD,
 						desc.c_str(), cost))) {
 					if (party.subtract(CONS_GOLD, cost, WHERE_PARTY, WT_FREEZE_WAIT)) {
-						if (isDarkCc) {
+						if (ccNum) {
 							sound.stopSound();
 							sound.playSound("choice2.voc");
 						}
diff --git a/engines/xeen/dialogs/dialogs_spells.cpp b/engines/xeen/dialogs/dialogs_spells.cpp
index 2996cb7e94..9148c41a07 100644
--- a/engines/xeen/dialogs/dialogs_spells.cpp
+++ b/engines/xeen/dialogs/dialogs_spells.cpp
@@ -46,7 +46,7 @@ Character *SpellsDialog::execute(ButtonContainer *priorDialog, Character *c, int
 	Sound &sound = *_vm->_sound;
 	Spells &spells = *_vm->_spells;
 	Windows &windows = *_vm->_windows;
-	bool isDarkCc = _vm->_files->_isDarkCc;
+	int ccNum = _vm->_files->_ccNum;
 	loadButtons();
 
 	int castingCopy = isCasting;
@@ -61,7 +61,7 @@ Character *SpellsDialog::execute(ButtonContainer *priorDialog, Character *c, int
 			if (!c->guildMember()) {
 				sound.stopSound();
 				intf._overallFrame = 5;
-				sound.playSound(isDarkCc ? "skull1.voc" : "guild11.voc", 1);
+				sound.playSound(ccNum ? "skull1.voc" : "guild11.voc", 1);
 				break;
 			}
 
@@ -240,7 +240,7 @@ Character *SpellsDialog::execute(ButtonContainer *priorDialog, Character *c, int
 							c->_spells[spellIndex] = true;
 							sound.stopSound();
 							intf._overallFrame = 0;
-							sound.playSound(isDarkCc ? "guild12.voc" : "parrot2.voc", 1);
+							sound.playSound(ccNum ? "guild12.voc" : "parrot2.voc", 1);
 						} else {
 							sound.playFX(21);
 						}
@@ -308,7 +308,7 @@ void SpellsDialog::loadButtons() {
 const char *SpellsDialog::setSpellText(Character *c, int isCasting) {
 	Party &party = *_vm->_party;
 	Spells &spells = *_vm->_spells;
-	bool isDarkCc = _vm->_files->_isDarkCc;
+	int ccNum = _vm->_files->_ccNum;
 	int expenseFactor = 0;
 	int currLevel = c->getCurrentLevel();
 	int category;
@@ -358,7 +358,7 @@ const char *SpellsDialog::setSpellText(Character *c, int isCasting) {
 						}
 					}
 				}
-			} else if (isDarkCc) {
+			} else if (ccNum) {
 				int groupIndex = (party._mazeId - 29) / 2;
 				for (int spellId = Res.DARK_SPELL_RANGES[groupIndex][0];
 						spellId < Res.DARK_SPELL_RANGES[groupIndex][1]; ++spellId) {
@@ -797,14 +797,14 @@ bool LloydsBeacon::execute() {
 	Sound &sound = *_vm->_sound;
 	Windows &windows = *_vm->_windows;
 	Window &w = windows[10];
-	bool isDarkCc = _vm->_files->_isDarkCc;
+	int ccNum = _vm->_files->_ccNum;
 	Character &c = *combat._oldCharacter;
 
 	loadButtons();
 
 	if (!c._lloydMap) {
 		// No destination previously set, so have a default ready
-		if (isDarkCc) {
+		if (ccNum) {
 			c._lloydSide = 1;
 			c._lloydPosition = Common::Point(25, 21);
 			c._lloydMap = 29;
@@ -846,12 +846,12 @@ bool LloydsBeacon::execute() {
 
 		switch (_buttonValue) {
 		case Common::KEYCODE_r:
-			if (!isDarkCc && c._lloydMap >= 75 && c._lloydMap <= 78 && !party._cloudsEnd) {
+			if (!ccNum && c._lloydMap >= 75 && c._lloydMap <= 78 && !party._cloudsEnd) {
 				result = false;
 			} else {
 				sound.playFX(51);
-				map._loadDarkSide = isDarkCc;
-				if (c._lloydMap != party._mazeId || c._lloydSide != (isDarkCc ? 1 : 0)) {
+				map._loadDarkSide = ccNum;
+				if (c._lloydMap != party._mazeId || c._lloydSide != ccNum) {
 					map.load(c._lloydMap);
 				}
 
@@ -866,7 +866,7 @@ bool LloydsBeacon::execute() {
 			sound.playFX(20);
 			c._lloydMap = party._mazeId;
 			c._lloydPosition = party._mazePosition;
-			c._lloydSide = isDarkCc ? 1 : 0;
+			c._lloydSide = ccNum;
 
 			_buttonValue = Common::KEYCODE_ESCAPE;
 			break;