Mercurial > mm7
diff Chest.h @ 542:8e34868c8069
Слияние
author | Ritor1 |
---|---|
date | Sun, 03 Mar 2013 13:32:04 +0600 |
parents | db4631a484ae 214d9d47cf1f |
children | ec3546510fa1 |
line wrap: on
line diff
--- a/Chest.h Sun Mar 03 13:30:24 2013 +0600 +++ b/Chest.h Sun Mar 03 13:32:04 2013 +0600 @@ -47,29 +47,29 @@ /* 65 */ #pragma pack(push, 1) -struct Chest +struct Chest //0x14cc { inline bool Initialized() const {return uFlags & CHEST_ITEMS_PLACED;} inline void SetInitialized(bool b) {if (b) uFlags |= CHEST_ITEMS_PLACED; else uFlags &= ~CHEST_ITEMS_PLACED;} inline bool Trapped() const {return uFlags & CHEST_TRAPPED;} - static int CanPlaceItemAt(signed int a1, int a2, unsigned int uChestID); - static int _41FF64(unsigned int uChestID); - static int _41FFA2(int a1, ItemGen *a2, unsigned int uChestID); - static unsigned int PlaceItemAt(unsigned int a1, unsigned int uItemIdx, unsigned int uChestID); - static char *PlacementItems(unsigned int uChestID); - static bool Open(unsigned int uChestID); + static bool CanPlaceItemAt(signed int a1, int a2, unsigned int uChestID); + static int CountChestItems(unsigned int uChestID); + static int PutItemInChest(int a1, ItemGen *a2, unsigned int uChestID); + static void PlaceItemAt(unsigned int put_cell_pos, unsigned int uItemIdx, unsigned int uChestID); + static void PlaceItems(unsigned int uChestID); + static bool Open(signed int uChestID); static void DrawChestUI(unsigned int uChestID); static void ToggleFlag(unsigned int uChestID, unsigned __int16 uFlag, unsigned int bToggle); - unsigned __int16 uChestBitmapID; - unsigned __int16 uFlags; - struct ItemGen mm7__vector_pItems[140]; - __int16 pInventoryIndices[140]; + unsigned __int16 uChestBitmapID; //0 + unsigned __int16 uFlags; //2 + struct ItemGen igChestItems[140]; //4 + __int16 pInventoryIndices[140]; //0x13b4 }; #pragma pack(pop) - +void __fastcall sub_420B13(int a1, int a2); extern size_t uNumChests; // idb