aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/core
diff options
context:
space:
mode:
authorPaul Gilbert2016-07-23 21:50:51 -0400
committerPaul Gilbert2016-07-23 21:50:51 -0400
commitf1344c2c277125e652092b94a0a5347f842c45d0 (patch)
tree6424d8afb5a45ea0ba9a940d9f12ffb7f337ce5e /engines/titanic/core
parent2efee2ae8c1c4e285fe81bce66a594d9b949548a (diff)
downloadscummvm-rg350-f1344c2c277125e652092b94a0a5347f842c45d0.tar.gz
scummvm-rg350-f1344c2c277125e652092b94a0a5347f842c45d0.tar.bz2
scummvm-rg350-f1344c2c277125e652092b94a0a5347f842c45d0.zip
TITANIC: Added CCreditText loading
Diffstat (limited to 'engines/titanic/core')
-rw-r--r--engines/titanic/core/game_object.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp
index d33a0c928b..af4ffab1e3 100644
--- a/engines/titanic/core/game_object.cpp
+++ b/engines/titanic/core/game_object.cpp
@@ -193,8 +193,11 @@ void CGameObject::load(SimpleFile *file) {
void CGameObject::draw(CScreenManager *screenManager) {
if (!_visible)
return;
- if (_credits) {
- error("TODO: Block in CGameObject::draw");
+ if (_credits && _credits->_objectP == this) {
+ if (!_credits->draw())
+ CGameObject::deinit();
+
+ return;
}
if (_field40) {