[Scummvm-git-logs] scummvm master -> 6930f2b648849ad2e00d25f1397cc9c3bba34045
dreammaster
dreammaster at scummvm.org
Sun Jun 11 23:06:56 CEST 2017
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:
6930f2b648 TITANIC: Rename viewChange to freeSurface
Commit: 6930f2b648849ad2e00d25f1397cc9c3bba34045
https://github.com/scummvm/scummvm/commit/6930f2b648849ad2e00d25f1397cc9c3bba34045
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-06-11T17:06:46-04:00
Commit Message:
TITANIC: Rename viewChange to freeSurface
Changed paths:
engines/titanic/core/game_object.cpp
engines/titanic/core/game_object.h
engines/titanic/core/tree_item.h
engines/titanic/game_manager.cpp
diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp
index f99e2cc..b4079f1 100644
--- a/engines/titanic/core/game_object.cpp
+++ b/engines/titanic/core/game_object.cpp
@@ -248,7 +248,7 @@ Rect CGameObject::getBounds() const {
return (_surface && _surface->hasFrame()) ? _bounds : Rect();
}
-void CGameObject::viewChange() {
+void CGameObject::freeSurface() {
// Handle freeing the surfaces of objects when their view is left
if (_surface) {
_resource = _surface->_resourceKey.getString();
diff --git a/engines/titanic/core/game_object.h b/engines/titanic/core/game_object.h
index 08f53f3..34bdcc7 100644
--- a/engines/titanic/core/game_object.h
+++ b/engines/titanic/core/game_object.h
@@ -576,9 +576,9 @@ public:
virtual Rect getBounds() const;
/**
- * Called when the view changes
+ * Free up any surface the object used
*/
- virtual void viewChange();
+ virtual void freeSurface();
/**
* Allows the item to draw itself
diff --git a/engines/titanic/core/tree_item.h b/engines/titanic/core/tree_item.h
index 498d2da4..8509e7d 100644
--- a/engines/titanic/core/tree_item.h
+++ b/engines/titanic/core/tree_item.h
@@ -155,9 +155,9 @@ public:
virtual Rect getBounds() const { return Rect(); }
/**
- * Called when the view changes
+ * Free up any surface the object used
*/
- virtual void viewChange() {}
+ virtual void freeSurface() {}
/**
* Get the parent for the given item
diff --git a/engines/titanic/game_manager.cpp b/engines/titanic/game_manager.cpp
index 040442a..ed6f56d 100644
--- a/engines/titanic/game_manager.cpp
+++ b/engines/titanic/game_manager.cpp
@@ -265,7 +265,7 @@ void CGameManager::roomChange() {
_trueTalkManager.clear();
for (CTreeItem *treeItem = _project; treeItem; treeItem = treeItem->scan(_project))
- treeItem->viewChange();
+ treeItem->freeSurface();
markAllDirty();
}
More information about the Scummvm-git-logs
mailing list