libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-28 04:34:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TITANIC: CGameManager viewChange better named as roomChange

Browse Source
This commit is contained in:
Paul Gilbert 2017-06-11 16:19:54 -04:00
parent d272351055
commit 3be659b5c1
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/titanic/core/view_item.cpp
View File

@ -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);

2
engines/titanic/game_manager.cpp
View File

@ -256,7 +256,7 @@ void CGameManager::updateDiskTicksCount() {
_lastDiskTicksCount = g_vm->_events->getTicksCount();
}
void CGameManager::viewChange() {
void CGameManager::roomChange() {
delete _movie;
delete _movieSurface;

4
engines/titanic/game_manager.h
View File

@ -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

4
engines/titanic/support/files_manager.cpp
View File

@ -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;
}