[Scummvm-git-logs] scummvm master -> a90a4c8bc2ff350d69dc43f99c880d493efeb211

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
a90a4c8bc2 TITANIC: Fix leaving 2nd class suites


Commit: a90a4c8bc2ff350d69dc43f99c880d493efeb211
    https://github.com/scummvm/scummvm/commit/a90a4c8bc2ff350d69dc43f99c880d493efeb211
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-12-08T20:03:28-05:00

Commit Message:
TITANIC: Fix leaving 2nd class suites

Changed paths:
    engines/titanic/core/game_object.cpp
    engines/titanic/moves/enter_sec_class_state.cpp


diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp
index 3a5f656..48cc520 100644
--- a/engines/titanic/core/game_object.cpp
+++ b/engines/titanic/core/game_object.cpp
@@ -867,10 +867,10 @@ CViewItem *CGameObject::parseView(const CString &viewString) {
 
 	// Ensure we have the specified room
 	if (project) {
-		if (room->getName() != roomName) {
+		if (room->getName().compareToIgnoreCase(roomName)) {
 			// Scan for the correct room
 			for (room = project->findFirstRoom();
-					room && room->getName() != roomName;
+					room && room->getName().compareToIgnoreCase(roomName);
 					room = project->findNextRoom(room)) ;
 		}
 	}
@@ -879,13 +879,13 @@ CViewItem *CGameObject::parseView(const CString &viewString) {
 
 	// Find the designated node within the room
 	CNodeItem *node = dynamic_cast<CNodeItem *>(room->findChildInstanceOf(CNodeItem::_type));
-	while (node && node->getName() != nodeName)
+	while (node && node->getName().compareToIgnoreCase(nodeName))
 		node = dynamic_cast<CNodeItem *>(room->findNextInstanceOf(CNodeItem::_type, node));
 	if (!node)
 		return nullptr;
 
 	CViewItem *view = dynamic_cast<CViewItem *>(node->findChildInstanceOf(CViewItem::_type));
-	while (view && view->getName() != viewName)
+	while (view && view->getName().compareToIgnoreCase(viewName))
 		view = dynamic_cast<CViewItem *>(node->findNextInstanceOf(CViewItem::_type, view));
 	if (!view)
 		return nullptr;
diff --git a/engines/titanic/moves/enter_sec_class_state.cpp b/engines/titanic/moves/enter_sec_class_state.cpp
index 853a00d..af2bc4a 100644
--- a/engines/titanic/moves/enter_sec_class_state.cpp
+++ b/engines/titanic/moves/enter_sec_class_state.cpp
@@ -52,7 +52,7 @@ bool CEnterSecClassState::MouseButtonDownMsg(CMouseButtonDownMsg *msg) {
 		playSound("b#105.wav");
 		petDisplayMessage(1, CLASS_NOT_PERMITTED_IN_AREA);
 	} else if (!compareRoomNameTo("SecClassLittleLift") || _mode == 2)  {
-		CActMsg actMsg(getFullViewName().deleteRight(3) + ".S");
+		CActMsg actMsg(getFullViewName().deleteRight(2) + ".S");
 		actMsg.execute("SecClassRoomLeaver");
 		changeView("secClassState.Node 01.N");
 	}