[Planeshift-cvs] CVS: planeshift/src/server client.cpp,1.81,1.82 exchangemanager.cpp,1.101,1.102 gem.cpp,1.207,1.208 psserverchar.cpp,1.261,1.262

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

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

Modified Files:
	client.cpp exchangemanager.cpp gem.cpp psserverchar.cpp 
Log Message:
Removed the stack count and replaced it with total carry capacity based on a MathScript in rpgrules.xml

Index: client.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/client.cpp,v
retrieving revision 1.81
retrieving revision 1.82
diff -C2 -d -r1.81 -r1.82
*** client.cpp	26 Feb 2005 21:06:25 -0000	1.81
--- client.cpp	28 Feb 2005 23:46:20 -0000	1.82
***************
*** 290,293 ****
--- 290,294 ----
  bool Client::IsAllowedToAttack(gemObject * target,bool inform)
  {
+     return true;
      csString tmp;
      const char *sMsg = NULL;

Index: exchangemanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/exchangemanager.cpp,v
retrieving revision 1.101
retrieving revision 1.102
diff -C2 -d -r1.101 -r1.102
*** exchangemanager.cpp	29 Jan 2005 12:51:53 -0000	1.101
--- exchangemanager.cpp	28 Feb 2005 23:46:20 -0000	1.102
***************
*** 201,205 ****
--- 201,207 ----
              return false;
  
+         itemInSlot->EnableSaving(false);
          itemInSlot->SetStackCount(itemInSlot->GetStackCount() + item->GetStackCount());
+         itemInSlot->EnableSaving(true);
  
          if (item->GetUID() != 0)

Index: gem.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/gem.cpp,v
retrieving revision 1.207
retrieving revision 1.208
diff -C2 -d -r1.207 -r1.208
*** gem.cpp	25 Feb 2005 14:47:30 -0000	1.207
--- gem.cpp	28 Feb 2005 23:46:21 -0000	1.208
***************
*** 121,125 ****
      msghandler->Subscribe(this,MSGTYPE_DAMAGE_EVENT,NO_VALIDATION);
      msghandler->Subscribe(this,MSGTYPESTATDRUPDATE, REQUIRE_READY_CLIENT );
!     
  }
  
--- 121,125 ----
      msghandler->Subscribe(this,MSGTYPE_DAMAGE_EVENT,NO_VALIDATION);
      msghandler->Subscribe(this,MSGTYPESTATDRUPDATE, REQUIRE_READY_CLIENT );
!     msghandler->Subscribe(this, MSG_TYPE_STATS, REQUIRE_READY_CLIENT);    
  }
  
***************
*** 148,151 ****
--- 148,161 ----
      switch ( me->GetType() )
      {
+         case MSG_TYPE_STATS:
+         {
+             psCharacter* psChar = client->GetActor()->GetCharacterData();
+             
+             psStatsMessage msg( client->GetClientNum(), psChar->GetHitPointsMax(), psChar->GetManaMax(), psChar->inventory.maxWeight, psChar->inventory.maxAmount );
+             
+             msg.SendMessage();
+             break;            
+         }
+         
          case MSGTYPE_DAMAGE_EVENT:
          {

Index: psserverchar.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/psserverchar.cpp,v
retrieving revision 1.261
retrieving revision 1.262
diff -C2 -d -r1.261 -r1.262
*** psserverchar.cpp	27 Feb 2005 21:38:38 -0000	1.261
--- psserverchar.cpp	28 Feb 2005 23:46:21 -0000	1.262
***************
*** 265,268 ****
--- 265,269 ----
                                item->GetStackCount(),
                                item->GetSumWeight(),
+                               item->GetSize(),
                                item->GetImageName(),
                                item->GetPurifyStatus());
***************
*** 281,284 ****
--- 282,286 ----
                                item->GetStackCount(),
                                item->GetSumWeight(),
+                               item->GetSize(),
                                item->GetImageName(),
                                item->GetPurifyStatus());