diff options
| author | Paul Gilbert | 2018-03-17 20:27:42 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2018-03-17 20:27:42 -0400 |
| commit | 22456b345f4b39558cfc07ccd2e06ab6cfb98850 (patch) | |
| tree | bb0e31433f624843f6addd563db48726be68dbaf /engines/xeen/interface.cpp | |
| parent | 562522e14414db68b77595de84d856c39e6cf00d (diff) | |
| download | scummvm-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/interface.cpp')
| -rw-r--r-- | engines/xeen/interface.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/xeen/interface.cpp b/engines/xeen/interface.cpp index 96f44bb690..11e0ee7256 100644 --- a/engines/xeen/interface.cpp +++ b/engines/xeen/interface.cpp @@ -661,7 +661,7 @@ void Interface::doStepCode() { break; } - if (_vm->_files->_isDarkCc && party._gameFlags[1][118]) { + if (_vm->_files->_ccNum && party._gameFlags[1][118]) { _falling = FALL_NONE; } else { if (_falling != FALL_NONE) @@ -692,9 +692,9 @@ void Interface::startFalling(bool flag) { Combat &combat = *_vm->_combat; Map &map = *_vm->_map; Party &party = *_vm->_party; - bool isDarkCc = _vm->_files->_isDarkCc; + int ccNum = _vm->_files->_ccNum; - if (isDarkCc && party._gameFlags[1][118]) { + if (ccNum && party._gameFlags[1][118]) { _falling = FALL_NONE; return; } @@ -704,10 +704,10 @@ void Interface::startFalling(bool flag) { _falling = FALL_START; draw3d(false); - if (flag && (!isDarkCc || party._fallMaze != 0)) { + if (flag && (!ccNum || party._fallMaze != 0)) { party._mazeId = party._fallMaze; party._mazePosition = party._fallPosition; - } else if (!isDarkCc) { + } else if (!ccNum) { switch (party._mazeId - 25) { case 0: case 26: @@ -927,7 +927,7 @@ bool Interface::checkMoveDirection(int key) { switch (map._currentWall) { case 5: - if (_vm->_files->_isDarkCc) + if (_vm->_files->_ccNum) goto check; // fall through |