diff options
author | Johannes Schickel | 2010-10-22 02:11:00 +0000 |
---|---|---|
committer | Johannes Schickel | 2010-10-22 02:11:00 +0000 |
commit | 5ff20cb12d26b80e0e23a5dab734412d24fa0289 (patch) | |
tree | eb7de7ca2d0f5e53977adf6c984f57ce8ea41598 /engines | |
parent | 03e2d54ca7f3d5533cbae376921cf617736caee5 (diff) | |
download | scummvm-rg350-5ff20cb12d26b80e0e23a5dab734412d24fa0289.tar.gz scummvm-rg350-5ff20cb12d26b80e0e23a5dab734412d24fa0289.tar.bz2 scummvm-rg350-5ff20cb12d26b80e0e23a5dab734412d24fa0289.zip |
KYRA: Cleanup.
svn-id: r53698
Diffstat (limited to 'engines')
-rw-r--r-- | engines/kyra/items_lok.cpp | 6 | ||||
-rw-r--r-- | engines/kyra/kyra_lok.cpp | 2 | ||||
-rw-r--r-- | engines/kyra/kyra_lok.h | 9 | ||||
-rw-r--r-- | engines/kyra/staticres.cpp | 11 |
4 files changed, 6 insertions, 22 deletions
diff --git a/engines/kyra/items_lok.cpp b/engines/kyra/items_lok.cpp index ed6313496c..b1f2232b26 100644 --- a/engines/kyra/items_lok.cpp +++ b/engines/kyra/items_lok.cpp @@ -98,7 +98,7 @@ byte KyraEngine_LoK::findItemAtPos(int x, int y) { int xpos2 = *xposOffset + 10; if (x > xpos && x < xpos2) { assert(*itemsTable >= 0); - int itemHeight = _itemTable[*itemsTable].height; + int itemHeight = _itemHtDat[*itemsTable]; int ypos = *yposOffset + 3; int ypos2 = ypos - itemHeight - 3; @@ -305,7 +305,7 @@ int KyraEngine_LoK::processItemDrop(uint16 sceneId, uint8 item, int x, int y, in return 1; } - int itemHeight = _itemTable[item].height; + int itemHeight = _itemHtDat[item]; _lastProcessedItemHeight = itemHeight; if (x == -1) @@ -623,7 +623,7 @@ void KyraEngine_LoK::itemSpecialFX1(int x, int y, int item) { void KyraEngine_LoK::itemSpecialFX2(int x, int y, int item) { x -= 8; y -= 15; - int yAdd = (int8)(((16 - _itemTable[item].height) >> 1) & 0xFF); + int yAdd = (int8)(((16 - _itemHtDat[item]) >> 1) & 0xFF); backUpItemRect0(x, y); if (item >= 80 && item <= 89) snd_playSoundEffect(55); diff --git a/engines/kyra/kyra_lok.cpp b/engines/kyra/kyra_lok.cpp index 225f71ee4e..cb37ac23de 100644 --- a/engines/kyra/kyra_lok.cpp +++ b/engines/kyra/kyra_lok.cpp @@ -247,7 +247,7 @@ Common::Error KyraEngine_LoK::init() { _brandonPosX = _brandonPosY = -1; _poisonDeathCounter = 0; - memset(_itemTable, 0, sizeof(_itemTable)); + memset(_itemHtDat, 0, sizeof(_itemHtDat)); memset(_exitList, 0xFFFF, sizeof(_exitList)); _exitListPtr = 0; _pathfinderFlag = _pathfinderFlag2 = 0; diff --git a/engines/kyra/kyra_lok.h b/engines/kyra/kyra_lok.h index ddf21c7cc2..4b075ee0f3 100644 --- a/engines/kyra/kyra_lok.h +++ b/engines/kyra/kyra_lok.h @@ -69,13 +69,6 @@ struct Room { uint8 needInit[12]; }; -struct ItemDescription { - uint8 unk1; - uint8 height; - uint8 unk2; - uint8 unk3; -}; - struct SeqLoop { const uint8 *ptr; uint16 count; @@ -456,7 +449,7 @@ protected: int8 *_sceneAnimTable[50]; - ItemDescription _itemTable[145]; + uint8 _itemHtDat[145]; int _lastProcessedItem; int _lastProcessedItemHeight; diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp index 7906dc07dc..c55ee57214 100644 --- a/engines/kyra/staticres.cpp +++ b/engines/kyra/staticres.cpp @@ -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() { |