[Scummvm-cvs-logs] SF.net SVN: scummvm:[45399] scummvm/trunk/engines/tinsel

[fingolfin at users.sourceforge.net]

Revision: 45399
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45399&view=rev
Author:   fingolfin
Date:     2009-10-26 10:40:35 +0000 (Mon, 26 Oct 2009)

Log Message:
-----------
TINSEL: Move ExtractActor from scn.* to play.*

Modified Paths:
--------------
    scummvm/trunk/engines/tinsel/play.cpp
    scummvm/trunk/engines/tinsel/play.h
    scummvm/trunk/engines/tinsel/scn.cpp
    scummvm/trunk/engines/tinsel/scn.h

Modified: scummvm/trunk/engines/tinsel/play.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/play.cpp	2009-10-26 10:40:16 UTC (rev 45398)
+++ scummvm/trunk/engines/tinsel/play.cpp	2009-10-26 10:40:35 UTC (rev 45399)
@@ -1169,4 +1169,14 @@
 	}
 }
 
+/**
+ * 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

Modified: scummvm/trunk/engines/tinsel/play.h
===================================================================
--- scummvm/trunk/engines/tinsel/play.h	2009-10-26 10:40:16 UTC (rev 45398)
+++ scummvm/trunk/engines/tinsel/play.h	2009-10-26 10:40:35 UTC (rev 45399)
@@ -59,6 +59,8 @@
 void SaveSoundReels(PSOUNDREELS psr);
 void RestoreSoundReels(PSOUNDREELS psr);
 
+int ExtractActor(SCNHANDLE hFilm);
+
 } // End of namespace Tinsel
 
 #endif

Modified: scummvm/trunk/engines/tinsel/scn.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/scn.cpp	2009-10-26 10:40:16 UTC (rev 45398)
+++ scummvm/trunk/engines/tinsel/scn.cpp	2009-10-26 10:40:35 UTC (rev 45399)
@@ -72,14 +72,4 @@
 	}
 }
 
-/**
- * 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

Modified: scummvm/trunk/engines/tinsel/scn.h
===================================================================
--- scummvm/trunk/engines/tinsel/scn.h	2009-10-26 10:40:16 UTC (rev 45398)
+++ scummvm/trunk/engines/tinsel/scn.h	2009-10-26 10:40:35 UTC (rev 45399)
@@ -80,7 +80,6 @@
 #define CHUNK_GRAB_NAME			0x33340100L
 
 byte *FindChunk(SCNHANDLE handle, uint32 chunk);
-int ExtractActor(SCNHANDLE hFilm);
 
 } // End of namespace Tinsel
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.