MORTEVIELLE: Rename ROOM9 into JULIA_ROOM

4 files changed, 25 insertions, 25 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();
diff --git a/engines/mortevielle/mortevielle.cpp b/engines/mortevielle/mortevielle.cpp
index 2d45923032..c481b7371b 100644
--- a/engines/mortevielle/mortevielle.cpp
+++ b/engines/mortevielle/mortevielle.cpp
@@ -74,7 +74,7 @@ MortevielleEngine::MortevielleEngine(OSystem *system, const ADGameDescription *g
 	_roomPresencePat = false;
 	_toiletsPresenceBobMax = false;
 	_bathRoomPresenceBobMax = false;
-	_room9PresenceLeo = false;
+	_juliaRoomPresenceLeo = false;
 
 	_soundOff = false;
 	_largestClearScreen = false;
diff --git a/engines/mortevielle/mortevielle.h b/engines/mortevielle/mortevielle.h
index fc5c7ad25e..37901bb1b3 100644
--- a/engines/mortevielle/mortevielle.h
+++ b/engines/mortevielle/mortevielle.h
@@ -138,7 +138,7 @@ const int kMaxPatt = 20;
 */
 enum Places {
 	OWN_ROOM = 0,     GREEN_ROOM = 1,   PURPLE_ROOM = 2,     TOILETS = 3,      DARKBLUE_ROOM = 4,
-	BLUE_ROOM = 5,    RED_ROOM = 6,     BATHROOM = 7,        GREEN_ROOM2 = 8,  ROOM9 = 9,
+	BLUE_ROOM = 5,    RED_ROOM = 6,     BATHROOM = 7,        GREEN_ROOM2 = 8,  JULIA_ROOM = 9,
 	DINING_ROOM = 10, BUREAU = 11,      KITCHEN = 12,        ATTIC = 13,       CELLAR = 14,
 	LANDING = 15,     CRYPT = 16,       SECRET_PASSAGE = 17, ROOM18 = 18,      MOUNTAIN = 19,
 	CHAPEL = 20,      MANOR_FRONT = 21, MANOR_BACK = 22,     INSIDE_WELL = 23, WELL = 24,
@@ -213,7 +213,7 @@ private:
 	bool _roomPresencePat;
 	bool _toiletsPresenceBobMax;
 	bool _bathRoomPresenceBobMax;
-	bool _room9PresenceLeo;
+	bool _juliaRoomPresenceLeo;
 	bool _hiddenHero;
 	bool _heroSearching;
 	bool _keyPressedEsc;
@@ -352,7 +352,7 @@ private:
 	void setRandomPresencePurpleRoom(int faithScore);
 	void setRandomPresenceBlueRoom(int faithScore);
 	void setRandomPresenceRedRoom(int faithScore);
-	void setRandomPresenceRoom9(int faithScore);
+	void setRandomPresenceJuliaRoom(int faithScore);
 	void setRandomPresenceDiningRoom(int faithScore);
 	void setRandomPresenceBureau(int faithScore);
 	void setRandomPresenceKitchen(int faithScore);
diff --git a/engines/mortevielle/utils.cpp b/engines/mortevielle/utils.cpp
index 9e72f81195..705237c4eb 100644
--- a/engines/mortevielle/utils.cpp
+++ b/engines/mortevielle/utils.cpp
@@ -492,8 +492,8 @@ void MortevielleEngine::resetPresenceInRooms(int roomId) {
 		_toiletsPresenceBobMax = false;
 	if (roomId != BATHROOM)
 		_bathRoomPresenceBobMax = false;
-	if (roomId != ROOM9)
-		_room9PresenceLeo = false;
+	if (roomId != JULIA_ROOM)
+		_juliaRoomPresenceLeo = false;
 }
 
 /**
@@ -870,7 +870,7 @@ void MortevielleEngine::setPresencePurpleRoom() {
 	if (_place == PURPLE_ROOM)
 		_purpleRoomPresenceLeo = true;
 	else
-		_room9PresenceLeo = true;
+		_juliaRoomPresenceLeo = true;
 
 	_currBitIndex = 10;
 }
@@ -976,7 +976,7 @@ int MortevielleEngine::setPresenceLanding() {
 	int rand = 0;
 	do {
 		rand = getRandomNumber(1, 8);
-		test = (((rand == 1) && (_purpleRoomPresenceLeo || _room9PresenceLeo)) ||
+		test = (((rand == 1) && (_purpleRoomPresenceLeo || _juliaRoomPresenceLeo)) ||
 		        ((rand == 2) && _roomPresencePat) ||
 		        ((rand == 3) && _roomPresenceGuy) ||
 		        ((rand == 4) && _roomPresenceEva) ||
@@ -1050,7 +1050,7 @@ int MortevielleEngine::getPresenceBitIndex(int roomId) {
 		if (_roomPresenceIda)
 			bitIndex = 2;  // IDA
 	} else if ( ((roomId == PURPLE_ROOM) && (_purpleRoomPresenceLeo))
-			 || ((roomId == ROOM9) && (_room9PresenceLeo)))
+			 || ((roomId == JULIA_ROOM) && (_juliaRoomPresenceLeo)))
 		bitIndex = 128;    // LEO
 	else if (roomId == DARKBLUE_ROOM) {
 		if (_roomPresenceGuy)
@@ -1152,8 +1152,8 @@ void MortevielleEngine::setRandomPresenceRedRoom(int faithScore) {
  * Engine function - Set Random Presence - Room 9
  * @remarks	Originally called 'pl9'
  */
-void MortevielleEngine::setRandomPresenceRoom9(int faithScore) {
-	if (!_room9PresenceLeo) {
+void MortevielleEngine::setRandomPresenceJuliaRoom(int faithScore) {
+	if (!_juliaRoomPresenceLeo) {
 		faithScore = -10;
 		if (getRandomNumber(1, 100) > faithScore) // always true?
 			displayAloneText();
@@ -2361,8 +2361,8 @@ void MortevielleEngine::prepareRoom() {
 			case GREEN_ROOM2:
 				setRandomPresenceRedRoom(_coreVar._faithScore);
 				break;
-			case ROOM9:
-				setRandomPresenceRoom9(_coreVar._faithScore);
+			case JULIA_ROOM:
+				setRandomPresenceJuliaRoom(_coreVar._faithScore);
 				break;
 			case DINING_ROOM:
 				setRandomPresenceDiningRoom(_coreVar._faithScore);
@@ -2816,7 +2816,7 @@ int MortevielleEngine::getPresenceStats(int &rand, int faithScore, int roomId) {
 	if ( ((roomId == GREEN_ROOM) && (!_roomPresenceLuc) && (!_roomPresenceIda))
 	  || ((roomId == DARKBLUE_ROOM) && (!_roomPresenceGuy) && (!_roomPresenceEva)) )
 		retVal = getPresenceStatsGreenRoom();
-	if ((roomId == PURPLE_ROOM) && (!_purpleRoomPresenceLeo) && (!_room9PresenceLeo))
+	if ((roomId == PURPLE_ROOM) && (!_purpleRoomPresenceLeo) && (!_juliaRoomPresenceLeo))
 		retVal = getPresenceStatsPurpleRoom();
 	if ( ((roomId == TOILETS) && (!_toiletsPresenceBobMax))
 	  || ((roomId == BATHROOM) && (!_bathRoomPresenceBobMax)) )
@@ -2826,10 +2826,10 @@ int MortevielleEngine::getPresenceStats(int &rand, int faithScore, int roomId) {
 	if ( ((roomId == RED_ROOM) && (!_roomPresenceBob))
 	  || ((roomId == GREEN_ROOM2) && (!_roomPresencePat)))
 		retVal = getPresenceStatsRedRoom();
-	if ((roomId == ROOM9) && (!_room9PresenceLeo) && (!_purpleRoomPresenceLeo))
+	if ((roomId == JULIA_ROOM) && (!_juliaRoomPresenceLeo) && (!_purpleRoomPresenceLeo))
 		retVal = 10;
-	if ( ((roomId == PURPLE_ROOM) && (_room9PresenceLeo))
-	  || ((roomId == ROOM9) && (_purpleRoomPresenceLeo)))
+	if ( ((roomId == PURPLE_ROOM) && (_juliaRoomPresenceLeo))
+	  || ((roomId == JULIA_ROOM) && (_purpleRoomPresenceLeo)))
 		retVal = -400;
 	if (retVal != -500) {
 		retVal += faithScore;
@@ -2869,8 +2869,8 @@ void MortevielleEngine::setPresenceFlags(int roomId) {
 		_bathRoomPresenceBobMax = true;
 	else if (roomId == GREEN_ROOM2)
 		_roomPresencePat = true;
-	else if (roomId == ROOM9)
-		_room9PresenceLeo = true;
+	else if (roomId == JULIA_ROOM)
+		_juliaRoomPresenceLeo = true;
 }
 
 /**
@@ -2907,7 +2907,7 @@ int MortevielleEngine::getPresence(int roomId) {
 			retVal = getPresenceBitIndex(_place);
 	}
 
-	if (roomId > ROOM9) {
+	if (roomId > JULIA_ROOM) {
 		if ((roomId > LANDING) && (roomId != CHAPEL) && (roomId != ROOM26))
 			displayAloneText();
 		else {