diff options
-rw-r--r-- | engines/mortevielle/actions.cpp | 4 | ||||
-rw-r--r-- | engines/mortevielle/mortevielle.cpp | 2 | ||||
-rw-r--r-- | engines/mortevielle/mortevielle.h | 2 | ||||
-rw-r--r-- | engines/mortevielle/outtext.cpp | 2 | ||||
-rw-r--r-- | engines/mortevielle/utils.cpp | 10 |
5 files changed, 10 insertions, 10 deletions
diff --git a/engines/mortevielle/actions.cpp b/engines/mortevielle/actions.cpp index 6f57019cf2..5ea9314d5e 100644 --- a/engines/mortevielle/actions.cpp +++ b/engines/mortevielle/actions.cpp @@ -1178,7 +1178,7 @@ void MortevielleEngine::fctEnter() { _coreVar._availableQuestion[8] = '*'; } else { int pres = 0; - if (!_blo) + if (!_outsideOnlyFl) pres = getPresence(_roomDoorId); if (pres != 0) { if ((_roomDoorId == TOILETS) || (_roomDoorId == BATHROOM)) @@ -1337,7 +1337,7 @@ void MortevielleEngine::fctWait() { do { ++_currentHourCount; prepareRoom(); - if (!_blo) + if (!_outsideOnlyFl) getPresence(_coreVar._currPlace); if ((_currBitIndex != 0) && (_savedBitIndex == 0)) { _crep = 998; diff --git a/engines/mortevielle/mortevielle.cpp b/engines/mortevielle/mortevielle.cpp index ab94cf1f16..f198bcc718 100644 --- a/engines/mortevielle/mortevielle.cpp +++ b/engines/mortevielle/mortevielle.cpp @@ -83,7 +83,7 @@ MortevielleEngine::MortevielleEngine(OSystem *system, const MortevielleGameDescr _keyPressedEsc = false; _reloadCFIEC = false; - _blo = false; + _outsideOnlyFl = true; _col = false; _syn = false; _obpart = false; diff --git a/engines/mortevielle/mortevielle.h b/engines/mortevielle/mortevielle.h index 941582f636..7a673f42f9 100644 --- a/engines/mortevielle/mortevielle.h +++ b/engines/mortevielle/mortevielle.h @@ -402,7 +402,7 @@ public: int _charAnswerMax[9]; byte _tabdon[4001]; bool _soundOff; - bool _blo; + bool _outsideOnlyFl; bool _destinationOk; bool _largestClearScreen; float _addFix; diff --git a/engines/mortevielle/outtext.cpp b/engines/mortevielle/outtext.cpp index 2518b317d5..b359860a82 100644 --- a/engines/mortevielle/outtext.cpp +++ b/engines/mortevielle/outtext.cpp @@ -299,7 +299,7 @@ void TextHandler::taffich() { if ((a < COAT_ARMS) && ((_vm->_maff < COAT_ARMS) || (_vm->_coreVar._currPlace == LANDING)) && (_vm->_currAction != _vm->_menu->_opcodeEnter)) { if ((a == ATTIC) || (a == CELLAR)) _vm->displayAloneText(); - else if (!_vm->_blo) + else if (!_vm->_outsideOnlyFl) _vm->getPresence(_vm->_coreVar._currPlace); _vm->_savedBitIndex = 0; } diff --git a/engines/mortevielle/utils.cpp b/engines/mortevielle/utils.cpp index c65818b9e9..29c9be2e0c 100644 --- a/engines/mortevielle/utils.cpp +++ b/engines/mortevielle/utils.cpp @@ -466,7 +466,7 @@ int MortevielleEngine::convertBitIndexToCharacterIndex(int bitIndex) { */ void MortevielleEngine::resetPresenceInRooms(int roomId) { if (roomId == DINING_ROOM) - _blo = false; + _outsideOnlyFl = false; if (roomId != GREEN_ROOM) { _roomPresenceLuc = false; @@ -1080,7 +1080,7 @@ void MortevielleEngine::initGame() { _place = MANOR_FRONT; _currentHourCount = 0; if (!_coreVar._alreadyEnteredManor) - _blo = true; + _outsideOnlyFl = true; _inGameHourDuration = kTime1; _currentTime = readclock(); } @@ -1285,7 +1285,7 @@ void MortevielleEngine::loseGame() { _roomDoorId = OWN_ROOM; _curSearchObjId = 0; _menu->unsetSearchMenu(); - if (!_blo) + if (!_outsideOnlyFl) getPresence(MANOR_FRONT); _loseGame = true; @@ -1393,7 +1393,7 @@ void MortevielleEngine::gotoDiningRoom() { _coreVar._currPlace = OWN_ROOM; prepareDisplayText(); resetPresenceInRooms(DINING_ROOM); - if (!_blo) + if (!_outsideOnlyFl) getPresence(OWN_ROOM); _currBitIndex = 0; _savedBitIndex = 0; @@ -2210,7 +2210,7 @@ void MortevielleEngine::prepareRoom() { if (_mouse->_pos.y < 12) return; - if (!_blo) { + if (!_outsideOnlyFl) { if ((hour == 12) || ((hour > 18) && (hour < 21)) || ((hour >= 0) && (hour < 7))) _inGameHourDuration = kTime2; else |