aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2016-04-09 21:00:26 -0400
committerPaul Gilbert2016-04-09 21:00:26 -0400
commitc8eb5a7734bae63572384d3b3972d904525ce254 (patch)
tree7f2e0b246747c27cd230215beeaac91f16c5a4b6
parentf7748622faa71729d12f3d0ec063417bdca60eb6 (diff)
downloadscummvm-rg350-c8eb5a7734bae63572384d3b3972d904525ce254.tar.gz
scummvm-rg350-c8eb5a7734bae63572384d3b3972d904525ce254.tar.bz2
scummvm-rg350-c8eb5a7734bae63572384d3b3972d904525ce254.zip
TITANIC: Fix setting object bounds when drawing
-rw-r--r--engines/titanic/core/game_object.cpp6
-rw-r--r--engines/titanic/true_talk/true_talk_manager.cpp4
2 files changed, 5 insertions, 5 deletions
diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp
index a7bbbd80cc..b2df9f6f54 100644
--- a/engines/titanic/core/game_object.cpp
+++ b/engines/titanic/core/game_object.cpp
@@ -178,10 +178,10 @@ void CGameObject::draw(CScreenManager *screenManager) {
}
if (_surface) {
- _bounds.right = _surface->getWidth();
- _bounds.bottom = _surface->getHeight();
+ _bounds.setWidth(_surface->getWidth());
+ _bounds.setHeight(_surface->getHeight());
- if (!_bounds.right || !_bounds.bottom)
+ if (!_bounds.width() || !_bounds.height())
return;
if (_frameNumber >= 0) {
diff --git a/engines/titanic/true_talk/true_talk_manager.cpp b/engines/titanic/true_talk/true_talk_manager.cpp
index 6f42346e3f..68818dbbef 100644
--- a/engines/titanic/true_talk/true_talk_manager.cpp
+++ b/engines/titanic/true_talk/true_talk_manager.cpp
@@ -183,11 +183,11 @@ void CTrueTalkManager::viewChange() {
}
void CTrueTalkManager::update1() {
- warning("CTrueTalkManager::update1");
+ //warning("CTrueTalkManager::update1");
}
void CTrueTalkManager::update2() {
- warning("CTrueTalkManager::update2");
+ //warning("CTrueTalkManager::update2");
}
} // End of namespace Titanic