[Planeshift-cvs] CVS: planeshift/src/server cachemanager.h,1.66,1.67

[Thomas T. <to...@us...>]

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

Modified Files:
	cachemanager.h 
Log Message:
Fixed item IDs to uint64.
Added hash lookup for GetBasicItemStatsByName and GetBasicItemStatsByID.
Improved speed of transformation cahce and search to include pattern and item.

Index: cachemanager.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/cachemanager.h,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -d -r1.66 -r1.67
*** cachemanager.h	10 Dec 2005 10:38:02 -0000	1.66
--- cachemanager.h	31 Dec 2005 20:37:25 -0000	1.67
***************
*** 239,253 ****
  
      // Trades
!     CombinationSet* FindCombinationsList(unsigned int patternid);
!     csPDelArray<psTradeTransformations> *FindTransformationsList(int patternid, int targetid);
!     psTradePatterns* InstantiateTradePatternByID(unsigned int patternid);
!     psTradePatterns* InstantiateTradePatternByDesignID(unsigned int designitemid);
!     psTradeAutoContainers* InstantiateTradeAutoContainerByID(uint64 container_ID);
  
      // Items
!     psItemStats *GetBasicItemStatsByName(const char *name);
!     psItemStats *GetBasicItemStatsByID(unsigned int id);
!     psItemStats *GetBasicItemStatsByIndex(unsigned int idx);
!     psItemStats *CopyItemStats( unsigned int id );
  
      psItemSet *LoadWorldItems(psSectorInfo *sector,int &loadeditems);
--- 239,253 ----
  
      // Trades
!     CombinationSet* FindCombinationsList(uint64 patternid);
!     csPDelArray<psTradeTransformations> *FindTransformationsList(uint64 patternid, uint64 targetid);
!     psTradePatterns* InstantiateTradePatternByID(uint64 patternid);
!     psTradePatterns* InstantiateTradePatternByDesignID(uint64 designitemid);
! //    psTradeAutoContainers* InstantiateTradeAutoContainerByID(uint64 container_ID);
  
      // Items
!     psItemStats *GetBasicItemStatsByName(csString name);
!     psItemStats *GetBasicItemStatsByID(uint64 id);
! //    psItemStats *GetBasicItemStatsByIndex(unsigned int idx);
!     psItemStats *CopyItemStats( uint64 id );
  
      psItemSet *LoadWorldItems(psSectorInfo *sector,int &loadeditems);
***************
*** 343,347 ****
      csPDelArray<psWay > wayList;
      csPDelArray<psSpell > spellList;
!     csArray<psItemStats *> basicitemstatslist;
      csPDelArray<csPDelArray<psItemAnimation > > item_anim_list;
      csHash<psGuildInfo*> guildinfo_by_id;
--- 343,349 ----
      csPDelArray<psWay > wayList;
      csPDelArray<psSpell > spellList;
!     //csArray<psItemStats *> basicitemstatslist;
!     csHash<psItemStats *,uint64> itemStats_IDHash;
!     csHash<psItemStats *,csString> itemStats_NameHash;
      csPDelArray<csPDelArray<psItemAnimation > > item_anim_list;
      csHash<psGuildInfo*> guildinfo_by_id;