From c8eb5a7734bae63572384d3b3972d904525ce254 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sat, 9 Apr 2016 21:00:26 -0400 Subject: TITANIC: Fix setting object bounds when drawing --- engines/titanic/core/game_object.cpp | 6 +++--- engines/titanic/true_talk/true_talk_manager.cpp | 4 ++-- 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 -- cgit v1.2.3