diff options
author | Strangerke | 2012-10-12 07:31:30 +0200 |
---|---|---|
committer | Strangerke | 2012-10-12 07:31:30 +0200 |
commit | 957c220556b6c643a27bafc400f064addc853cd0 (patch) | |
tree | 887531e081001f11f5d27f1cbe13d0bc968d621b /engines | |
parent | 6238c034fd20017ec6734a43ba4ad1c36c9741c2 (diff) | |
download | scummvm-rg350-957c220556b6c643a27bafc400f064addc853cd0.tar.gz scummvm-rg350-957c220556b6c643a27bafc400f064addc853cd0.tar.bz2 scummvm-rg350-957c220556b6c643a27bafc400f064addc853cd0.zip |
MORTEVIELLE: Some more renaming
Diffstat (limited to 'engines')
-rw-r--r-- | engines/mortevielle/actions.cpp | 20 | ||||
-rw-r--r-- | engines/mortevielle/mortevielle.cpp | 37 | ||||
-rw-r--r-- | engines/mortevielle/mortevielle.h | 6 | ||||
-rw-r--r-- | engines/mortevielle/outtext.cpp | 2 |
4 files changed, 34 insertions, 31 deletions
diff --git a/engines/mortevielle/actions.cpp b/engines/mortevielle/actions.cpp index 2e4a237d53..9aca451685 100644 --- a/engines/mortevielle/actions.cpp +++ b/engines/mortevielle/actions.cpp @@ -52,7 +52,7 @@ void MortevielleEngine::fctMove() { tfleche(); if (_keyPressedEsc) - _okdes = false; + _destinationOk = false; if ((_anyone) || (_keyPressedEsc)) return; @@ -180,7 +180,7 @@ void MortevielleEngine::fctMove() { void MortevielleEngine::fctTake() { if (_caff > 99) { int cx = _caff; - avpoing(cx); + putInHand(cx); if (_crep != 139) { if (_currBitIndex > 0) _coreVar._faithScore += 3; @@ -236,34 +236,34 @@ void MortevielleEngine::fctTake() { _coreVar._faithScore += 3; _crep = 997; if ((_coreVar._currPlace == PURPLE_ROOM) && (_coreVar._purpleRoomObjectId != 0)) - avpoing(_coreVar._purpleRoomObjectId); + putInHand(_coreVar._purpleRoomObjectId); if ((_coreVar._currPlace == ATTIC) && (_num == 1) && (_coreVar._atticBallHoleObjectId != 0)) { - avpoing(_coreVar._atticBallHoleObjectId); + putInHand(_coreVar._atticBallHoleObjectId); if ((_crep != 997) && (_crep != 139)) aniof(2, 7); } if ((_coreVar._currPlace == ATTIC) && (_num == 2) && (_coreVar._atticRodHoleObjectId != 0)) { - avpoing(_coreVar._atticRodHoleObjectId); + putInHand(_coreVar._atticRodHoleObjectId); if ((_crep != 997) && (_crep != 139)) aniof(2, 6); } if ((_coreVar._currPlace == CELLAR) && (_coreVar._cellarObjectId != 0)) { - avpoing(_coreVar._cellarObjectId); + putInHand(_coreVar._cellarObjectId); if ((_crep != 997) && (_crep != 139)) aniof(2, 2); } if ((_coreVar._currPlace == CRYPT) && (_coreVar._cryptObjectId != 0)) - avpoing(_coreVar._cryptObjectId); + putInHand(_coreVar._cryptObjectId); if ((_coreVar._currPlace == SECRET_PASSAGE) && (_coreVar._secretPassageObjectId != 0)) { - avpoing(_coreVar._secretPassageObjectId); + putInHand(_coreVar._secretPassageObjectId); if ((_crep != 997) && (_crep != 139)) { _crep = 182; aniof(2, 1); } } if ((_coreVar._currPlace == WELL) && (_coreVar._wellObjectId != 0)) { - avpoing(_coreVar._wellObjectId); + putInHand(_coreVar._wellObjectId); if ((_crep != 997) && (_crep != 139)) aniof(2, 1); } @@ -312,7 +312,7 @@ void MortevielleEngine::fctInventoryTake() { cz = ord(_coreVar._sjer[cy]); _coreVar._sjer[cy] = chr(0); _menu.setInventoryText(); - avpoing(cz); + putInHand(cz); _crep = 998; clearDescriptionBar(); } diff --git a/engines/mortevielle/mortevielle.cpp b/engines/mortevielle/mortevielle.cpp index a6fda733f2..df80408b63 100644 --- a/engines/mortevielle/mortevielle.cpp +++ b/engines/mortevielle/mortevielle.cpp @@ -102,9 +102,9 @@ MortevielleEngine::MortevielleEngine(OSystem *system, const ADGameDescription *g _col = false; _syn = false; _obpart = false; - _okdes = false; + _destinationOk = false; _anyone = false; - _brt = false; + _uptodatePresence = false; _textColor = 0; _currGraphicalDevice = -1; @@ -116,7 +116,6 @@ MortevielleEngine::MortevielleEngine(OSystem *system, const ADGameDescription *g _day = 0; memset(_mem, 0, sizeof(_mem)); - _anyone = false; } MortevielleEngine::~MortevielleEngine() { @@ -720,8 +719,8 @@ void MortevielleEngine::handleAction() { if ((_controlMenu == 0) && (! _loseGame) && (! _endGame)) { g_vm->_text.taffich(); - if (_okdes) { - _okdes = false; + if (_destinationOk) { + _destinationOk = false; drawPicture(); } if ((!_syn) || (_col)) @@ -1694,7 +1693,7 @@ void MortevielleEngine::loseGame() { clearVerbBar(); _col = false; _syn = false; - _okdes = false; + _destinationOk = false; } /** @@ -1810,7 +1809,7 @@ void MortevielleEngine::checkManorDistance() { _crep = 1506; loseGame(); } else { - _okdes = true; + _destinationOk = true; _coreVar._currPlace = MOUNTAIN; affrep(); } @@ -1878,10 +1877,10 @@ void MortevielleEngine::gameLoaded() { _menu._menuDisplayed = false; _loseGame = true; _anyone = false; - _okdes = true; + _destinationOk = true; _col = false; _hiddenHero = false; - _brt = false; + _uptodatePresence = false; _maff = 68; _menuOpcode = OPCODE_NONE; _prebru = 0; @@ -1903,7 +1902,7 @@ void MortevielleEngine::gameLoaded() { affrep(); _hintPctMessage = getString(580); - _okdes = false; + _destinationOk = false; _endGame = true; _loseGame = false; _heroSearching = false; @@ -1932,7 +1931,7 @@ void MortevielleEngine::handleOpcode() { _syn = false; _keyPressedEsc = false; if (!_anyone) { - if (_brt) { + if (_uptodatePresence) { if ((_msg[3] == MENU_MOVE) || (_msg[4] == OPCODE_LEAVE) || (_msg[4] == OPCODE_SLEEP) || (_msg[4] == OPCODE_EAT)) { _controlMenu = 4; mennor(); @@ -2733,8 +2732,8 @@ void MortevielleEngine::prepareRoom() { initCaveOrCellar(); } else if (_currBitIndex == 10) { _currBitIndex = 0; - if (!_brt) { - _brt = true; + if (!_uptodatePresence) { + _uptodatePresence = true; _startHour = readclock(); if (getRandomNumber(1, 5) < 5) { clearVerbBar(); @@ -2753,9 +2752,9 @@ void MortevielleEngine::prepareRoom() { } } _endHour = readclock(); - if ((_brt) && ((_endHour - _startHour) > 17)) { + if ((_uptodatePresence) && ((_endHour - _startHour) > 17)) { getPresenceBitIndex(_place); - _brt = false; + _uptodatePresence = false; _startHour = 0; if ((_coreVar._currPlace > OWN_ROOM) && (_coreVar._currPlace < DINING_ROOM)) _anyone = true; @@ -3352,7 +3351,7 @@ void MortevielleEngine::drawPicture() { void MortevielleEngine::drawPictureWithText() { _text.taffich(); drawPicture(); - _okdes = false; + _destinationOk = false; } /** @@ -3710,7 +3709,11 @@ void MortevielleEngine::treg(int objId) { } } -void MortevielleEngine::avpoing(int &objId) { +/** + * Engine function - Put in hand + * @remarks Originally called 'avpoing' + */ +void MortevielleEngine::putInHand(int &objId) { _crep = 999; if (_coreVar._selectedObjectId != 0) ajjer(_coreVar._selectedObjectId); diff --git a/engines/mortevielle/mortevielle.h b/engines/mortevielle/mortevielle.h index 20390af293..390ff7a1ef 100644 --- a/engines/mortevielle/mortevielle.h +++ b/engines/mortevielle/mortevielle.h @@ -243,7 +243,7 @@ private: bool _syn; bool _obpart; bool _anyone; - bool _brt; + bool _uptodatePresence; int _textColor; int _place; @@ -445,7 +445,7 @@ private: void ajjer(int ob); void tsuiv(); void treg(int objId); - void avpoing(int &objId); + void putInHand(int &objId); void rechai(int &ch); void fenat(char ans); @@ -456,7 +456,7 @@ public: byte _tabdon[4001]; bool _soundOff; bool _blo; - bool _okdes; + bool _destinationOk; bool _largestClearScreen; int _currGraphicalDevice; int _newGraphicalDevice; diff --git a/engines/mortevielle/outtext.cpp b/engines/mortevielle/outtext.cpp index 9e903bb133..e105002f7c 100644 --- a/engines/mortevielle/outtext.cpp +++ b/engines/mortevielle/outtext.cpp @@ -242,7 +242,7 @@ void TextHandler::taffich() { break; } - g_vm->_okdes = true; + g_vm->_destinationOk = true; g_vm->_mouse.hideMouse(); lgt = 0; Common::String filename; |