aboutsummaryrefslogtreecommitdiff
path: root/engines/xeen/swordsofxeen
diff options
context:
space:
mode:
authorPaul Gilbert2018-03-17 20:27:42 -0400
committerPaul Gilbert2018-03-17 20:27:42 -0400
commit22456b345f4b39558cfc07ccd2e06ab6cfb98850 (patch)
treebb0e31433f624843f6addd563db48726be68dbaf /engines/xeen/swordsofxeen
parent562522e14414db68b77595de84d856c39e6cf00d (diff)
downloadscummvm-rg350-22456b345f4b39558cfc07ccd2e06ab6cfb98850.tar.gz
scummvm-rg350-22456b345f4b39558cfc07ccd2e06ab6cfb98850.tar.bz2
scummvm-rg350-22456b345f4b39558cfc07ccd2e06ab6cfb98850.zip
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
Diffstat (limited to 'engines/xeen/swordsofxeen')
-rw-r--r--engines/xeen/swordsofxeen/swordsofxeen.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/xeen/swordsofxeen/swordsofxeen.cpp b/engines/xeen/swordsofxeen/swordsofxeen.cpp
index bbe0a74c1c..a060b92eec 100644
--- a/engines/xeen/swordsofxeen/swordsofxeen.cpp
+++ b/engines/xeen/swordsofxeen/swordsofxeen.cpp
@@ -49,10 +49,10 @@ void SwordsOfXeenEngine::death() {
_sound->playSound("laff1.voc");
bool breakFlag = false;
- for (int idx = 0, idx2 = 0; idx < (_files->_isDarkCc ? 10 : 23); ++idx) {
+ for (int idx = 0, idx2 = 0; idx < (_files->_ccNum ? 10 : 23); ++idx) {
_events->updateGameCounter();
- if (_files->_isDarkCc) {
+ if (_files->_ccNum) {
breakFlag = _events->wait(2);
} else {
if (idx == 1 || idx == 11)
@@ -63,8 +63,8 @@ void SwordsOfXeenEngine::death() {
_sound->playFX(34);
}
- if ((_files->_isDarkCc ? 9 : 10) == idx) {
- if ((_files->_isDarkCc ? 2 : 1) > idx2) {
+ if ((_files->_ccNum ? 9 : 10) == idx) {
+ if ((_files->_ccNum ? 2 : 1) > idx2) {
// Restart loop
idx = -1;
++idx2;