[Planeshift-cvs] CVS: planeshift/src/server/bulkobjects psitem.cpp, 1.223, 1.224

[tomtt <to...@us...>]

Update of /cvsroot/planeshift/planeshift/src/server/bulkobjects
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29199

Modified Files:
	psitem.cpp 
Log Message:
Added UNPICKABLE flag for lock items.

Index: psitem.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/bulkobjects/psitem.cpp,v
retrieving revision 1.223
retrieving revision 1.224
diff -C2 -d -r1.223 -r1.224
*** psitem.cpp	11 Dec 2006 22:04:06 -0000	1.223
--- psitem.cpp	12 Dec 2006 00:40:00 -0000	1.224
***************
*** 316,319 ****
--- 316,323 ----
          flags |= PSITEM_FLAG_LOCKABLE;
      }
+     if (flagstr.FindSubString("UNPICKABLE",0,true)!=-1)
+     {
+         flags |= PSITEM_FLAG_UNPICKABLE;
+     }
      if (flagstr.FindSubString("KEY",0,true)!=-1)
      {
***************
*** 640,643 ****
--- 644,652 ----
          flagString.Append("LOCKABLE");
      }
+     if (flags & PSITEM_FLAG_UNPICKABLE)
+     {
+         if (flagString != "") flagString.Append(",");
+         flagString.Append("UNPICKABLE");
+     }
      if (flags & PSITEM_FLAG_KEY)
      {
***************
*** 2071,2074 ****
--- 2080,2091 ----
  }
  
+ void psItem::SetIsUnpickable(bool v)
+ {
+     if (v)
+         flags=flags | PSITEM_FLAG_UNPICKABLE;
+     else
+         flags=flags & ~PSITEM_FLAG_UNPICKABLE;
+ }
+ 
  void psItem::SetIsKey(bool v)
  {