[Scummvm-git-logs] scummvm master -> f14146e3df2c1a926311bcc38e917b79878cb3a8

[dreammaster]

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:
f14146e3df TITANIC: Fix initial display of computer screen


Commit: f14146e3df2c1a926311bcc38e917b79878cb3a8
    https://github.com/scummvm/scummvm/commit/f14146e3df2c1a926311bcc38e917b79878cb3a8
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-10-04T20:58:59-04:00

Commit Message:
TITANIC: Fix initial display of computer screen

Changed paths:
    engines/titanic/core/game_object.cpp



diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp
index 302696a..2e3132c 100644
--- a/engines/titanic/core/game_object.cpp
+++ b/engines/titanic/core/game_object.cpp
@@ -402,7 +402,8 @@ void CGameObject::loadImage(const CString &name, bool pendingFlag) {
 }
 
 void CGameObject::loadFrame(int frameNumber) {
-	if (frameNumber != -1 && !_resource.empty())
+	_frameNumber = -1;
+	if (!_resource.empty())
 		loadResource(_resource);
 	
 	if (_surface)