[Planeshift-cvs] CVS: planeshift/src/server/bulkobjects pscharacter.cpp,1.158,1.159 pscharacter.h,1.102,1.103

[Christian S. <blu...@us...>]

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

Modified Files:
	pscharacter.cpp pscharacter.h 
Log Message:
- Fixed money transfer in exchange

Index: pscharacter.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/bulkobjects/pscharacter.cpp,v
retrieving revision 1.158
retrieving revision 1.159
diff -C2 -d -r1.158 -r1.159
*** pscharacter.cpp	1 Dec 2004 04:54:00 -0000	1.158
--- pscharacter.cpp	9 Dec 2004 17:44:59 -0000	1.159
***************
*** 1746,1749 ****
--- 1746,1757 ----
      SaveMoney();
  }
+ void psCharacter::AdjustMoney(psMoney m)
+ {
+     inventory.money.Adjust( MONEY_TRIAS, m.GetTrias() );    
+     inventory.money.Adjust( MONEY_HEXAS, m.GetHexas() );        
+     inventory.money.Adjust( MONEY_OCTAS, m.GetOctas() );    
+     inventory.money.Adjust( MONEY_CIRCLES, m.GetCircles() );    
+     SaveMoney();
+ }
  
  void psCharacter::SaveMoney()

Index: pscharacter.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/bulkobjects/pscharacter.h,v
retrieving revision 1.102
retrieving revision 1.103
diff -C2 -d -r1.102 -r1.103
*** pscharacter.h	23 Nov 2004 07:40:46 -0000	1.102
--- pscharacter.h	9 Dec 2004 17:45:10 -0000	1.103
***************
*** 701,704 ****
--- 701,705 ----
      psMoney GetMoney();
      void SetMoney(psMoney m);
+     void AdjustMoney(psMoney m);
  
      /** Saves money to database */