[Scummvm-cvs-logs] SF.net SVN: scummvm:[45398] scummvm/trunk/engines/tinsel
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Mon Oct 26 11:40:17 CET 2009
Revision: 45398
http://scummvm.svn.sourceforge.net/scummvm/?rev=45398&view=rev
Author: fingolfin
Date: 2009-10-26 10:40:16 +0000 (Mon, 26 Oct 2009)
Log Message:
-----------
TINSEL: Cleanup
Modified Paths:
--------------
scummvm/trunk/engines/tinsel/bmv.cpp
scummvm/trunk/engines/tinsel/dialogs.cpp
scummvm/trunk/engines/tinsel/handle.cpp
scummvm/trunk/engines/tinsel/heapmem.cpp
scummvm/trunk/engines/tinsel/pcode.cpp
scummvm/trunk/engines/tinsel/scn.h
scummvm/trunk/engines/tinsel/strres.cpp
scummvm/trunk/engines/tinsel/strres.h
Modified: scummvm/trunk/engines/tinsel/bmv.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/bmv.cpp 2009-10-26 10:39:51 UTC (rev 45397)
+++ scummvm/trunk/engines/tinsel/bmv.cpp 2009-10-26 10:40:16 UTC (rev 45398)
@@ -47,6 +47,8 @@
//----------------- LOCAL DEFINES ----------------------------
+#define BMOVIE_EXTENSION ".bmv"
+
#define SZ_C_BLOB 65
#define SZ_U_BLOB 128
Modified: scummvm/trunk/engines/tinsel/dialogs.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/dialogs.cpp 2009-10-26 10:39:51 UTC (rev 45397)
+++ scummvm/trunk/engines/tinsel/dialogs.cpp 2009-10-26 10:40:16 UTC (rev 45398)
@@ -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 @@
//----------------- 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 //
Modified: scummvm/trunk/engines/tinsel/handle.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/handle.cpp 2009-10-26 10:39:51 UTC (rev 45397)
+++ scummvm/trunk/engines/tinsel/handle.cpp 2009-10-26 10:40:16 UTC (rev 45398)
@@ -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"
Modified: scummvm/trunk/engines/tinsel/heapmem.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/heapmem.cpp 2009-10-26 10:39:51 UTC (rev 45397)
+++ scummvm/trunk/engines/tinsel/heapmem.cpp 2009-10-26 10:40:16 UTC (rev 45398)
@@ -34,7 +34,7 @@
// 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];
Modified: scummvm/trunk/engines/tinsel/pcode.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/pcode.cpp 2009-10-26 10:39:51 UTC (rev 45397)
+++ scummvm/trunk/engines/tinsel/pcode.cpp 2009-10-26 10:40:16 UTC (rev 45398)
@@ -46,6 +46,8 @@
//----------------- LOCAL DEFINES --------------------
+#define GLOBALS_FILENAME "gdata" // name of globals file
+
/** list of all opcodes */
enum OPCODE {
OP_HALT = 0, ///< end of program
Modified: scummvm/trunk/engines/tinsel/scn.h
===================================================================
--- scummvm/trunk/engines/tinsel/scn.h 2009-10-26 10:39:51 UTC (rev 45397)
+++ scummvm/trunk/engines/tinsel/scn.h 2009-10-26 10:40:16 UTC (rev 45398)
@@ -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 @@
// 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);
Modified: scummvm/trunk/engines/tinsel/strres.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/strres.cpp 2009-10-26 10:39:51 UTC (rev 45397)
+++ scummvm/trunk/engines/tinsel/strres.cpp 2009-10-26 10:40:16 UTC (rev 45398)
@@ -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"
Modified: scummvm/trunk/engines/tinsel/strres.h
===================================================================
--- scummvm/trunk/engines/tinsel/strres.h 2009-10-26 10:39:51 UTC (rev 45397)
+++ scummvm/trunk/engines/tinsel/strres.h 2009-10-26 10:40:16 UTC (rev 45398)
@@ -28,7 +28,7 @@
#define TINSEL_STRRES_H
#include "common/scummsys.h"
-#include "tinsel/scn.h"
+#include "tinsel/dw.h"
namespace Tinsel {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list