diff options
| author | Paul Gilbert | 2007-12-02 01:13:31 +0000 |
|---|---|---|
| committer | Paul Gilbert | 2007-12-02 01:13:31 +0000 |
| commit | 547ad715e92237cb8d64ea2c56e7c98a84167545 (patch) | |
| tree | 686c37df6d191f7be7ea2a659a64775c870d1bfd | |
| parent | 7bc6a3a47a37acabedb57b80f07b1bdce2f90a98 (diff) | |
| download | scummvm-rg350-547ad715e92237cb8d64ea2c56e7c98a84167545.tar.gz scummvm-rg350-547ad715e92237cb8d64ea2c56e7c98a84167545.tar.bz2 scummvm-rg350-547ad715e92237cb8d64ea2c56e7c98a84167545.zip | |
Reworked the RoomResource structure to make the game easier to compile on PalmOS
svn-id: r29685
| -rw-r--r-- | tools/create_lure/create_lure_dat.cpp | 4 | ||||
| -rw-r--r-- | tools/create_lure/create_lure_dat.h | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/tools/create_lure/create_lure_dat.cpp b/tools/create_lure/create_lure_dat.cpp index 1d2c929824..7133937ff5 100644 --- a/tools/create_lure/create_lure_dat.cpp +++ b/tools/create_lure/create_lure_dat.cpp @@ -282,7 +282,9 @@ void read_room_data(byte *&data, uint16 &totalSize) { 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); diff --git a/tools/create_lure/create_lure_dat.h b/tools/create_lure/create_lure_dat.h index 1697ed3427..143137a259 100644 --- a/tools/create_lure/create_lure_dat.h +++ b/tools/create_lure/create_lure_dat.h @@ -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 @@ struct RoomResourceOutput { uint16 sequenceOffset; int16 clippingXStart; int16 clippingXEnd; - uint32 exitTime; uint8 areaFlag; + uint8 numExits; + uint32 exitTime; RoomRectOut walkBounds; - uint16 numExits; }; struct RoomResourceExit1 { |