From ca41dba220eceb2f2cca43126ee91ef9c86bae95 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Fri, 8 Oct 2004 23:06:19 +0000
Subject: Use image header to detect presence of the V8 flags field; rewrote
 that flags field to load the ObjectData.flags field differently; added a
 comment in saveload.cpp since we are not yet saving ObjectData.flags

svn-id: r15479
---
 scumm/object.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'scumm/object.h')

diff --git a/scumm/object.h b/scumm/object.h
index cbd92cf428..627e54609d 100644
--- a/scumm/object.h
+++ b/scumm/object.h
@@ -37,7 +37,7 @@ struct ObjectData {
 	byte parentstate;
 	byte state;
 	byte fl_object_index;
-	byte flag;
+	byte flags;
 };
 
 #if !defined(__GNUC__)
@@ -105,7 +105,7 @@ struct ImageHeader { /* file format */
 			uint16 obj_id;
 			uint16 image_count;
 			uint16 unk[1];
-			byte flag;
+			byte flags;
 			byte unk1;
 			uint16 unk2[2];
 			uint16 width;
@@ -140,7 +140,7 @@ struct ImageHeader { /* file format */
 			uint32 width;
 			uint32 height;
 			uint32 actordir;
-			uint32 flag;	// This field is missing in the COMI demo (version == 800) !
+			uint32 flags;	// This field is missing in the COMI demo (version == 800) !
 			struct {
 				int32 x, y;
 			} GCC_PACK hotspot[15];
-- 
cgit v1.2.3