[Scummvm-cvs-logs] SF.net SVN: scummvm: [29685] scummvm/trunk/tools/create_lure

[dreammaster at users.sourceforge.net]

Revision: 29685
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29685&view=rev
Author:   dreammaster
Date:     2007-12-01 17:13:31 -0800 (Sat, 01 Dec 2007)

Log Message:
-----------
Reworked the RoomResource structure to make the game easier to compile on PalmOS

Modified Paths:
--------------
    scummvm/trunk/tools/create_lure/create_lure_dat.cpp
    scummvm/trunk/tools/create_lure/create_lure_dat.h

Modified: scummvm/trunk/tools/create_lure/create_lure_dat.cpp
===================================================================
--- scummvm/trunk/tools/create_lure/create_lure_dat.cpp	2007-12-01 23:57:22 UTC (rev 29684)
+++ scummvm/trunk/tools/create_lure/create_lure_dat.cpp	2007-12-02 01:13:31 UTC (rev 29685)
@@ -282,7 +282,9 @@
 				lureExe.read(p, sizeof(RoomResourceExit1));
 				if (FROM_LE_16(p->xs) == 0xffff) break;
 
-				rec->numExits = TO_LE_16(FROM_LE_16(rec->numExits) + 1);
+				if (++rec->numExits == 255) 
+					errorExit("Too many rooms read in");
+
 				p->xs = TO_LE_16(FROM_LE_16(p->xs) - 0x80);
 				p->ys = TO_LE_16(FROM_LE_16(p->ys) - 0x80);
 				p->xe = TO_LE_16(FROM_LE_16(p->xe) - 0x80);

Modified: scummvm/trunk/tools/create_lure/create_lure_dat.h
===================================================================
--- scummvm/trunk/tools/create_lure/create_lure_dat.h	2007-12-01 23:57:22 UTC (rev 29684)
+++ scummvm/trunk/tools/create_lure/create_lure_dat.h	2007-12-02 01:13:31 UTC (rev 29685)
@@ -30,7 +30,7 @@
 #include "common/util.h"
 
 #define VERSION_MAJOR 1
-#define VERSION_MINOR 25
+#define VERSION_MINOR 26
 
 #define DIALOG_SIZE 0x150
 
@@ -215,10 +215,10 @@
 	uint16 sequenceOffset;
 	int16 clippingXStart;
 	int16 clippingXEnd;
+	uint8 areaFlag;
+	uint8 numExits;
 	uint32 exitTime;
-	uint8 areaFlag;
 	RoomRectOut walkBounds;
-	uint16 numExits;
 };
 
 struct RoomResourceExit1 {


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