aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
Diffstat (limited to 'engines')
-rw-r--r--engines/titanic/core/tree_item.cpp2
-rw-r--r--engines/titanic/game_location.cpp4
-rw-r--r--engines/titanic/main_game_window.cpp3
3 files changed, 3 insertions, 6 deletions
diff --git a/engines/titanic/core/tree_item.cpp b/engines/titanic/core/tree_item.cpp
index cda3ca4b2f..b476777d90 100644
--- a/engines/titanic/core/tree_item.cpp
+++ b/engines/titanic/core/tree_item.cpp
@@ -169,7 +169,7 @@ CTreeItem *CTreeItem::findNextInstanceOf(ClassDef *classDef, CTreeItem *startIte
void CTreeItem::addUnder(CTreeItem *newParent) {
if (newParent->_firstChild)
- addSibling(newParent->getLastSibling());
+ addSibling(newParent->_firstChild->getLastSibling());
else
setParent(newParent);
}
diff --git a/engines/titanic/game_location.cpp b/engines/titanic/game_location.cpp
index cd4481ed31..5f87d3bc67 100644
--- a/engines/titanic/game_location.cpp
+++ b/engines/titanic/game_location.cpp
@@ -74,8 +74,8 @@ CViewItem *CGameLocation::getView() {
_view = nullptr;
} else {
_viewNumber = _view->_viewNumber;
- _nodeNumber = getNode()->_nodeNumber;
- _roomNumber = getRoom()->_roomNumber;
+ _nodeNumber = _view->findNode()->_nodeNumber;
+ _roomNumber = _view->findRoom()->_roomNumber;
}
return _view;
diff --git a/engines/titanic/main_game_window.cpp b/engines/titanic/main_game_window.cpp
index 18b033f1c9..01996e6b13 100644
--- a/engines/titanic/main_game_window.cpp
+++ b/engines/titanic/main_game_window.cpp
@@ -67,9 +67,6 @@ void CMainGameWindow::applicationStarting() {
_project->loadGame(saveSlot);
// TODO: Cursor/image
- //***DEBUG****
- _project->dump(0);
- return;
// Generate starting messages
CViewItem *view = _gameManager->_gameState._gameLocation.getView();