From: <mg...@us...> - 2009-07-07 06:37:22
|
Revision: 3930 http://planeshift.svn.sourceforge.net/planeshift/?rev=3930&view=rev Author: mgist Date: 2009-07-07 06:37:15 +0000 (Tue, 07 Jul 2009) Log Message: ----------- - Pass mesh name in exchange item messages. NETVERSION BUMP! Modified Paths: -------------- trunk/src/common/net/messages.cpp trunk/src/common/net/messages.h trunk/src/server/exchangemanager.cpp Modified: trunk/src/common/net/messages.cpp =================================================================== --- trunk/src/common/net/messages.cpp 2009-07-06 04:06:14 UTC (rev 3929) +++ trunk/src/common/net/messages.cpp 2009-07-07 06:37:15 UTC (rev 3930) @@ -5734,6 +5734,7 @@ psExchangeAddItemMsg::psExchangeAddItemMsg( uint32_t clientNum, const csString& name, + const csString& meshFactName, int containerID, int slot, int stackcount, @@ -5744,6 +5745,7 @@ msg->clientnum = clientNum; msg->Add( name ); + msg->Add( meshFactName ); msg->Add( (uint32_t) containerID ); msg->Add( (uint32_t) slot ); msg->Add( (uint32_t) stackcount ); @@ -5753,11 +5755,12 @@ psExchangeAddItemMsg::psExchangeAddItemMsg( MsgEntry* me ) { - name = me->GetStr(); - container = me->GetUInt32(); - slot = me->GetUInt32(); - stackCount = me->GetUInt32(); - icon = me->GetStr(); + name = me->GetStr(); + meshFactName = me->GetStr(); + container = me->GetUInt32(); + slot = me->GetUInt32(); + stackCount = me->GetUInt32(); + icon = me->GetStr(); } csString psExchangeAddItemMsg::ToString(AccessPointers * /*access_ptrs*/) Modified: trunk/src/common/net/messages.h =================================================================== --- trunk/src/common/net/messages.h 2009-07-06 04:06:14 UTC (rev 3929) +++ trunk/src/common/net/messages.h 2009-07-07 06:37:15 UTC (rev 3930) @@ -43,7 +43,7 @@ // This holds the version number of the network code, remember to increase // this each time you do an update which breaks compatibility -#define PS_NETVERSION 0x00A1 +#define PS_NETVERSION 0x00A2 // Remember to bump the version in pscssetup.h, as well. @@ -4102,6 +4102,7 @@ public: psExchangeAddItemMsg( uint32_t clientNum, const csString& name, + const csString& meshFactName, int containerID, int slot, int stackcount, @@ -4120,6 +4121,7 @@ virtual csString ToString(AccessPointers * access_ptrs); csString name; + csString meshFactName; int container; int slot; int stackCount; Modified: trunk/src/server/exchangemanager.cpp =================================================================== --- trunk/src/server/exchangemanager.cpp 2009-07-06 04:06:14 UTC (rev 3929) +++ trunk/src/server/exchangemanager.cpp 2009-07-07 06:37:15 UTC (rev 3930) @@ -691,9 +691,11 @@ void Exchange::SendAddItemMessage(Client* fromClient, int slot, psCharacterInventory::psCharacterInventoryItem* invItem) { psItem* item = invItem->GetItem(); + psExchangeAddItemMsg msg(fromClient->GetClientNum(), item->GetName(), - CONTAINER_EXCHANGE_OFFERING, slot, - invItem->exchangeStackCount, item->GetImageName()); + item->GetMeshName(), CONTAINER_EXCHANGE_OFFERING, slot, invItem->exchangeStackCount, + item->GetImageName()); + psserver->GetEventManager()->SendMessage(msg.msg); } @@ -884,8 +886,9 @@ Client *toClient = GetOtherClient(fromClient); psExchangeAddItemMsg msg(toClient->GetClientNum(), item->GetName(), - CONTAINER_EXCHANGE_RECEIVING, slot, - invItem->exchangeStackCount, item->GetImageName()); + item->GetMeshName(), CONTAINER_EXCHANGE_RECEIVING, slot, invItem->exchangeStackCount, + item->GetImageName()); + psserver->GetEventManager()->SendMessage(msg.msg); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |