TINSEL: Cleanup

svn-id: r45398

8 files changed, 11 insertions, 25 deletions

diff --git a/engines/tinsel/bmv.cpp b/engines/tinsel/bmv.cpp
index da89a1fe4e..23a9370018 100644
--- a/engines/tinsel/bmv.cpp
+++ b/engines/tinsel/bmv.cpp
@@ -47,6 +47,8 @@ namespace Tinsel {
 
 //----------------- LOCAL DEFINES ----------------------------
 
+#define BMOVIE_EXTENSION	".bmv"
+
 #define SZ_C_BLOB	65
 #define SZ_U_BLOB	128
 
diff --git a/engines/tinsel/dialogs.cpp b/engines/tinsel/dialogs.cpp
index 2bb3de9f39..df508aaa24 100644
--- a/engines/tinsel/dialogs.cpp
+++ b/engines/tinsel/dialogs.cpp
@@ -50,6 +50,7 @@
 #include "tinsel/polygons.h"
 #include "tinsel/savescn.h"
 #include "tinsel/sched.h"
+#include "tinsel/scn.h"
 #include "common/serializer.h"
 #include "tinsel/sound.h"
 #include "tinsel/strres.h"
@@ -83,6 +84,8 @@ extern void EnablePointing(void);
 
 //----------------- LOCAL DEFINES --------------------
 
+#define HOPPER_FILENAME		"hopper"
+
 #define INV_PICKUP	PLR_SLEFT		// Local names
 #define INV_LOOK	PLR_SRIGHT		//	for button events
 #define INV_ACTION	PLR_DLEFT		//
diff --git a/engines/tinsel/handle.cpp b/engines/tinsel/handle.cpp
index 4ec398fa40..cdccf9027f 100644
--- a/engines/tinsel/handle.cpp
+++ b/engines/tinsel/handle.cpp
@@ -30,19 +30,9 @@
 
 #include "tinsel/drives.h"
 #include "tinsel/dw.h"
-#include "tinsel/scn.h"			// name of "index" file
 #include "tinsel/handle.h"
 #include "tinsel/heapmem.h"			// heap memory manager
-
-
-// these are included only so the relevant structs can be used in convertLEStructToNative()
-#include "tinsel/anim.h"
-#include "tinsel/multiobj.h"
-#include "tinsel/film.h"
-#include "tinsel/object.h"
-#include "tinsel/palette.h"
-#include "tinsel/text.h"
-#include "tinsel/timers.h"
+#include "tinsel/timers.h"	// for DwGetCurrentTime()
 #include "tinsel/tinsel.h"
 #include "tinsel/scene.h"
 
diff --git a/engines/tinsel/heapmem.cpp b/engines/tinsel/heapmem.cpp
index edd012e760..8a5d351381 100644
--- a/engines/tinsel/heapmem.cpp
+++ b/engines/tinsel/heapmem.cpp
@@ -34,7 +34,7 @@ namespace Tinsel {
 // Currently this is set at 5MB for the DW1 demo and DW1 and 10MB for DW2
 // This could probably be reduced somewhat
 // If the memory is not enough, the engine throws an "Out of memory" error in handle.cpp inside LockMem()
-uint32 MemoryPoolSize[3] = {5 * 1024 * 1024, 5 * 1024 * 1024, 10 * 1024 * 1024};
+static const uint32 MemoryPoolSize[3] = {5 * 1024 * 1024, 5 * 1024 * 1024, 10 * 1024 * 1024};
 
 // list of all memory nodes
 MEM_NODE mnodeList[NUM_MNODES];
diff --git a/engines/tinsel/pcode.cpp b/engines/tinsel/pcode.cpp
index 63806a4d30..aa8d4c1442 100644
--- a/engines/tinsel/pcode.cpp
+++ b/engines/tinsel/pcode.cpp
@@ -46,6 +46,8 @@ extern int CallLibraryRoutine(CORO_PARAM, int operand, int32 *pp, const INT_CONT
 
 //----------------- LOCAL DEFINES --------------------
 
+#define	GLOBALS_FILENAME	"gdata"		// name of globals file
+
 /** list of all opcodes */
 enum OPCODE {
 	OP_HALT = 0,	///< end of program
diff --git a/engines/tinsel/scn.h b/engines/tinsel/scn.h
index 6c57a595f8..e48f890dcd 100644
--- a/engines/tinsel/scn.h
+++ b/engines/tinsel/scn.h
@@ -30,16 +30,6 @@
 
 namespace Tinsel {
 
-#define	INDEX_FILENAME		"index"		// name of scene index file
-#define PSX_INDEX_FILENAME	"index.dat" // name of scene index in psx version
-#define	INDEXFILE_LENGTH	12			// length of filenames in the MEMHANDLE structure
-
-#define	GLOBALS_FILENAME	"gdata"		// name of globals file
-#define HOPPER_FILENAME		"hopper"
-#define CD_ID_FILENAME		"volume"
-
-#define BMOVIE_EXTENSION	".bmv"
-
 // chunk identifier numbers
 
 // V2 chunks
@@ -89,8 +79,6 @@ namespace Tinsel {
 // This is a base, subsequent numbers may also get used
 #define CHUNK_GRAB_NAME			0x33340100L
 
-#define	INDEX_FILENAME		"index"	// name of index file
-
 byte *FindChunk(SCNHANDLE handle, uint32 chunk);
 int ExtractActor(SCNHANDLE hFilm);
 
diff --git a/engines/tinsel/strres.cpp b/engines/tinsel/strres.cpp
index 2e9bade209..532bc9267f 100644
--- a/engines/tinsel/strres.cpp
+++ b/engines/tinsel/strres.cpp
@@ -28,6 +28,7 @@
 #include "tinsel/drives.h"
 #include "tinsel/sound.h"
 #include "tinsel/strres.h"
+#include "tinsel/scn.h"
 #include "common/file.h"
 #include "common/endian.h"
 
diff --git a/engines/tinsel/strres.h b/engines/tinsel/strres.h
index 1c8e8f56cd..baaa498a82 100644
--- a/engines/tinsel/strres.h
+++ b/engines/tinsel/strres.h
@@ -28,7 +28,7 @@
 #define TINSEL_STRRES_H
 
 #include "common/scummsys.h"
-#include "tinsel/scn.h"
+#include "tinsel/dw.h"
 
 namespace Tinsel {