diff options
author | Johannes Schickel | 2010-10-22 02:10:22 +0000 |
---|---|---|
committer | Johannes Schickel | 2010-10-22 02:10:22 +0000 |
commit | 03e2d54ca7f3d5533cbae376921cf617736caee5 (patch) | |
tree | 989df6c2dc37bd783ad678744a60e446b8b74007 /engines/kyra/kyra_hof.h | |
parent | 3653613443d8def9ae7f552eb799d1f039fd8097 (diff) | |
download | scummvm-rg350-03e2d54ca7f3d5533cbae376921cf617736caee5.tar.gz scummvm-rg350-03e2d54ca7f3d5533cbae376921cf617736caee5.tar.bz2 scummvm-rg350-03e2d54ca7f3d5533cbae376921cf617736caee5.zip |
KYRA: Adapt Kyra2+3 to use the newly added item type too.
svn-id: r53697
Diffstat (limited to 'engines/kyra/kyra_hof.h')
-rw-r--r-- | engines/kyra/kyra_hof.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/engines/kyra/kyra_hof.h b/engines/kyra/kyra_hof.h index 05d04fe993..02ac0a0fff 100644 --- a/engines/kyra/kyra_hof.h +++ b/engines/kyra/kyra_hof.h @@ -450,9 +450,9 @@ protected: int checkItemCollision(int x, int y); void updateWaterFlasks(); - bool dropItem(int unk1, uint16 item, int x, int y, int unk2); - bool processItemDrop(uint16 sceneId, uint16 item, int x, int y, int unk1, int unk2); - void itemDropDown(int startX, int startY, int dstX, int dstY, int itemSlot, uint16 item); + bool dropItem(int unk1, Item item, int x, int y, int unk2); + bool processItemDrop(uint16 sceneId, Item item, int x, int y, int unk1, int unk2); + void itemDropDown(int startX, int startY, int dstX, int dstY, int itemSlot, Item item); void exchangeMouseItem(int itemPos); bool pickUpItem(int x, int y); @@ -461,18 +461,18 @@ protected: static const byte _itemStringMap[]; static const int _itemStringMapSize; - static const int16 _flaskTable[]; - bool itemIsFlask(int item); + static const Item _flaskTable[]; + bool itemIsFlask(Item item); // inventory static const int _inventoryX[]; static const int _inventoryY[]; static const uint16 _itemMagicTable[]; - int getInventoryItemSlot(uint16 item); + int getInventoryItemSlot(Item item); void removeSlotFromInventory(int slot); - bool checkInventoryItemExchange(uint16 item, int slot); - void drawInventoryShape(int page, uint16 item, int slot); + bool checkInventoryItemExchange(Item item, int slot); + void drawInventoryShape(int page, Item item, int slot); void clearInventorySlot(int slot, int page); void redrawInventory(int page); void scrollInventoryWheel(); @@ -561,9 +561,9 @@ protected: void changeFileExtension(char *buffer); // - Just used in French version - int getItemCommandStringDrop(uint16 item); - int getItemCommandStringPickUp(uint16 item); - int getItemCommandStringInv(uint16 item); + int getItemCommandStringDrop(Item item); + int getItemCommandStringPickUp(Item item); + int getItemCommandStringInv(Item item); // - char _internStringBuf[200]; |