diff options
| author | Paul Gilbert | 2007-12-02 01:17:51 +0000 |
|---|---|---|
| committer | Paul Gilbert | 2007-12-02 01:17:51 +0000 |
| commit | 4031b98349b8848133033d90ccf05b4923c14f34 (patch) | |
| tree | ace5eee876a065c7d7ef59959618ef93d37d6e55 | |
| parent | 547ad715e92237cb8d64ea2c56e7c98a84167545 (diff) | |
| download | scummvm-rg350-4031b98349b8848133033d90ccf05b4923c14f34.tar.gz scummvm-rg350-4031b98349b8848133033d90ccf05b4923c14f34.tar.bz2 scummvm-rg350-4031b98349b8848133033d90ccf05b4923c14f34.zip | |
Reworked the RoomResource structure to make the game easier to compile on PalmOS
svn-id: r29687
| -rw-r--r-- | engines/lure/luredefs.h | 2 | ||||
| -rw-r--r-- | engines/lure/res.cpp | 2 | ||||
| -rw-r--r-- | engines/lure/res_struct.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/engines/lure/luredefs.h b/engines/lure/luredefs.h index 40bc7121fc..69f3800769 100644 --- a/engines/lure/luredefs.h +++ b/engines/lure/luredefs.h @@ -34,7 +34,7 @@ namespace Lure { #define SUPPORT_FILENAME "lure.dat" #define LURE_DAT_MAJOR 1 -#define LURE_DAT_MINOR 25 +#define LURE_DAT_MINOR 26 #define LURE_DEBUG 1 diff --git a/engines/lure/res.cpp b/engines/lure/res.cpp index eb68be7598..0b926c5454 100644 --- a/engines/lure/res.cpp +++ b/engines/lure/res.cpp @@ -123,7 +123,7 @@ void Resources::reloadData() { 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)); diff --git a/engines/lure/res_struct.h b/engines/lure/res_struct.h index 40a801bc8d..b9a9b363bc 100644 --- a/engines/lure/res_struct.h +++ b/engines/lure/res_struct.h @@ -127,10 +127,10 @@ struct RoomResource { uint16 sequenceOffset; int16 clippingXStart; int16 clippingXEnd; - uint32 exitTime; uint8 areaFlag; + uint8 numExits; + uint32 exitTime; RoomRect walkBounds; - uint16 numExits; } PACKED_STRUCT; struct RoomExitResource { |