From d19a831d290190ca37a42018c5590f28b4fae746 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Mon, 26 Oct 2009 10:40:35 +0000
Subject: TINSEL: Move ExtractActor from scn.* to play.*

svn-id: r45399
---
 engines/tinsel/play.cpp | 10 ++++++++++
 engines/tinsel/play.h   |  2 ++
 engines/tinsel/scn.cpp  | 10 ----------
 engines/tinsel/scn.h    |  1 -
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/engines/tinsel/play.cpp b/engines/tinsel/play.cpp
index b5967efa37..fd086dbcb0 100644
--- a/engines/tinsel/play.cpp
+++ b/engines/tinsel/play.cpp
@@ -1169,4 +1169,14 @@ void RestoreActorReels(SCNHANDLE hFilm, int actor, int x, int y) {
 	}
 }
 
+/**
+ * Get the actor id from a film (column 0)
+ */
+int ExtractActor(SCNHANDLE hFilm) {
+	const FILM *pFilm = (const FILM *)LockMem(hFilm);
+	const FREEL *pReel = &pFilm->reels[0];
+	const MULTI_INIT *pmi = (const MULTI_INIT *)LockMem(FROM_LE_32(pReel->mobj));
+	return (int)FROM_LE_32(pmi->mulID);
+}
+
 } // End of namespace Tinsel
diff --git a/engines/tinsel/play.h b/engines/tinsel/play.h
index 7ac166f26a..aa622e835e 100644
--- a/engines/tinsel/play.h
+++ b/engines/tinsel/play.h
@@ -59,6 +59,8 @@ void NoSoundReels(void);
 void SaveSoundReels(PSOUNDREELS psr);
 void RestoreSoundReels(PSOUNDREELS psr);
 
+int ExtractActor(SCNHANDLE hFilm);
+
 } // End of namespace Tinsel
 
 #endif
diff --git a/engines/tinsel/scn.cpp b/engines/tinsel/scn.cpp
index 6672b35b27..0c89819ca0 100644
--- a/engines/tinsel/scn.cpp
+++ b/engines/tinsel/scn.cpp
@@ -72,14 +72,4 @@ byte *FindChunk(SCNHANDLE handle, uint32 chunk) {
 	}
 }
 
-/**
- * Get the actor id from a film (column 0)
- */
-int ExtractActor(SCNHANDLE hFilm) {
-	const FILM *pFilm = (const FILM *)LockMem(hFilm);
-	const FREEL *pReel = &pFilm->reels[0];
-	const MULTI_INIT *pmi = (const MULTI_INIT *)LockMem(FROM_LE_32(pReel->mobj));
-	return (int)FROM_LE_32(pmi->mulID);
-}
-
 } // End of namespace Tinsel
diff --git a/engines/tinsel/scn.h b/engines/tinsel/scn.h
index e48f890dcd..c9cafd9eea 100644
--- a/engines/tinsel/scn.h
+++ b/engines/tinsel/scn.h
@@ -80,7 +80,6 @@ namespace Tinsel {
 #define CHUNK_GRAB_NAME			0x33340100L
 
 byte *FindChunk(SCNHANDLE handle, uint32 chunk);
-int ExtractActor(SCNHANDLE hFilm);
 
 } // End of namespace Tinsel
 
-- 
cgit v1.2.3