Mercurial > mm7

comparison Chest.cpp @ 1828:35c1e4ff6ba7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
party_finds_gold to Party::PartyFindsGold, cleaned up, moved Level/Decoration.h reference out of Indoor.h
author Grumpy7
date Fri, 11 Oct 2013 07:04:19 +0200
parents 8251e59fd7c1
children c1c74df0a33e
comparison
equal deleted inserted replaced
1827:0c75c3e7e436 1828:35c1e4ff6ba7
25 #include "mm7_data.h" 25 #include "mm7_data.h"
26 #include "MM7.h" 26 #include "MM7.h"
27 #include "SpriteObject.h" 27 #include "SpriteObject.h"
28 #include "Mouse.h" 28 #include "Mouse.h"
29 #include "Viewport.h" 29 #include "Viewport.h"
30 #include "Level/Decoration.h"
30 31
31 size_t uNumChests; // idb 32 size_t uNumChests; // idb
32 struct ChestList *pChestList; 33 struct ChestList *pChestList;
33 std::array<Chest, 20> pChests; 34 std::array<Chest, 20> pChests;
34 35
833 else 834 else
834 v3 = -1; 835 v3 = -1;
835 v4 = pChests[chest_id].pInventoryIndices[v3] - 1; 836 v4 = pChests[chest_id].pInventoryIndices[v3] - 1;
836 if ( pChests[chest_id].igChestItems[v4].GetItemEquipType() == EQUIP_GOLD ) 837 if ( pChests[chest_id].igChestItems[v4].GetItemEquipType() == EQUIP_GOLD )
837 { 838 {
838 party_finds_gold(pChests[chest_id].igChestItems[v4].uSpecEnchantmentType, 0); 839 pParty->PartyFindsGold(pChests[chest_id].igChestItems[v4].uSpecEnchantmentType, 0);
839 viewparams->bRedrawGameUI = 1; 840 viewparams->bRedrawGameUI = 1;
840 } 841 }
841 else 842 else
842 { 843 {
843 pParty->SetHoldingItem(&pChests[chest_id].igChestItems[v4]); 844 pParty->SetHoldingItem(&pChests[chest_id].igChestItems[v4]);