[Gemrb-commits] gemrb/gemrb/plugins/Core Inventory.cpp,1.71,1.72

[Laszlo T. <ave...@us...>]

Update of /cvsroot/gemrb/gemrb/gemrb/plugins/Core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2514

Modified Files:
	Inventory.cpp 
Log Message:
Inventory:automatically set the identified/stacked flags of newly acquired items


Index: Inventory.cpp
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/Inventory.cpp,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** Inventory.cpp	16 Apr 2006 23:57:02 -0000	1.71
--- Inventory.cpp	22 Apr 2006 19:40:39 -0000	1.72
***************
*** 135,139 ****
  					slot->Flags |= IE_INV_ITEM_STOLEN;
  				}
! 				
  				slot->Weight = itm->Weight;
  				slot->StackAmount = itm->StackAmount;
--- 135,149 ----
  					slot->Flags |= IE_INV_ITEM_STOLEN;
  				}
! 
! 				//auto identify basic items
! 				if (!itm->LoreToID) {
! 					slot->Flags |= IE_INV_ITEM_IDENTIFIED;
! 				}
! 
! 				//if item is stacked mark it as so
! 				if (itm->StackAmount) {
! 					slot->Flags |= IE_INV_ITEM_STACKED;
! 				}
! 
  				slot->Weight = itm->Weight;
  				slot->StackAmount = itm->StackAmount;
***************
*** 659,663 ****
  			item->Flags&=~IE_INV_ITEM_UNDROPPABLE;
  		}
! 		if (FindCandidateSlot(-1,0,item->ItemResRef)<0) {
  			return false;
  		}
--- 669,673 ----
  			item->Flags&=~IE_INV_ITEM_UNDROPPABLE;
  		}
! 		if (FindCandidateSlot(SLOT_INVENTORY,0,item->ItemResRef)<0) {
  			return false;
  		}