Mercurial > mm7
comparison Chest.cpp @ 611:7bae884b7cd0
Слияние
author | Ritor1 |
---|---|
date | Wed, 06 Mar 2013 20:16:06 +0600 |
parents | 653724e9c234 96f48cfdd657 |
children | 5bf285f56fa8 |
comparison
equal
deleted
inserted
replaced
610:c615ff03b144 | 611:7bae884b7cd0 |
---|---|
611 break; | 611 break; |
612 } | 612 } |
613 if(test_position<uChestArea) | 613 if(test_position<uChestArea) |
614 { | 614 { |
615 Chest::PlaceItemAt((unsigned __int8)chest_cells_map[test_position], items_counter, uChestID); | 615 Chest::PlaceItemAt((unsigned __int8)chest_cells_map[test_position], items_counter, uChestID); |
616 if ( pChests[uChestID].uFlags & 4 ) | 616 if ( pChests[uChestID].uFlags & CHEST_OPENED) |
617 pChests[uChestID].igChestItems[items_counter].SetIdentified(); | 617 pChests[uChestID].igChestItems[items_counter].SetIdentified(); |
618 } | 618 } |
619 } | 619 } |
620 } | 620 } |
621 pChests[uChestID].SetInitialized(true); | 621 pChests[uChestID].SetInitialized(true); |