From af945ac7881ae7e414f004bd0e99e8c3b5d76be9 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 1 Dec 2008 20:35:36 +0000
Subject: Merged the tinsel 2 engine with tinsel 1. Both Discworld 1 and
 Discworld 2 should be completable

svn-id: r35196
---
 engines/tinsel/object.h | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'engines/tinsel/object.h')

diff --git a/engines/tinsel/object.h b/engines/tinsel/object.h
index 8b61571a3e..f77c113482 100644
--- a/engines/tinsel/object.h
+++ b/engines/tinsel/object.h
@@ -51,21 +51,24 @@ enum {
 	DMA_ABS		= 0x0100,	//!< position of object is absolute
 	DMA_CHANGED	= 0x0200,	//!< object has changed in some way since the last frame
 	DMA_USERDEF	= 0x0400,	//!< user defined flags start here
+	DMA_GHOST	= 0x0080,
+
 
 	/** flags that effect an objects appearance */
 	DMA_HARDFLAGS	= (DMA_WNZ | DMA_CNZ | DMA_CONST | DMA_WA | DMA_FLIPH | DMA_FLIPV | DMA_TRANS)
 };
 
 /** structure for image */
+#include "common/pack-start.h"	// START STRUCT PACKING
 struct IMAGE {
 	short imgWidth;		//!< image width
-	short imgHeight;	//!< image height
+	unsigned short imgHeight;	//!< image height
 	short anioffX;		//!< image x animation offset
 	short anioffY;		//!< image y animation offset
 	SCNHANDLE hImgBits;	//!< image bitmap handle
 	SCNHANDLE hImgPal;	//!< image palette handle
-};
-
+} PACKED_STRUCT;
+#include "common/pack-end.h"	// END STRUCT PACKING
 
 /** a multi-object animation frame is a list of multi-image handles */
 typedef uint32 FRAME;
@@ -93,6 +96,7 @@ struct OBJECT {
 	SCNHANDLE hMirror;	//!< objects previous animation frame
 	int oid;			//!< object identifier
 };
+typedef OBJECT *POBJECT;
 
 #include "common/pack-start.h"	// START STRUCT PACKING
 
-- 
cgit v1.2.3