aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorPaul Gilbert2017-06-11 16:19:54 -0400
committerPaul Gilbert2017-06-11 16:19:54 -0400
commit3be659b5c1de5273857a19e65d27d89b81ff8601 (patch)
tree7d6d81869e95052a8b8339041e8220d938f6a620 /engines
parentd272351055717fa57eab885ba89d6d637e6975ad (diff)
downloadscummvm-rg350-3be659b5c1de5273857a19e65d27d89b81ff8601.tar.gz
scummvm-rg350-3be659b5c1de5273857a19e65d27d89b81ff8601.tar.bz2
scummvm-rg350-3be659b5c1de5273857a19e65d27d89b81ff8601.zip
TITANIC: CGameManager viewChange better named as roomChange
Diffstat (limited to 'engines')
-rw-r--r--engines/titanic/core/view_item.cpp2
-rw-r--r--engines/titanic/game_manager.cpp2
-rw-r--r--engines/titanic/game_manager.h4
-rw-r--r--engines/titanic/support/files_manager.cpp4
4 files changed, 6 insertions, 6 deletions
diff --git a/engines/titanic/core/view_item.cpp b/engines/titanic/core/view_item.cpp
index 15797438cb..d0f5c8a549 100644
--- a/engines/titanic/core/view_item.cpp
+++ b/engines/titanic/core/view_item.cpp
@@ -102,7 +102,7 @@ void CViewItem::leaveView(CViewItem *newView) {
if (newRoom != oldRoom) {
CGameManager *gm = getGameManager();
if (gm)
- gm->viewChange();
+ gm->roomChange();
CLeaveRoomMsg roomMsg(oldRoom, newRoom);
roomMsg.execute(oldRoom, nullptr, MSGFLAG_SCAN);
diff --git a/engines/titanic/game_manager.cpp b/engines/titanic/game_manager.cpp
index da6048a663..040442a8b0 100644
--- a/engines/titanic/game_manager.cpp
+++ b/engines/titanic/game_manager.cpp
@@ -256,7 +256,7 @@ void CGameManager::updateDiskTicksCount() {
_lastDiskTicksCount = g_vm->_events->getTicksCount();
}
-void CGameManager::viewChange() {
+void CGameManager::roomChange() {
delete _movie;
delete _movieSurface;
diff --git a/engines/titanic/game_manager.h b/engines/titanic/game_manager.h
index 9c533cf6ac..0d740f6d75 100644
--- a/engines/titanic/game_manager.h
+++ b/engines/titanic/game_manager.h
@@ -157,9 +157,9 @@ public:
void update();
/**
- * Called when the view changes
+ * Called when the room changes
*/
- void viewChange();
+ void roomChange();
/**
* Returns true if no transition is currently in progress
diff --git a/engines/titanic/support/files_manager.cpp b/engines/titanic/support/files_manager.cpp
index cf706974a7..8fd5107ada 100644
--- a/engines/titanic/support/files_manager.cpp
+++ b/engines/titanic/support/files_manager.cpp
@@ -92,10 +92,10 @@ bool CFilesManager::scanForFile(const CString &name) {
if (fileExists(fname))
return true;
- // Couldn't find file. Start by calling the game manager's viewChange
+ // Couldn't find file. Start by calling the game manager's roomChange
// method, which handles all active scene objects freeing their resources
if (_gameManager)
- _gameManager->viewChange();
+ _gameManager->roomChange();
return false;
}