TITANIC: Television video is now playing

2 files changed, 9 insertions, 2 deletions

diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp
index feeabdb5dc..cdc2db68df 100644
--- a/engines/titanic/core/game_object.cpp
+++ b/engines/titanic/core/game_object.cpp
@@ -364,7 +364,7 @@ void CGameObject::fn1(int val1, int val2, int val3) {
 		if (movie)
 			movie->_gameObject = this;
 
-		_surface->proc34(val1, val2, val3, val3 != 0);
+		_surface->playMovie(val1, val2, val3, val3 != 0);
 
 		if (val3 & 0x10)
 			getGameManager()->_gameState.addMovie(_surface->_movie);
@@ -380,8 +380,13 @@ void CGameObject::changeStatus(int newStatus) {
 
 	CVideoSurface *surface = (newStatus & 4) ? _surface : nullptr;
 	if (_surface) {
-		_surface->proc32(newStatus, surface);
+		_surface->playMovie(newStatus, surface);
 		
+		// TODO: Figure out where to do this legitimately
+		OSMovie *movie = static_cast<OSMovie *>(_surface->_movie);
+		if (movie)
+			movie->_gameObject = this;
+
 		if (newStatus & 0x10) {
 			getGameManager()->_gameState.addMovie(_surface->_movie);
 		}
diff --git a/engines/titanic/core/game_object.h b/engines/titanic/core/game_object.h
index 108650958b..0ea67a132b 100644
--- a/engines/titanic/core/game_object.h
+++ b/engines/titanic/core/game_object.h
@@ -34,8 +34,10 @@ namespace Titanic {
 
 class CVideoSurface;
 class CMouseDragStartMsg;
+class OSMovie;
 
 class CGameObject : public CNamedItem {
+	friend class OSMovie;
 	DECLARE_MESSAGE_MAP
 public:
 	static void *_v1;