[Scummvm-cvs-logs] SF.net SVN: scummvm: [29687] scummvm/trunk/engines/lure

dreammaster at users.sourceforge.net dreammaster at users.sourceforge.net
Sun Dec 2 02:17:51 CET 2007


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

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

Modified Paths:
--------------
    scummvm/trunk/engines/lure/luredefs.h
    scummvm/trunk/engines/lure/res.cpp
    scummvm/trunk/engines/lure/res_struct.h

Modified: scummvm/trunk/engines/lure/luredefs.h
===================================================================
--- scummvm/trunk/engines/lure/luredefs.h	2007-12-02 01:14:22 UTC (rev 29686)
+++ scummvm/trunk/engines/lure/luredefs.h	2007-12-02 01:17:51 UTC (rev 29687)
@@ -34,7 +34,7 @@
 
 #define SUPPORT_FILENAME "lure.dat"
 #define LURE_DAT_MAJOR 1
-#define LURE_DAT_MINOR 25
+#define LURE_DAT_MINOR 26
 
 #define LURE_DEBUG 1
 

Modified: scummvm/trunk/engines/lure/res.cpp
===================================================================
--- scummvm/trunk/engines/lure/res.cpp	2007-12-02 01:14:22 UTC (rev 29686)
+++ scummvm/trunk/engines/lure/res.cpp	2007-12-02 01:17:51 UTC (rev 29687)
@@ -123,7 +123,7 @@
 			RoomData *newEntry = new RoomData(rec, paths);
 			_roomData.push_back(newEntry);
 
-			uint16 numExits = READ_LE_UINT16(&rec->numExits);
+			uint8 numExits = rec->numExits;
 			if (numExits > 0) {
 				RoomExitResource *exitRes = (RoomExitResource *)
 					(mb->data() + offsetVal + sizeof(RoomResource));

Modified: scummvm/trunk/engines/lure/res_struct.h
===================================================================
--- scummvm/trunk/engines/lure/res_struct.h	2007-12-02 01:14:22 UTC (rev 29686)
+++ scummvm/trunk/engines/lure/res_struct.h	2007-12-02 01:17:51 UTC (rev 29687)
@@ -127,10 +127,10 @@
 	uint16 sequenceOffset;
 	int16 clippingXStart;
 	int16 clippingXEnd;
+	uint8 areaFlag;
+	uint8 numExits;
 	uint32 exitTime;
-	uint8 areaFlag;
 	RoomRect walkBounds;
-	uint16 numExits;
 } PACKED_STRUCT;
 
 struct RoomExitResource {


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