diff options
Diffstat (limited to 'engines/kyra/staticres.cpp')
| -rw-r--r-- | engines/kyra/staticres.cpp | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp index 4b71b1d69d..edfa61e5b4 100644 --- a/engines/kyra/staticres.cpp +++ b/engines/kyra/staticres.cpp @@ -42,7 +42,7 @@ namespace Kyra { -#define RESFILE_VERSION 72 +#define RESFILE_VERSION 73 namespace { bool checkKyraDat(Common::SeekableReadStream *file) { @@ -878,7 +878,7 @@ void KyraEngine_LoK::loadItems() { _shapes[323] = 0; - for (shape = 1; shape < 6; shape++ ) + for (shape = 1; shape < 6; shape++) _shapes[323 + shape] = _screen->encodeShape((shape - 1) * 32, 0, 32, 17, 0); for (shape = 330; shape <= 334; shape++) @@ -912,16 +912,7 @@ void KyraEngine_LoK::loadItems() { _shapes[216 + i] = _screen->encodeShape( (i % 20) * 16, i/20 * 16, 16, 16, 0); } - uint32 size; - uint8 *fileData = _res->fileData("_ITEM_HT.DAT", &size); - assert(fileData); - - for (int i = 0; i < 107; i++) { - _itemTable[i].height = fileData[i]; - _itemTable[i].unk1 = _itemTable[i].unk2 = 0; - } - - delete[] fileData; + _res->loadFileToBuf("_ITEM_HT.DAT", &_itemHtDat, sizeof(_itemHtDat)); } void KyraEngine_LoK::loadButtonShapes() { @@ -1866,9 +1857,9 @@ const uint8 KyraEngine_HoF::_cauldronStateTable[] = { 3, 3, 3, 3, 3, 3, 3 }; -const int16 KyraEngine_HoF::_flaskTable[] = { +const Item KyraEngine_HoF::_flaskTable[] = { 0x19, 0x14, 0x15, 0x16, 0x17, 0x18, 0x34, - 0x1B, 0x39, 0x1A, 0x3A, 0x4D, 0x72, -1 + 0x1B, 0x39, 0x1A, 0x3A, 0x4D, 0x72, kItemNone }; const uint8 KyraEngine_HoF::_rainbowRoomData[] = { @@ -1964,10 +1955,10 @@ const uint8 KyraEngine_MR::_inventoryY[] = { 0xB2, 0xB2, 0xB2, 0xB2, 0xB2 }; -const uint8 KyraEngine_MR::_trashItemList[] = { +const Item KyraEngine_MR::_trashItemList[] = { 0x1E, 0x1D, 0x1C, 0x1F, 0x0F, 0x05, 0x04, 0x00, 0x03, 0x22, 0x0B, 0x20, 0x21, 0x10, 0x11, 0x3A, - 0x39, 0x40, 0x3E, 0x3D, 0x3C, 0x3F, 0xFF + 0x39, 0x40, 0x3E, 0x3D, 0x3C, 0x3F, kItemNone }; const uint8 KyraEngine_MR::_itemStringPickUp[] = { |