diff options
| author | Strangerke | 2013-08-03 14:55:19 +0200 |
|---|---|---|
| committer | Strangerke | 2013-08-03 14:55:19 +0200 |
| commit | 178feb8e8bd46b0bb5222c7a4a09e6da91df9752 (patch) | |
| tree | e96aa81fd1922d374593d3edb11b6d9dd5bfab48 /engines/mortevielle/actions.cpp | |
| parent | 6d2f53a63c7f9c4d14b88629f7c644b6f9fd3644 (diff) | |
| download | scummvm-rg350-178feb8e8bd46b0bb5222c7a4a09e6da91df9752.tar.gz scummvm-rg350-178feb8e8bd46b0bb5222c7a4a09e6da91df9752.tar.bz2 scummvm-rg350-178feb8e8bd46b0bb5222c7a4a09e6da91df9752.zip | |
MORTEVIELLE: Rename ROOM9 into JULIA_ROOM
Diffstat (limited to 'engines/mortevielle/actions.cpp')
| -rw-r--r-- | engines/mortevielle/actions.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/mortevielle/actions.cpp b/engines/mortevielle/actions.cpp index 3638847135..73d258af6c 100644 --- a/engines/mortevielle/actions.cpp +++ b/engines/mortevielle/actions.cpp @@ -283,7 +283,7 @@ void MortevielleEngine::fctTake() { || ((_coreVar._currPlace == RED_ROOM) && (_num == 2)) || ((_coreVar._currPlace == BATHROOM) && (_num == 6)) || ((_coreVar._currPlace == GREEN_ROOM2) && (_num == 4)) - || ((_coreVar._currPlace == ROOM9) && (_num == 4)) + || ((_coreVar._currPlace == JULIA_ROOM) && (_num == 4)) || ((_coreVar._currPlace == DINING_ROOM) && (_num > 2)) || ((_coreVar._currPlace == BUREAU) && (_num == 7)) || ((_coreVar._currPlace == KITCHEN) && (_num == 6)) @@ -457,7 +457,7 @@ void MortevielleEngine::fctLook() { treg(147); if ((_coreVar._currPlace == GREEN_ROOM2) && (_num == 3)) treg(149); - if ((_coreVar._currPlace == ROOM9) && (_num == 2)) + if ((_coreVar._currPlace == JULIA_ROOM) && (_num == 2)) treg(30); if ((_coreVar._currPlace == DINING_ROOM) && (_num == 3)) treg(31); @@ -611,7 +611,7 @@ void MortevielleEngine::fctOpen() { ; if (_openObjects[i] != _num) { if (!( ((_num == 3) && ((_coreVar._currPlace == OWN_ROOM) - || (_coreVar._currPlace == ROOM9) + || (_coreVar._currPlace == JULIA_ROOM) || (_coreVar._currPlace == BLUE_ROOM) || (_coreVar._currPlace == BATHROOM))) || ((_num == 4) && ((_coreVar._currPlace == GREEN_ROOM) @@ -1134,7 +1134,7 @@ void MortevielleEngine::fctEnter() { showMoveMenuAlert(); else if (_roomDoorId == OWN_ROOM) _crep = 997; - else if ((_roomDoorId == ROOM9) && (_coreVar._selectedObjectId != 136)) { + else if ((_roomDoorId == JULIA_ROOM) && (_coreVar._selectedObjectId != 136)) { _crep = 189; _coreVar._availableQuestion[8] = '*'; } else { @@ -1155,7 +1155,7 @@ void MortevielleEngine::fctEnter() { _currMenu = MENU_DISCUSS; _currAction = (_menu._discussMenu[charIndex]._menuId << 8) | _menu._discussMenu[charIndex]._actionId; _syn = true; - if (_roomDoorId == ROOM9) { + if (_roomDoorId == JULIA_ROOM) { _col = true; _caff = 70; drawPictureWithText(); |