[Planeshift-cvs] CVS: planeshift/src/server entitymanager.cpp,1.58,1.59

[Andrew C. <ac...@us...>]

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

Modified Files:
	entitymanager.cpp 
Log Message:
Removed item instances of money from the database once they are picked up 

Index: entitymanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/entitymanager.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** entitymanager.cpp	16 Nov 2004 07:32:18 -0000	1.58
--- entitymanager.cpp	17 Nov 2004 00:22:51 -0000	1.59
***************
*** 555,559 ****
          money.AdjustTrias( itemdata->GetStackCount() );
          chardata->SetMoney( money );
!         delete itemdata;
          return true;
      }
--- 555,559 ----
          money.AdjustTrias( itemdata->GetStackCount() );
          chardata->SetMoney( money );
!         psServer::cachemanager.RemoveInstance(itemdata);
          return true;
      }
***************
*** 564,568 ****
          money.AdjustHexas( itemdata->GetStackCount() );
          chardata->SetMoney( money );
!         delete itemdata;
          return true;
      }
--- 564,568 ----
          money.AdjustHexas( itemdata->GetStackCount() );
          chardata->SetMoney( money );
!         psServer::cachemanager.RemoveInstance(itemdata);
          return true;
      }
***************
*** 573,577 ****
          money.AdjustOctas( itemdata->GetStackCount() );
          chardata->SetMoney( money );
!         delete itemdata;
          return true;
      }
--- 573,577 ----
          money.AdjustOctas( itemdata->GetStackCount() );
          chardata->SetMoney( money );
!         psServer::cachemanager.RemoveInstance(itemdata);
          return true;
      }
***************
*** 582,586 ****
          money.AdjustCircles( itemdata->GetStackCount() );
          chardata->SetMoney( money );
!         delete itemdata;
          return true;
      }
--- 582,586 ----
          money.AdjustCircles( itemdata->GetStackCount() );
          chardata->SetMoney( money );
!         psServer::cachemanager.RemoveInstance(itemdata);
          return true;
      }