[Planeshift-cvs] CVS: planeshift/src/server/bulkobjects psitemstats.h, 1.71, 1.72 psitemstats.cpp, 1.111, 1.112 psitem.h, 1.152, 1.153 psitem.cpp, 1.272, 1.273

[Dave B. <mr...@us...>]

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

Modified Files:
	psitemstats.h psitemstats.cpp psitem.h psitem.cpp 
Log Message:
Support for BUY_PERSONALISE & CREATIVE item_stats flags for blank books, maps, etc.

Index: psitemstats.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/bulkobjects/psitemstats.h,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** psitemstats.h	1 Apr 2007 22:10:50 -0000	1.71
--- psitemstats.h	20 May 2007 21:43:15 -0000	1.72
***************
*** 157,160 ****
--- 157,162 ----
  #define PSITEMSTATS_FLAG_NOPICKUP            0x00040000
  #define PSITEMSTATS_FLAG_AVERAGEQUALITY      0x00080000		//< Flag if the item can stack and average out quality.
+ #define PSITEMSTATS_FLAG_CREATIVE            0x00100000         // A creative thing, eg book, sketch
+ #define PSITEMSTATS_FLAG_BUY_PERSONALISE     0x00200000         // duplicate & personalise at purchase
  
  typedef unsigned int PSITEMSTATS_FLAGS;
***************
*** 424,428 ****
      bool GetIsReadable();
      bool GetIsWriteable();
!     
      /// @return True if the object is a money object.
      bool IsMoney();
--- 426,432 ----
      bool GetIsReadable();
      bool GetIsWriteable();
!     bool GetCreative();
!     bool GetBuyPersonalise();
! 
      /// @return True if the object is a money object.
      bool IsMoney();

Index: psitemstats.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/bulkobjects/psitemstats.cpp,v
retrieving revision 1.111
retrieving revision 1.112
diff -C2 -d -r1.111 -r1.112
*** psitemstats.cpp	30 Apr 2007 09:14:32 -0000	1.111
--- psitemstats.cpp	20 May 2007 21:43:15 -0000	1.112
***************
*** 709,715 ****
  bool psItemStats::GetIsWriteable()
  {
!    return (flags & PSITEMSTATS_FLAG_IS_WRITEABLE) ? true : false;
  }
  
  
  bool psItemStats::GetIsGlyph()
--- 709,724 ----
  bool psItemStats::GetIsWriteable()
  {
!     return (flags & PSITEMSTATS_FLAG_IS_WRITEABLE) ? true : false;
  }
  
+ bool psItemStats::GetCreative()
+ {
+     return (flags & PSITEMSTATS_FLAG_CREATIVE) ? true : false;
+ }
+ 
+ bool psItemStats::GetBuyPersonalise()
+ {
+     return (flags & PSITEMSTATS_FLAG_BUY_PERSONALISE) ? true : false;
+ }
  
  bool psItemStats::GetIsGlyph()

Index: psitem.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/bulkobjects/psitem.h,v
retrieving revision 1.152
retrieving revision 1.153
diff -C2 -d -r1.152 -r1.153
*** psitem.h	13 May 2007 06:39:22 -0000	1.152
--- psitem.h	20 May 2007 21:43:15 -0000	1.153
***************
*** 722,725 ****
--- 722,727 ----
      bool GetIsStackable() const;
      bool GetIsEquipStackable() const;
+     bool GetCreative();
+     bool GetBuyPersonalise();
  
      const char *GetName();

Index: psitem.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/bulkobjects/psitem.cpp,v
retrieving revision 1.272
retrieving revision 1.273
diff -C2 -d -r1.272 -r1.273
*** psitem.cpp	13 May 2007 06:39:21 -0000	1.272
--- psitem.cpp	20 May 2007 21:43:15 -0000	1.273
***************
*** 1433,1436 ****
--- 1433,1446 ----
  }
  
+ bool psItem::GetCreative()
+ {
+     return current_stats->GetCreative();
+ }
+ 
+ bool psItem::GetBuyPersonalise()
+ {
+     return current_stats->GetBuyPersonalise();
+ }
+ 
  const char *psItem::GetName()
  {