From: <la...@us...> - 2011-05-18 17:23:28
|
Revision: 7294 http://planeshift.svn.sourceforge.net/planeshift/?rev=7294&view=rev Author: landson Date: 2011-05-18 17:23:19 +0000 (Wed, 18 May 2011) Log Message: ----------- Merged with trunk Modified Paths: -------------- soc/2011/combat/data/gui/containerdesc.xml soc/2011/combat/data/gui/travelwindow.xml soc/2011/combat/src/client/cmdusers.cpp soc/2011/combat/src/client/gui/pawscharcreatemain.cpp soc/2011/combat/src/client/gui/pawscontainerdescwindow.cpp soc/2011/combat/src/client/gui/pawsexchangewindow.cpp soc/2011/combat/src/client/gui/pawsitemdescriptionwindow.cpp soc/2011/combat/src/client/gui/pawspetitionwindow.cpp soc/2011/combat/src/client/gui/pawsspellbookwindow.cpp soc/2011/combat/src/client/guihandler.cpp soc/2011/combat/src/client/pscelclient.cpp soc/2011/combat/src/client/psclientdr.cpp soc/2011/combat/src/client/psnetmanager.cpp soc/2011/combat/src/common/net/charmessages.cpp soc/2011/combat/src/common/net/charmessages.h soc/2011/combat/src/common/net/messages.cpp soc/2011/combat/src/common/net/messages.h soc/2011/combat/src/common/net/netbase.cpp soc/2011/combat/src/common/net/netbase.h soc/2011/combat/src/common/net/npcmessages.cpp soc/2011/combat/src/common/net/npcmessages.h soc/2011/combat/src/common/util/edge.cpp soc/2011/combat/src/common/util/edge.h soc/2011/combat/src/common/util/pspathnetwork.cpp soc/2011/combat/src/common/util/pspathnetwork.h soc/2011/combat/src/common/util/waypoint.cpp soc/2011/combat/src/common/util/waypoint.h soc/2011/combat/src/npcclient/networkmgr.cpp soc/2011/combat/src/npcclient/networkmgr.h soc/2011/combat/src/npcclient/npcclient.cpp soc/2011/combat/src/npcclient/npcclient.h soc/2011/combat/src/npcclient/npcoperations.cpp soc/2011/combat/src/npcclient/npcoperations.h soc/2011/combat/src/plugins/common/bgloader/loader.h soc/2011/combat/src/server/adminmanager.cpp soc/2011/combat/src/server/bulkobjects/pscharinventory.cpp soc/2011/combat/src/server/bulkobjects/pscharinventory.h soc/2011/combat/src/server/bulkobjects/servervitals.cpp soc/2011/combat/src/server/cachemanager.cpp soc/2011/combat/src/server/client.h soc/2011/combat/src/server/clients.cpp soc/2011/combat/src/server/clients.h soc/2011/combat/src/server/events.cpp soc/2011/combat/src/server/events.h soc/2011/combat/src/server/gem.cpp soc/2011/combat/src/server/gem.h soc/2011/combat/src/server/npcmanager.cpp soc/2011/combat/src/server/npcmanager.h soc/2011/combat/src/server/psserverdr.cpp soc/2011/combat/src/server/spawnmanager.cpp soc/2011/combat/src/server/usermanager.cpp soc/2011/combat/src/server/usermanager.h soc/2011/combat/src/tools/navgen/navgen.cpp Property Changed: ---------------- soc/2011/combat/src/tools/ccheck/ Modified: soc/2011/combat/data/gui/containerdesc.xml =================================================================== --- soc/2011/combat/data/gui/containerdesc.xml 2011-05-18 08:14:20 UTC (rev 7293) +++ soc/2011/combat/data/gui/containerdesc.xml 2011-05-18 17:23:19 UTC (rev 7294) @@ -4,6 +4,11 @@ <frame x="100" y="100" width="300" height="365" border="yes"/> <title resource="Scaling Title Bar" text="Container" align="left" close_button="yes"/> + <widget name="TakeStackAll" factory="pawsButton" tooltip = "Take and Stack All"> + <frame x="10" y="70" width="48" height="48" /> + <bgimage resource="ButtonPickup" /> + </widget> + <widget name="TakeAll" factory="pawsButton" tooltip = "Take All"> <frame x="10" y="120" width="48" height="48" /> <bgimage resource="ButtonPickup" /> Modified: soc/2011/combat/data/gui/travelwindow.xml =================================================================== --- soc/2011/combat/data/gui/travelwindow.xml 2011-05-18 08:14:20 UTC (rev 7293) +++ soc/2011/combat/data/gui/travelwindow.xml 2011-05-18 17:23:19 UTC (rev 7294) @@ -6,10 +6,10 @@ <bgimage resource="Loading Background" /> <widget name="motd" factory="pawsMultiLineTextBox" > - <frame x="460" y="140" width="295" height="100" /> + <frame x="460" y="80" width="295" height="100" /> </widget> <widget name="guildmotd" factory="pawsMultiLineTextBox" > - <frame x="460" y="200" width="295" height="100" border="no" /> + <frame x="460" y="180" width="295" height="100" border="no" /> </widget> <widget name="tip" factory="pawsMultiLineTextBox" > <frame x="460" y="400" width="310" height="100" border="no" /> Modified: soc/2011/combat/src/client/cmdusers.cpp =================================================================== --- soc/2011/combat/src/client/cmdusers.cpp 2011-05-18 08:14:20 UTC (rev 7293) +++ soc/2011/combat/src/client/cmdusers.cpp 2011-05-18 17:23:19 UTC (rev 7294) @@ -133,6 +133,7 @@ cmdsource->Subscribe("/write", this); cmdsource->Subscribe("/yield", this); cmdsource->Subscribe("/takeall", this); // Take all items from a container + cmdsource->Subscribe("/takestackall", this); // Take all items from a container and stack not precisely } psUserCommands::~psUserCommands() @@ -206,6 +207,7 @@ cmdsource->Unsubscribe("/write", this); cmdsource->Unsubscribe("/yield", this); cmdsource->Unsubscribe("/takeall", this); + cmdsource->Unsubscribe("/takestackall", this); @@ -800,6 +802,17 @@ else return "You need to specify a target or to select one"; } + + // Handle /takestackall command + else if (words[0] == "/takestackall") + { + //printf("cmdusers 801, sending /takestackall to server.\n"); + csString newCmd; + newCmd.Append("/takestackall"); + + psUserCmdMessage cmdmsg(newCmd); + cmdmsg.SendMessage(); + } // Handle /takeall command else if (words[0] == "/takeall") Modified: soc/2011/combat/src/client/gui/pawscharcreatemain.cpp =================================================================== --- soc/2011/combat/src/client/gui/pawscharcreatemain.cpp 2011-05-18 08:14:20 UTC (rev 7293) +++ soc/2011/combat/src/client/gui/pawscharcreatemain.cpp 2011-05-18 17:23:19 UTC (rev 7294) @@ -1013,9 +1013,9 @@ view->EnableMouseControl(true); //temporary hardcoding needs removal - maleButton->SetEnabled(currentGender != PSCHARACTER_GENDER_NONE); - femaleButton->SetEnabled(currentGender != PSCHARACTER_GENDER_NONE); - if(currentGender == PSCHARACTER_GENDER_NONE) + maleButton->SetEnabled(id != 9); + femaleButton->SetEnabled(id != 9); + if(id != 9) { maleButton->SetState(false); femaleButton->SetState(false); Modified: soc/2011/combat/src/client/gui/pawscontainerdescwindow.cpp =================================================================== --- soc/2011/combat/src/client/gui/pawscontainerdescwindow.cpp 2011-05-18 08:14:20 UTC (rev 7293) +++ soc/2011/combat/src/client/gui/pawscontainerdescwindow.cpp 2011-05-18 17:23:19 UTC (rev 7294) @@ -23,6 +23,8 @@ #include <csgeom/vector3.h> #include <iutil/objreg.h> +// COMMON INCLUDES +#include "net/connection.h" // CLIENT INCLUDES #include "pscelclient.h" @@ -91,7 +93,7 @@ void pawsContainerDescWindow::HandleUpdateItem( MsgEntry* me ) { - psViewItemUpdate mesg( me, psengine->GetMsgStrings() ); + psViewItemUpdate mesg( me, ((psNetManager*)psengine->GetNetManager())->GetConnection()->GetAccessPointers() ); csString sigData, data; // We send ownerID to multiple clients, so each client must decide if the item is owned by @@ -118,7 +120,7 @@ void pawsContainerDescWindow::HandleViewItem( MsgEntry* me ) { Show(); - psViewItemDescription mesg(me, psengine->GetMsgStrings()); + psViewItemDescription mesg(me, ((psNetManager*)psengine->GetNetManager())->GetConnection()->GetAccessPointers()); description->SetText( mesg.itemDescription ); name->SetText( mesg.itemName ); @@ -231,6 +233,29 @@ widget->Show(); return true; } + // Check to see if player attempts to take and stack everything + else if(widgetName == "TakeStackAll") + { + GEMClientObject* oldtarget = psengine->GetCharManager()->GetTarget(); + EID oldID; + + if(oldtarget) + { + oldID = oldtarget->GetEID(); + } + + //printf("selecting containerID %d, oldID %d\n", containerID, oldID); + psUserActionMessage setnewtarget(0, containerID, "select"); + setnewtarget.SendMessage(); + //printf("taking all\n"); + + // Attempt to grab all items in the container. + psengine->GetCmdHandler()->Execute("/takestackall"); + + //printf("selecting oldID %d\n", oldID); + psUserActionMessage setoldtarget(0, oldID, "select"); + setoldtarget.SendMessage(); + } // Check to see if player attempts to take everything else if (widgetName == "TakeAll") { Modified: soc/2011/combat/src/client/gui/pawsexchangewindow.cpp =================================================================== --- soc/2011/combat/src/client/gui/pawsexchangewindow.cpp 2011-05-18 08:14:20 UTC (rev 7293) +++ soc/2011/combat/src/client/gui/pawsexchangewindow.cpp 2011-05-18 17:23:19 UTC (rev 7294) @@ -25,6 +25,7 @@ ///////////////////////////////////////////////////////////////////////////// #include "net/messages.h" #include "net/clientmsghandler.h" +#include "net/connection.h" ///////////////////////////////////////////////////////////////////////////// // CLIENT INCLUDES @@ -295,7 +296,7 @@ /////////////////////////////////////////////////////////// case MSGTYPE_EXCHANGE_ADD_ITEM: { - psExchangeAddItemMsg item(me, psengine->GetMsgStrings()); + psExchangeAddItemMsg item(me, ((psNetManager*)psengine->GetNetManager())->GetConnection()->GetAccessPointers()); pawsSlot* itemSlot = 0; if ( item.container == CONTAINER_EXCHANGE_OFFERING ) Modified: soc/2011/combat/src/client/gui/pawsitemdescriptionwindow.cpp =================================================================== --- soc/2011/combat/src/client/gui/pawsitemdescriptionwindow.cpp 2011-05-18 08:14:20 UTC (rev 7293) +++ soc/2011/combat/src/client/gui/pawsitemdescriptionwindow.cpp 2011-05-18 17:23:19 UTC (rev 7294) @@ -34,6 +34,7 @@ #include "net/messages.h" #include "net/clientmsghandler.h" #include "util/log.h" +#include "net/connection.h" ////////////////////////////////////////////////////////////////////// // Construction/Destruction @@ -69,7 +70,7 @@ void pawsItemDescriptionWindow::HandleMessage( MsgEntry* me ) { Show(); - psViewItemDescription mesg(me, psengine->GetMsgStrings()); + psViewItemDescription mesg(me, ((psNetManager*)psengine->GetNetManager())->GetConnection()->GetAccessPointers()); description->SetText( mesg.itemDescription ); csString nameStr; nameStr = mesg.itemName; Modified: soc/2011/combat/src/client/gui/pawspetitionwindow.cpp =================================================================== --- soc/2011/combat/src/client/gui/pawspetitionwindow.cpp 2011-05-18 08:14:20 UTC (rev 7293) +++ soc/2011/combat/src/client/gui/pawspetitionwindow.cpp 2011-05-18 17:23:19 UTC (rev 7294) @@ -171,7 +171,7 @@ return; } // Update the listbox: - size_t modifiedRow = -1; + int modifiedRow = -1; if (petitionList->GetSelectedRow()) modifiedRow = petitionList->GetSelectedRow()->GetLastIndex(); AddPetitions(message.petitions); Modified: soc/2011/combat/src/client/gui/pawsspellbookwindow.cpp =================================================================== --- soc/2011/combat/src/client/gui/pawsspellbookwindow.cpp 2011-05-18 08:14:20 UTC (rev 7293) +++ soc/2011/combat/src/client/gui/pawsspellbookwindow.cpp 2011-05-18 17:23:19 UTC (rev 7294) @@ -24,6 +24,7 @@ #include "net/messages.h" #include "net/clientmsghandler.h" #include "util/strutil.h" +#include "net/connection.h" // CLIENT INCLUDES #include "../globals.h" @@ -107,7 +108,7 @@ descriptions_Hash.Empty(); images_Hash.Empty(); - psSpellBookMessage mesg(me, psengine->GetMsgStrings()); + psSpellBookMessage mesg(me, ((psNetManager*)psengine->GetNetManager())->GetConnection()->GetAccessPointers()); for ( size_t x = 0; x < mesg.spells.GetSize(); x++ ) { pawsListBoxRow* row = spellList->NewRow(); Modified: soc/2011/combat/src/client/guihandler.cpp =================================================================== --- soc/2011/combat/src/client/guihandler.cpp 2011-05-18 08:14:20 UTC (rev 7293) +++ soc/2011/combat/src/client/guihandler.cpp 2011-05-18 17:23:19 UTC (rev 7294) @@ -33,6 +33,7 @@ //============================================================================= #include "net/messages.h" #include "net/clientmsghandler.h" +#include "net/connection.h" //============================================================================= // Local Includes @@ -65,7 +66,7 @@ void GUIHandler::HandleInventory(MsgEntry* me) { - psGUIInventoryMessage incoming(me, psengine->GetMsgStrings()); + psGUIInventoryMessage incoming(me, ((psNetManager*)psengine->GetNetManager())->GetConnection()->GetAccessPointers()); // drop inventory list, if its version is older than the current. // this may happen due to UDP latency. Modified: soc/2011/combat/src/client/pscelclient.cpp =================================================================== --- soc/2011/combat/src/client/pscelclient.cpp 2011-05-18 08:14:20 UTC (rev 7293) +++ soc/2011/combat/src/client/pscelclient.cpp 2011-05-18 17:23:19 UTC (rev 7294) @@ -62,6 +62,7 @@ #include "net/clientmsghandler.h" #include "util/psconst.h" +#include "net/connection.h" #include "gui/pawsinfowindow.h" #include "gui/pawsconfigkeys.h" @@ -243,7 +244,7 @@ psengine->FatalError("Cannot load main actor. Error during loading.\n"); return; } - psPersistActor msg(me, 0, GetClientDR()->GetMsgStrings(), psengine->GetEngine()); + psPersistActor msg(me, ((psNetManager*)psengine->GetNetManager())->GetConnection()->GetAccessPointers()); GEMClientActor* actor = new GEMClientActor(this, msg); @@ -264,7 +265,7 @@ void psCelClient::HandleItem( MsgEntry* me ) { - psPersistItem msg(me, clientdr->GetMsgStrings()); + psPersistItem msg(me, ((psNetManager*)psengine->GetNetManager())->GetConnection()->GetAccessPointers()); GEMClientItem* item = new GEMClientItem(this, msg); AddEntity(item); } @@ -1697,7 +1698,8 @@ // ++DRcounter is the sequencer of these messages so the server and other // clients do not use out of date messages when delivered out of order. psDRMessage drmsg(0, mappedid, on_ground, 0, ++DRcounter, pos, yrot, sector, - sector->QueryObject()->GetName(), vel, worldVel, ang_vel, 0, msgstrings); + sector->QueryObject()->GetName(), vel, worldVel, ang_vel, + ((psNetManager*)psengine->GetNetManager())->GetConnection()->GetAccessPointers()); drmsg.msg->priority = priority; //if (hackflag) Modified: soc/2011/combat/src/client/psclientdr.cpp =================================================================== --- soc/2011/combat/src/client/psclientdr.cpp 2011-05-18 08:14:20 UTC (rev 7293) +++ soc/2011/combat/src/client/psclientdr.cpp 2011-05-18 17:23:19 UTC (rev 7294) @@ -209,7 +209,7 @@ void psClientDR::HandleDeadReckon( MsgEntry* me ) { - psDRMessage drmsg(me,0,msgstrings,psengine->GetEngine() ); + psDRMessage drmsg(me, ((psNetManager*)psengine->GetNetManager())->GetConnection()->GetAccessPointers() ); GEMClientActor* gemActor = (GEMClientActor*)celclient->FindObject( drmsg.entityid ); if (!gemActor) @@ -243,7 +243,7 @@ void psClientDR::HandleForcePosition(MsgEntry *me) { - psForcePositionMessage msg(me, 0, msgstrings, psengine->GetEngine()); + psForcePositionMessage msg(me, ((psNetManager*)psengine->GetNetManager())->GetConnection()->GetAccessPointers()); if(last_sector != msg.sectorName) { Modified: soc/2011/combat/src/client/psnetmanager.cpp =================================================================== --- soc/2011/combat/src/client/psnetmanager.cpp 2011-05-18 08:14:20 UTC (rev 7293) +++ soc/2011/combat/src/client/psnetmanager.cpp 2011-05-18 17:23:19 UTC (rev 7294) @@ -56,6 +56,8 @@ if (!connection->Initialize(object_reg)) return false; + connection->SetEngine(psengine->GetEngine()); + msghandler = csPtr<ClientMsgHandler> (new ClientMsgHandler); bool rc = msghandler->Initialize((NetBase*) connection, object_reg); if (!rc) Modified: soc/2011/combat/src/common/net/charmessages.cpp =================================================================== --- soc/2011/combat/src/common/net/charmessages.cpp 2011-05-18 08:14:20 UTC (rev 7293) +++ soc/2011/combat/src/common/net/charmessages.cpp 2011-05-18 17:23:19 UTC (rev 7294) @@ -18,7 +18,7 @@ { } -csString psCharApprovedMessage::ToString(AccessPointers * /*access_ptrs*/) +csString psCharApprovedMessage::ToString(NetBase::AccessPointers* /*accessPointers*/) { csString msgtext; @@ -54,7 +54,7 @@ valid = !(msg->overrun); } -csString psCharRejectedMessage::ToString(AccessPointers * /*access_ptrs*/) +csString psCharRejectedMessage::ToString(NetBase::AccessPointers* /*accessPointers*/) { csString msgtext; @@ -138,7 +138,7 @@ } } -csString psCharVerificationMesg::ToString(AccessPointers * /*access_ptrs*/) +csString psCharVerificationMesg::ToString(NetBase::AccessPointers* /*accessPointers*/) { csString msgtext; @@ -240,7 +240,7 @@ } -csString psCharUploadMessage::ToString(AccessPointers * /*access_ptrs*/) +csString psCharUploadMessage::ToString(NetBase::AccessPointers* /*accessPointers*/) { csString msgtext; @@ -340,7 +340,7 @@ msg->ClipToCurrentSize(); } -csString psCreationChoiceMsg::ToString(AccessPointers * /*access_ptrs*/) +csString psCreationChoiceMsg::ToString(NetBase::AccessPointers* /*accessPointers*/) { csString msgtext; @@ -464,7 +464,7 @@ } } -csString psLifeEventMsg::ToString(AccessPointers * /*access_ptrs*/) +csString psLifeEventMsg::ToString(NetBase::AccessPointers* /*accessPointers*/) { csString msgtext; Modified: soc/2011/combat/src/common/net/charmessages.h =================================================================== --- soc/2011/combat/src/common/net/charmessages.h 2011-05-18 08:14:20 UTC (rev 7293) +++ soc/2011/combat/src/common/net/charmessages.h 2011-05-18 17:23:19 UTC (rev 7294) @@ -52,10 +52,10 @@ /** * Convert the message into human readable string. * - * @param access_ptrs A struct to a number of access pointers. + * @param accessPointers A struct to a number of access pointers. * @return Return a human readable string for the message. */ - virtual csString ToString(AccessPointers * access_ptrs); + virtual csString ToString(NetBase::AccessPointers* accessPointers); }; @@ -91,10 +91,10 @@ /** * Convert the message into human readable string. * - * @param access_ptrs A struct to a number of access pointers. + * @param accessPointers A struct to a number of access pointers. * @return Return a human readable string for the message. */ - virtual csString ToString(AccessPointers * access_ptrs); + virtual csString ToString(NetBase::AccessPointers* accessPointers); /// The error type ( from enum ) int errorType; @@ -126,10 +126,10 @@ /** * Convert the message into human readable string. * - * @param access_ptrs A struct to a number of access pointers. + * @param accessPointers A struct to a number of access pointers. * @return Return a human readable string for the message. */ - virtual csString ToString(AccessPointers * access_ptrs); + virtual csString ToString(NetBase::AccessPointers* accessPointers); /** Add a new variable to the list. * @param value = the value or rank of the attribute @@ -168,10 +168,10 @@ /** * Convert the message into human readable string. * - * @param access_ptrs A struct to a number of access pointers. + * @param accessPointers A struct to a number of access pointers. * @return Return a human readable string for the message. */ - virtual csString ToString(AccessPointers * access_ptrs); + virtual csString ToString(NetBase::AccessPointers* accessPointers); public: @@ -261,10 +261,10 @@ /** * Convert the message into human readable string. * - * @param access_ptrs A struct to a number of access pointers. + * @param accessPointers A struct to a number of access pointers. * @return Return a human readable string for the message. */ - virtual csString ToString(AccessPointers * access_ptrs); + virtual csString ToString(NetBase::AccessPointers* accessPointers); /** Add a new choice the the message payload. * @@ -322,10 +322,10 @@ /** * Convert the message into human readable string. * - * @param access_ptrs A struct to a number of access pointers. + * @param accessPointers A struct to a number of access pointers. * @return Return a human readable string for the message. */ - virtual csString ToString(AccessPointers * access_ptrs); + virtual csString ToString(NetBase::AccessPointers* accessPointers); void AddEvent( LifeEventChoice *choice ); Modified: soc/2011/combat/src/common/net/messages.cpp =================================================================== --- soc/2011/combat/src/common/net/messages.cpp 2011-05-18 08:14:20 UTC (rev 7293) +++ soc/2011/combat/src/common/net/messages.cpp 2011-05-18 17:23:19 UTC (rev 7294) @@ -48,6 +48,7 @@ MsgHandler *psMessageCracker::msghandler; + void psMessageCracker::SendMessage() { CS_ASSERT(valid); @@ -95,7 +96,7 @@ charName = message->GetStr(); } -csString psCharDeleteMessage::ToString(AccessPointers * /*access_ptrs*/) +csString psCharDeleteMessage::ToString(NetBase::AccessPointers * /*accessPointers*/) { csString msgtext; @@ -139,7 +140,7 @@ return netversion == PS_NETVERSION; } -csString psPreAuthenticationMessage::ToString(AccessPointers * /*access_ptrs*/) +csString psPreAuthenticationMessage::ToString(NetBase::AccessPointers * /*accessPointers*/) { csString msgtext; @@ -200,7 +201,7 @@ return netversion == PS_NETVERSION; } -csString psAuthenticationMessage::ToString(AccessPointers * /*access_ptrs*/) +csString psAuthenticationMessage::ToString(NetBase::AccessPointers * /*accessPointers*/) { csString msgtext; @@ -275,7 +276,7 @@ msg->Add(contents[i]); } -csString psAuthApprovedMessage::ToString(AccessPointers * /*access_ptrs*/) +csString psAuthApprovedMessage::ToString(NetBase::AccessPointers * /*accessPointers*/) { csString msgtext; @@ -313,7 +314,7 @@ valid=!(message->overrun); } -csString psPreAuthApprovedMessage::ToString(AccessPointers * /*access_ptrs*/) +csString psPreAuthApprovedMessage::ToString(NetBase::AccessPointers * /*accessPointers*/) { csString msgtext; @@ -354,7 +355,7 @@ valid=!(message->overrun); } -csString psAuthRejectedMessage::ToString(AccessPointers * /*access_ptrs*/) +csString psAuthRejectedMessage::ToString(NetBase::AccessPointers * /*accessPointers*/) { csString msgtext; @@ -389,7 +390,7 @@ valid=!(message->overrun); } -csString psCharacterPickerMessage::ToString(AccessPointers * /*access_ptrs*/) +csString psCharacterPickerMessage::ToString(NetBase::AccessPointers * /*accessPointers*/) { csString msgtext; @@ -419,7 +420,7 @@ // No data, always valid } -csString psCharacterApprovedMessage::ToString(AccessPointers* /*access_ptrs*/) +csString psCharacterApprovedMessage::ToString(NetBase::AccessPointers* /*accessPointers*/) { csString msgtext; @@ -497,7 +498,7 @@ } -csString psChatMessage::ToString(AccessPointers * /*access_ptrs*/) +csString psChatMessage::ToString(NetBase::AccessPointers * /*accessPointers*/) { csString msgtext; @@ -557,7 +558,7 @@ valid=!(message->overrun); } -csString psChannelJoinMessage::ToString(AccessPointers * /*access_ptrs*/) +csString psChannelJoinMessage::ToString(NetBase::AccessPointers * /*accessPointers*/) { csString text; text.Format("Channel name: %s", channel.GetData()); @@ -589,7 +590,7 @@ valid=!(message->overrun); } -csString psChannelJoinedMessage::ToString(AccessPointers * /*access_ptrs*/) +csString psChannelJoinedMessage::ToString(NetBase::AccessPointers * /*accessPointers*/) { csString text; text.Format("Channel ID: %d, name: %s", id, channel.GetData()); @@ -619,7 +620,7 @@ valid=!(message->overrun); } -csString psChannelLeaveMessage::ToString(AccessPointers * /*access_ptrs*/) +csString psChannelLeaveMessage::ToString(NetBase::AccessPointers * /*accessPointers*/) { csString text; text.Format("Channel ID: %d", chanID); @@ -707,7 +708,7 @@ valid=!(message->overrun); } -csString psSystemMessage::ToString(AccessPointers * /*access_ptrs*/) +csString psSystemMessage::ToString(NetBase::AccessPointers * /*accessPointers*/) { csString msgtext; @@ -844,7 +845,7 @@ valid=!(message->overrun); } -csString psPetitionMessage::ToString(AccessPointers * /*access_ptrs*/) +csString psPetitionMessage::ToString(NetBase::AccessPointers * /*accessPointers*/) { csString msgtext; @@ -914,7 +915,7 @@ valid=!(message->overrun); } -csString psPetitionRequestMessage::ToString(AccessPointers * /*access_ptrs*/) +csString psPetitionRequestMessage::ToString(NetBase::AccessPointers * /*accessPointers*/) { csString msgtext; @@ -999,7 +1000,7 @@ valid=!(message->overrun); } -csString psGMGuiMessage::ToString(AccessPointers * /*access_ptrs*/) +csString psGMGuiMessage::ToString(NetBase::AccessPointers * /*accessPointers*/) { csString msgtext; @@ -1111,7 +1112,7 @@ valid = false; } -csString psGuildCmdMessage::ToString(AccessPointers * /*access_ptrs*/) +csString psGuildCmdMessage::ToString(NetBase::AccessPointers * /*accessPointers*/) { csString msgtext; @@ -1227,7 +1228,7 @@ valid=!(message->overrun); } -csString psGUIGuildMessage::ToString(AccessPointers * /*access_ptrs*/) +csString psGUIGuildMessage::ToString(NetBase::AccessPointers * /*accessPointers*/) { csString msgtext; @@ -1292,7 +1293,7 @@ valid = false; } -csString psGroupCmdMessage::ToString(AccessPointers * /*access_ptrs*/) +csString psGroupCmdMessage::ToString(NetBase::AccessPointers * /*accessPointers*/) { csString msgtext; @@ -1468,7 +1469,7 @@ valid = false; } -csString psUserCmdMessage::ToString(AccessPointers * /*access_ptrs*/) +csString psUserCmdMessage::ToString(NetBase::AccessPointers * /*accessPointers*/) { csString msgtext; @@ -1573,7 +1574,7 @@ } } -csString psWorkCmdMessage::ToString(AccessPointers * /*access_ptrs*/) +csString psWorkCmdMessage::ToString(NetBase::AccessPointers * /*accessPointers*/) { csString msgtext; @@ -1624,7 +1625,7 @@ cmd = message->GetStr(); } -csString psAdminCmdMessage::ToString(AccessPointers * /*access_ptrs*/) +csString psAdminCmdMessage::ToString(NetBase::AccessPointers * /*accessPointers*/) { csString msgtext; @@ -1671,7 +1672,7 @@ cmd = message->GetStr(); } -csString psGenericCmdMessage::ToString(AccessPointers * /*access_ptrs*/) +csString psGenericCmdMessage::ToString(NetBase::AccessPointers * /*accessPointers*/) { csString msgtext; @@ -1711,7 +1712,7 @@ valid=!(message->overrun); } -csString psDisconnectMessage::ToString(AccessPointers * /*access_ptrs*/) +csString psDisconnectMessage::ToString(NetBase::AccessPointers * /*accessPointers*/) { csString msgtext; @@ -1752,7 +1753,7 @@ valid=!(message->overrun); } -csString psUserActionMessage::ToString(AccessPointers * /*access_ptrs*/) +csString psUserActionMessage::ToString(NetBase::AccessPointers * /*accessPointers*/) { csString msgtext; @@ -1793,7 +1794,7 @@ valid=!(message->overrun); } -csString psGUIInteractMessage::ToString(AccessPointers * /*access_ptrs*/) +csString psGUIInteractMessage::ToString(NetBase::AccessPointers * /*accessPointers*/) { csString msgtext; @@ -1887,7 +1888,7 @@ valid = !(message->overrun); } -csString psMapActionMessage::ToString(AccessPointers * /*access_ptrs*/) +csString psMapActionMessage::ToString(NetBase::AccessPointers * /*accessPointers*/) { csString msgtext,cmd; cmd = "UNKOWN"; @@ -1940,7 +1941,7 @@ valid=!(message->overrun); } -csString psModeMessage::ToString(AccessPointers * /*access_ptrs*/) +csString psModeMessage::ToString(NetBase::AccessPointers * /*accessPointers*/) { csString msgtext; @@ -1978,7 +1979,7 @@ valid=!(message->overrun); } -csString psMoveLockMessage::ToString(AccessPointers * /*access_ptrs*/) +csString psMoveLockMessage::ToString(NetBase::AccessPointers * /*accessPointers*/) { csString msgtext; @@ -2146,7 +2147,7 @@ valid=!(message->overrun); } -csString psWeatherMessage::ToString(AccessPointers * /*access_ptrs*/) +csString psWeatherMessage::ToString(NetBase::AccessPointers * /*accessPointers*/) { csString msgtext; @@ -2195,7 +2196,7 @@ //--------------------------------------------------------------------------- -PSF_IMPLEMENT_MSG_FACTORY4(psGUIInventoryMessage,MSGTYPE_GUIINVENTORY); +PSF_IMPLEMENT_MSG_FACTORY_ACCESS_POINTER(psGUIInventoryMessage,MSGTYPE_GUIINVENTORY); psGUIInventoryMessage::psGUIInventoryMessage(uint8_t command, uint32_t size ) { @@ -2211,7 +2212,7 @@ } -psGUIInventoryMessage::psGUIInventoryMessage(MsgEntry *message, csStringHashReversible* msgstringshash) +psGUIInventoryMessage::psGUIInventoryMessage(MsgEntry *message, NetBase::AccessPointers* accessPointers) { if (!message) return; @@ -2232,8 +2233,8 @@ { ItemDescription item; item.name = message->GetStr(); - item.meshName = msgstringshash->Request(csStringID(message->GetUInt32())); - item.materialName = msgstringshash->Request(csStringID(message->GetUInt32())); + item.meshName = accessPointers->Request(csStringID(message->GetUInt32())); + item.materialName = accessPointers->Request(csStringID(message->GetUInt32())); item.container = message->GetUInt32(); item.slot = message->GetUInt32(); item.stackcount = message->GetUInt32(); @@ -2331,7 +2332,7 @@ msg->Add((uint32_t)slotID); } -csString psGUIInventoryMessage::ToString(AccessPointers * /*access_ptrs*/) +csString psGUIInventoryMessage::ToString(NetBase::AccessPointers * /*accessPointers*/) { csString msgtext; @@ -2410,7 +2411,7 @@ // Since this message is never sent, we don't adjust the valid flag } -csString psNewSectorMessage::ToString(AccessPointers * /*access_ptrs*/) +csString psNewSectorMessage::ToString(NetBase::AccessPointers * /*accessPointers*/) { csString msgtext; @@ -2445,7 +2446,7 @@ valid=!(message->overrun); } -csString psLootItemMessage::ToString(AccessPointers * /*access_ptrs*/) +csString psLootItemMessage::ToString(NetBase::AccessPointers * /*accessPointers*/) { csString msgtext; @@ -2482,7 +2483,7 @@ valid=!(msg->overrun); } -csString psLootMessage::ToString(AccessPointers * /*access_ptrs*/) +csString psLootMessage::ToString(NetBase::AccessPointers * /*accessPointers*/) { csString msgtext; @@ -2521,7 +2522,7 @@ valid=!(msg->overrun); } -csString psQuestListMessage::ToString(AccessPointers * /*access_ptrs*/) +csString psQuestListMessage::ToString(NetBase::AccessPointers * /*accessPointers*/) { csString msgtext; @@ -2575,7 +2576,7 @@ } -csString psQuestInfoMessage::ToString(AccessPointers * /*access_ptrs*/) +csString psQuestInfoMessage::ToString(NetBase::AccessPointers * /*accessPointers*/) { csString msgtext; @@ -2626,7 +2627,7 @@ valid=!(message->overrun); } -csString psOverrideActionMessage::ToString(AccessPointers * /*access_ptrs*/) +csString psOverrideActionMessage::ToString(NetBase::AccessPointers * /*accessPointers*/) { csString msgtext; @@ -2691,7 +2692,7 @@ valid=!(message->overrun); } -csString psEquipmentMessage::ToString(AccessPointers * /*access_ptrs*/) +csString psEquipmentMessage::ToString(NetBase::AccessPointers * /*accessPointers*/) { csString msgtext; @@ -2758,7 +2759,7 @@ valid=!(message->overrun); } -csString psGUIMerchantMessage::ToString(AccessPointers * /*access_ptrs*/) +csString psGUIMerchantMessage::ToString(NetBase::AccessPointers * /*accessPointers*/) { csString msgtext; @@ -2822,7 +2823,7 @@ valid=!(message->overrun); } -csString psGUIStorageMessage::ToString(AccessPointers * /*access_ptrs*/) +csString psGUIStorageMessage::ToString(NetBase::AccessPointers * /*accessPointers*/) { csString msgtext; @@ -2887,7 +2888,7 @@ valid=!(message->overrun); } -csString psGUIGroupMessage::ToString(AccessPointers * /*access_ptrs*/) +csString psGUIGroupMessage::ToString(NetBase::AccessPointers * /*accessPointers*/) { csString msgtext; @@ -2911,7 +2912,7 @@ msg->Add(craftTime); } -csString psCraftCancelMessage::ToString(AccessPointers * /*access_ptrs*/) +csString psCraftCancelMessage::ToString(NetBase::AccessPointers * /*accessPointers*/) { csString msgtext; @@ -2924,7 +2925,7 @@ PSF_IMPLEMENT_MSG_FACTORY(psSpellCancelMessage,MSGTYPE_SPELL_CANCEL); -csString psSpellCancelMessage::ToString(AccessPointers * /*access_ptrs*/) +csString psSpellCancelMessage::ToString(NetBase::AccessPointers * /*accessPointers*/) { csString msgtext; @@ -2935,7 +2936,7 @@ //-------------------------------------------------------------------------- -PSF_IMPLEMENT_MSG_FACTORY4(psSpellBookMessage,MSGTYPE_SPELL_BOOK); +PSF_IMPLEMENT_MSG_FACTORY_ACCESS_POINTER(psSpellBookMessage,MSGTYPE_SPELL_BOOK); psSpellBookMessage::psSpellBookMessage() { @@ -2951,7 +2952,7 @@ size = 0; } -psSpellBookMessage::psSpellBookMessage( MsgEntry* me, csStringHashReversible* msgstringshash ) +psSpellBookMessage::psSpellBookMessage( MsgEntry* me, NetBase::AccessPointers* accessPointers ) { size_t length = me->GetUInt32(); @@ -2966,7 +2967,7 @@ ns.glyphs[1] = me->GetStr(); ns.glyphs[2] = me->GetStr(); ns.glyphs[3] = me->GetStr(); - ns.image = msgstringshash->Request(csStringID(me->GetUInt32())); + ns.image = accessPointers->Request(csStringID(me->GetUInt32())); spells.Push( ns ); } @@ -3014,7 +3015,7 @@ -csString psSpellBookMessage::ToString(AccessPointers * /*access_ptrs*/) +csString psSpellBookMessage::ToString(NetBase::AccessPointers * /*accessPointers*/) { csString msgtext; @@ -3056,7 +3057,7 @@ glyph = me->GetUInt32(); } -csString psPurifyGlyphMessage::ToString(AccessPointers * /*access_ptrs*/) +csString psPurifyGlyphMessage::ToString(NetBase::AccessPointers * /*accessPointers*/) { csString msgtext; @@ -3084,7 +3085,7 @@ kFactor = me->GetFloat(); } -csString psSpellCastMessage::ToString(AccessPointers * /*access_ptrs*/) +csString psSpellCastMessage::ToString(NetBase::AccessPointers * /*accessPointers*/) { csString msgtext; @@ -3153,7 +3154,7 @@ description = me->GetStr(); } -csString psGlyphAssembleMessage::ToString(AccessPointers * /*access_ptrs*/) +csString psGlyphAssembleMessage::ToString(NetBase::AccessPointers * /*accessPointers*/) { csString msgtext; @@ -3240,7 +3241,7 @@ } } -csString psRequestGlyphsMessage::ToString(AccessPointers * /*access_ptrs*/) +csString psRequestGlyphsMessage::ToString(NetBase::AccessPointers * /*accessPointers*/) { csString msgtext; @@ -3340,7 +3341,7 @@ valid = !(message->overrun); } -csString psEffectMessage::ToString(AccessPointers * /*access_ptrs*/) +csString psEffectMessage::ToString(NetBase::AccessPointers * /*accessPointers*/) { csString msgtext; @@ -3384,7 +3385,7 @@ valid=!(message->overrun); } -csString psGUITargetUpdateMessage::ToString(AccessPointers * /*access_ptrs*/) +csString psGUITargetUpdateMessage::ToString(NetBase::AccessPointers * /*accessPointers*/) { csString msgtext; @@ -3482,10 +3483,8 @@ z.zalloc = NULL; z.zfree = NULL; z.opaque = NULL; - z.next_in = (z_Byte*)data; - z.avail_in = (uInt)length; - z.next_out = (z_Byte*)buff; - z.avail_out = PACKING_BUFFSIZE; + z.avail_in = 0; // We pretend we don't have any data before after we call init + z.next_in = NULL; // Set if (inflateInit(&z) != Z_OK) @@ -3494,6 +3493,12 @@ return; } + // Fill inn points to the data we have. + z.next_in = (z_Byte*)data; + z.avail_in = (uInt)length; + z.next_out = (z_Byte*)buff; + z.avail_out = PACKING_BUFFSIZE; + // Go int res = inflate(&z,Z_FINISH); inflateEnd(&z); @@ -3534,7 +3539,7 @@ delete[] buff; } -csString psMsgStringsMessage::ToString(AccessPointers * /*access_ptrs*/) +csString psMsgStringsMessage::ToString(NetBase::AccessPointers * /*accessPointers*/) { csString msgtext; @@ -3545,7 +3550,7 @@ return msgtext; } - msgtext.AppendFmt(" No. Strings: %d", nstrings); + msgtext.AppendFmt(" Number of Strings: %d", nstrings); #ifdef FULL_DEBUG_DUMP uint32_t s = 1; @@ -3556,7 +3561,7 @@ { const char* string; it.Next(string); - msgtext.AppendFmt(" String %d: '%s',", s++, string); + msgtext.AppendFmt(", %d: '%s'", s++, string); } } #endif @@ -3604,7 +3609,7 @@ valid=!(message->overrun); } -csString psCharacterDataMessage::ToString(AccessPointers * /*access_ptrs*/) +csString psCharacterDataMessage::ToString(NetBase::AccessPointers * /*accessPointers*/) { csString msgtext; @@ -3709,7 +3714,7 @@ } -csString psCombatEventMessage::ToString(AccessPointers * /*access_ptrs*/) +csString psCombatEventMessage::ToString(NetBase::AccessPointers * /*accessPointers*/) { csString msgtext; @@ -3742,7 +3747,7 @@ valid=!(msg->overrun); } -csString psSoundEventMessage::ToString(AccessPointers * /*access_ptrs*/) +csString psSoundEventMessage::ToString(NetBase::AccessPointers * /*accessPointers*/) { csString msgtext; @@ -3762,15 +3767,19 @@ msg->clientnum = clientnum; msg->SetType(MSGTYPE_STATDRUPDATE); - msg->Add(eid.Unbox()); - msg->Add((uint32_t) flags); + msg->Add( eid.Unbox() ); + msg->Add( (uint32_t)flags ); for (size_t i = 0; i < fVitals.GetSize(); i++) + { msg->Add(fVitals[i]); + } for (size_t i = 0; i < uiVitals.GetSize(); i++) + { msg->Add(uiVitals[i]); + } - msg->Add((uint8_t) version); + msg->Add((uint8_t)version); msg->ClipToCurrentSize(); @@ -3790,83 +3799,139 @@ psStatDRMessage::psStatDRMessage(MsgEntry* me) { entityid = EID(me->GetUInt32()); - statsDirty = me->GetUInt32(); + if (me->GetSize() <= 0) + { + request = true; + return; + } + else + { + request = false; + + statsDirty = me->GetUInt32(); + + if (statsDirty & DIRTY_VITAL_HP) + { + hp = me->GetFloat(); + } + + if (statsDirty & DIRTY_VITAL_HP_RATE) + { + hp_rate = me->GetFloat(); + } + + if (statsDirty & DIRTY_VITAL_MANA) + { + mana = me->GetFloat(); + } + + if (statsDirty & DIRTY_VITAL_MANA_RATE) + { + mana_rate = me->GetFloat(); + } + + if (statsDirty & DIRTY_VITAL_PYSSTAMINA) + { + pstam = me->GetFloat(); + } - if (statsDirty & DIRTY_VITAL_HP) - hp = me->GetFloat(); - - if (statsDirty & DIRTY_VITAL_HP_RATE) - hp_rate = me->GetFloat(); - - if (statsDirty & DIRTY_VITAL_MANA) - mana = me->GetFloat(); - - if (statsDirty & DIRTY_VITAL_MANA_RATE) - mana_rate = me->GetFloat(); - - if (statsDirty & DIRTY_VITAL_PYSSTAMINA) - pstam = me->GetFloat(); - - if (statsDirty & DIRTY_VITAL_PYSSTAMINA_RATE) - pstam_rate = me->GetFloat(); - - if (statsDirty & DIRTY_VITAL_MENSTAMINA) - mstam = me->GetFloat(); - - if (statsDirty & DIRTY_VITAL_MENSTAMINA_RATE) - mstam_rate = me->GetFloat(); - - if (statsDirty & DIRTY_VITAL_EXPERIENCE) - exp = me->GetInt32(); - - if (statsDirty & DIRTY_VITAL_PROGRESSION) - prog = me->GetInt32(); - - counter = me->GetUInt8(); - + if (statsDirty & DIRTY_VITAL_PYSSTAMINA_RATE) + { + pstam_rate = me->GetFloat(); + } + + if (statsDirty & DIRTY_VITAL_MENSTAMINA) + { + mstam = me->GetFloat(); + } + + if (statsDirty & DIRTY_VITAL_MENSTAMINA_RATE) + { + mstam_rate = me->GetFloat(); + } + + if (statsDirty & DIRTY_VITAL_EXPERIENCE) + { + exp = me->GetInt32(); + } + + if (statsDirty & DIRTY_VITAL_PROGRESSION) + { + prog = me->GetInt32(); + } + + counter = me->GetUInt8(); + } + valid=!(me->overrun); } -csString psStatDRMessage::ToString(AccessPointers * /*access_ptrs*/) +csString psStatDRMessage::ToString(NetBase::AccessPointers * /*accessPointers*/) { csString msgtext; + if(request) + { + msgtext.AppendFmt("Request for StatDR Update"); + } + else + { + msgtext.AppendFmt("Ent: %d", entityid.Unbox()); - msgtext.AppendFmt("Ent: %d", entityid.Unbox()); + msgtext.AppendFmt(" Dirty: %X ", statsDirty); - msgtext.AppendFmt(" Dirty: %d ",statsDirty); - - if (statsDirty & DIRTY_VITAL_HP) - msgtext.AppendFmt(" HP: %.2f",hp); - - if (statsDirty & DIRTY_VITAL_HP_RATE) - msgtext.AppendFmt(" HP RATE: %.2f",hp_rate); - - if (statsDirty & DIRTY_VITAL_MANA) - msgtext.AppendFmt(" MANA: %.2f",mana); - - if (statsDirty & DIRTY_VITAL_MANA_RATE) - msgtext.AppendFmt(" MANA RATE: %.2f",mana_rate); - - if (statsDirty & DIRTY_VITAL_PYSSTAMINA) - msgtext.AppendFmt(" PYSSTA: %.2f",pstam); - - if (statsDirty & DIRTY_VITAL_PYSSTAMINA_RATE) - msgtext.AppendFmt(" PYSSTA RATE: %.2f",pstam_rate); - - if (statsDirty & DIRTY_VITAL_MENSTAMINA) - msgtext.AppendFmt(" MENSTA: %.2f",mstam); - - if (statsDirty & DIRTY_VITAL_MENSTAMINA_RATE) - msgtext.AppendFmt(" MENSTA RATE: %.2f",mstam_rate); - - if (statsDirty & DIRTY_VITAL_EXPERIENCE) - msgtext.AppendFmt(" EXP: %.2f",exp); - - if (statsDirty & DIRTY_VITAL_PROGRESSION) - msgtext.AppendFmt(" PP: %.2f",prog); - - msgtext.AppendFmt(" C: %d",counter); - + if (statsDirty & DIRTY_VITAL_HP) + { + msgtext.AppendFmt(" HP: %.2f",hp); + } + + if (statsDirty & DIRTY_VITAL_HP_RATE) + { + msgtext.AppendFmt(" HP RATE: %.2f",hp_rate); + } + + if (statsDirty & DIRTY_VITAL_MANA) + { + msgtext.AppendFmt(" MANA: %.2f",mana); + } + + if (statsDirty & DIRTY_VITAL_MANA_RATE) + { + msgtext.AppendFmt(" MANA RATE: %.2f",mana_rate); + } + + if (statsDirty & DIRTY_VITAL_PYSSTAMINA) + { + msgtext.AppendFmt(" PYSSTA: %.2f",pstam); + } + + if (statsDirty & DIRTY_VITAL_PYSSTAMINA_RATE) + { + msgtext.AppendFmt(" PYSSTA RATE: %.2f",pstam_rate); + } + + if (statsDirty & DIRTY_VITAL_MENSTAMINA) + { + msgtext.AppendFmt(" MENSTA: %.2f",mstam); + } + + if (statsDirty & DIRTY_VITAL_MENSTAMINA_RATE) + { + msgtext.AppendFmt(" MENSTA RATE: %.2f",mstam_rate); + } + + if (statsDirty & DIRTY_VITAL_EXPERIENCE) + { + msgtext.AppendFmt(" EXP: %.2f",exp); + } + + if (statsDirty & DIRTY_VITAL_PROGRESSION) + { + msgtext.AppendFmt(" PP: %.2f",prog); + } + + msgtext.AppendFmt(" C: %d",counter); + } + return msgtext; } @@ -3898,23 +3963,35 @@ psStatsMessage::psStatsMessage( MsgEntry* me ) { - if ( !me ) - return; + if(me->GetSize() <= 0) + { + request = true; + } + else + { + request = false; - hp = me->GetFloat(); - mana = me->GetFloat(); - weight = me->GetFloat(); - capacity = me->GetFloat(); + hp = me->GetFloat(); + mana = me->GetFloat(); + weight = me->GetFloat(); + capacity = me->GetFloat(); + } } -csString psStatsMessage::ToString(AccessPointers * /*access_ptrs*/) +csString psStatsMessage::ToString(NetBase::AccessPointers * /*accessPointers*/) { csString msgtext; + if (request) + { + msgtext.AppendFmt("Request for Stats"); + } + else + { + msgtext.AppendFmt("HP: %.3f Mana: %.3f Weight: %.3f Capacity: %.3f", + hp, mana, weight, capacity ); + } - msgtext.AppendFmt("HP: %.3f Mana: %.3f Weight: %.3f Capacity: %.3f", - hp, mana, weight, capacity ); - return msgtext; } @@ -4057,7 +4134,7 @@ valid=!(message->overrun); } -csString psGUISkillMessage::ToString(AccessPointers * /*access_ptrs*/) +csString psGUISkillMessage::ToString(NetBase::AccessPointers * /*accessPointers*/) { csString msgtext; @@ -4225,7 +4302,7 @@ valid=!(message->overrun); } -csString psGUIBankingMessage::ToString(AccessPointers * /*access_ptrs*/) +csString psGUIBankingMessage::ToString(NetBase::AccessPointers * /*accessPointers*/) { csString msgtext; @@ -4363,7 +4440,7 @@ valid=!(message->overrun); } -csString psPetSkillMessage::ToString(AccessPointers * /*access_ptrs*/) +csString psPetSkillMessage::ToString(NetBase::AccessPointers * /*accessPointers*/) { csString msgtext; @@ -4388,9 +4465,9 @@ //-------------------------------------------------------------------------------- -PSF_IMPLEMENT_MSG_FACTORY3(psDRMessage,MSGTYPE_DEAD_RECKONING); +PSF_IMPLEMENT_MSG_FACTORY_ACCESS_POINTER(psDRMessage,MSGTYPE_DEAD_RECKONING); -void psDRMessage::CreateMsgEntry(uint32_t client, csStringSet* msgstrings, csStringHashReversible* msgstringshash, +void psDRMessage::CreateMsgEntry(uint32_t client, NetBase::AccessPointers* accessPointers, iSector *sector, csString sectorName) { if (sector) @@ -4398,15 +4475,7 @@ sectorName = sector->QueryObject()->GetName(); } - csStringID sectorNameStrId = csInvalidStringID; - if (msgstrings) - { - sectorNameStrId = msgstrings ? msgstrings->Request(sectorName.GetDataSafe()) : csInvalidStringID; - } - else if (msgstringshash) - { - sectorNameStrId = msgstrings ? msgstringshash->Request(sectorName.GetDataSafe()) : csInvalidStringID; - } + csStringID sectorNameStrId = accessPointers->Request(sectorName.GetDataSafe()); int sectorNameLen = (sectorNameStrId == csInvalidStringID) ? sectorName.Length() : 0; @@ -4417,17 +4486,17 @@ } psDRMessage::psDRMessage(uint32_t client, EID mappedid, uint8_t counter, - csStringSet* msgstrings, csStringHashReversible* msgstringshash, + NetBase::AccessPointers* accessPointers, psLinearMovement *linmove, uint8_t mode) { float speed; linmove->GetDRData(on_ground,speed,pos,yrot,sector,vel,worldVel,ang_vel); - CreateMsgEntry(client, msgstrings, msgstringshash, sector, csString()); + CreateMsgEntry(client, accessPointers, sector, csString()); WriteDRInfo(client, mappedid, on_ground, mode, counter, pos, yrot, sector, csString(), - vel,worldVel, ang_vel, msgstrings); + vel,worldVel, ang_vel, accessPointers->msgstrings); // Sets valid flag based on message overrun state valid=!(msg->overrun); @@ -4437,13 +4506,13 @@ bool on_ground, uint8_t mode, uint8_t counter, const csVector3& pos, float yrot,iSector *sector, csString sectorName, const csVector3& vel, csVector3& worldVel, float ang_vel, - csStringSet* msgstrings, csStringHashReversible* msgstringshash) + NetBase::AccessPointers* accessPointers) { - CreateMsgEntry(client, msgstrings, msgstringshash, sector, sectorName); + CreateMsgEntry(client, accessPointers, sector, sectorName); WriteDRInfo(client, mappedid, on_ground, mode, counter, pos, yrot, sector, sectorName, - vel,worldVel, ang_vel ,msgstrings); + vel,worldVel, ang_vel , accessPointers->msgstrings); // Sets valid flag based on message overrun state valid=!(msg->overrun); @@ -4483,7 +4552,7 @@ sectorName = sector->QueryObject()->GetName(); csStringID sectorNameStrId = msgstrings ? msgstrings->Request(sectorName) : csInvalidStringID; - msg->Add(mappedid.Unbox()); + msg->Add( mappedid.Unbox() ); msg->Add( counter ); if (on_ground) @@ -4525,17 +4594,17 @@ msg->ClipToCurrentSize(); } -psDRMessage::psDRMessage( void *data, int size, csStringSet* msgstrings, csStringHashReversible* msgstringshash, iEngine *engine) +psDRMessage::psDRMessage( void *data, int size, NetBase::AccessPointers* accessPointers ) { msg.AttachNew(new MsgEntry(size,PRIORITY_HIGH)); memcpy(msg->bytes->payload,data,size); - ReadDRInfo(msg,msgstrings,msgstringshash,engine); + ReadDRInfo(msg, accessPointers); } -psDRMessage::psDRMessage(MsgEntry* me, csStringSet* msgstrings, csStringHashReversible* msgstringshash, iEngine *engine) +psDRMessage::psDRMessage(MsgEntry* me, NetBase::AccessPointers* accessPointers ) { msg = NULL; - ReadDRInfo(me,msgstrings,msgstringshash,engine); + ReadDRInfo(me,accessPointers); } void psDRMessage::operator=(psDRMessage& other) @@ -4552,7 +4621,7 @@ // sectorName = other.sectorName; } -void psDRMessage::ReadDRInfo(MsgEntry* me, csStringSet* msgstrings, csStringHashReversible* msgstringshash, iEngine *engine) +void psDRMessage::ReadDRInfo(MsgEntry* me, NetBase::AccessPointers* accessPointers) { entityid = me->GetUInt32(); counter = me->GetUInt8(); @@ -4588,11 +4657,8 @@ yrot *= TWO_PI/256; csStringID sectorNameStrId = (csStringID)me->GetUInt32(); - if(msgstrings) - sectorName = (sectorNameStrId != csInvalidStringID) ? msgstrings->Request(sectorNameStrId) : me->GetStr() ; - else if(msgstringshash) - sectorName = (sectorNameStrId != csInvalidStringID) ? msgstringshash->Request(sectorNameStrId) : me->GetStr() ; - sector = (sectorName.Length()) ? engine->GetSectors()->FindByName(sectorName) : NULL ; + sectorName = (sectorNameStrId != csInvalidStringID) ? accessPointers->Request(sectorNameStrId) : me->GetStr() ; + sector = (sectorName.Length()) ? accessPointers->engine->GetSectors()->FindByName(sectorName) : NULL ; } bool psDRMessage::IsNewerThan(uint8_t oldCounter) @@ -4605,7 +4671,7 @@ return (uint8_t)(counter-oldCounter) <= 127; } -csString psDRMessage::ToString(AccessPointers * /*access_ptrs*/) +csString psDRMessage::ToString(NetBase::AccessPointers * /*accessPointers*/) { csString msgtext; @@ -4629,7 +4695,7 @@ //-------------------------------------------------------------------------------- -PSF_IMPLEMENT_MSG_FACTORY3(psForcePositionMessage, MSGTYPE_FORCE_POSITION); +PSF_IMPLEMENT_MSG_FACTORY_ACCESS_POINTER(psForcePositionMessage, MSGTYPE_FORCE_POSITION); psForcePositionMessage::psForcePositionMessage(uint32_t client, uint8_t sequenceNumber, const csVector3 & pos, float yRot, iSector *sector, @@ -4667,17 +4733,14 @@ valid=!(msg->overrun); } -psForcePositionMessage::psForcePositionMessage(MsgEntry *me, csStringSet *msgstrings, csStringHashReversible* msgstringshash, iEngine *engine) +psForcePositionMessage::psForcePositionMessage(MsgEntry *me, NetBase::AccessPointers* accessPointers) { pos = me->GetVector(); yrot = me->GetFloat(); csStringID sectorNameStrId = (csStringID) me->GetUInt32(); - if(msgstrings) - sectorName = sectorNameStrId != csInvalidStringID ? msgstrings->Request(sectorNameStrId) : me->GetStr(); - else if(msgstringshash) - sectorName = sectorNameStrId != csInvalidStringID ? msgstringshash->Request(sectorNameStrId) : me->GetStr(); - sector = !sectorName.IsEmpty() ? engine->GetSectors()->FindByName(sectorName) : NULL; + sectorName = sectorNameStrId != csInvalidStringID ? accessPointers->Request(sectorNameStrId) : me->GetStr(); + sector = !sectorName.IsEmpty() ? accessPointers->engine->GetSectors()->FindByName(sectorName) : NULL; loadTime = me->GetUInt32(); backgroundname = me->GetStr(); @@ -4699,7 +4762,7 @@ sector = other.sector; } -csString psForcePositionMessage::ToString(AccessPointers * /*access_ptrs*/) +csString psForcePositionMessage::ToString(NetBase::AccessPointers * /*accessPointers*/) { csString msgtext; msgtext.AppendFmt("Sector: %s ", sectorName.GetDataSafe()); @@ -4723,7 +4786,7 @@ { } -csString psPersistWorldRequest::ToString(AccessPointers* /*access_ptrs*/) +csString psPersistWorldRequest::ToString(NetBase::AccessPointers* /*accessPointers*/) { csString msgtext; @@ -4750,7 +4813,7 @@ { } -csString psRequestAllObjects::ToString(AccessPointers* /*access_ptrs*/) +csString psRequestAllObjects::ToString(NetBase::AccessPointers* /*accessPointers*/) { csString msgtext; @@ -4785,7 +4848,7 @@ sector = me->GetStr(); } -csString psPersistWorld::ToString(AccessPointers* /*access_ptrs*/) +csString psPersistWorld::ToString(NetBase::AccessPointers* /*accessPointers*/) { csString msgtext; @@ -4803,7 +4866,7 @@ { } -csString psPersistActorRequest::ToString(AccessPointers* /*access_ptrs*/) +csString psPersistActorRequest::ToString(NetBase::AccessPointers* /*accessPointers*/) { csString msgtext; @@ -4822,7 +4885,7 @@ msg = me; } -csString psPersistAllEntities::ToString(AccessPointers* /*access_ptrs*/) +csString psPersistAllEntities::ToString(NetBase::AccessPointers* /*accessPointers*/) { return "PersistAllEntities"; } @@ -4859,7 +4922,7 @@ //-------------------------------------------------------------------------- -PSF_IMPLEMENT_MSG_FACTORY3(psPersistActor,MSGTYPE_PERSIST_ACTOR); +PSF_IMPLEMENT_MSG_FACTORY_ACCESS_POINTER(psPersistActor,MSGTYPE_PERSIST_ACTOR); psPersistActor::psPersistActor( uint32_t clientNum, int type, @@ -4919,11 +4982,11 @@ msg->Add( msgstrings->Request(race).GetHash() ); msg->Add( msgstrings->Request(mountFactname).GetHash() ); msg->Add( msgstrings->Request(MounterAnim).GetHash() ); - msg->Add ( gender ); + msg->Add( gender ); msg->Add( helmGroup ); - msg->Add(BracerGroup); - msg->Add(BeltGroup); - msg->Add(CloakGroup); + msg->Add( BracerGroup ); + msg->Add( BeltGroup ); + msg->Add( CloakGroup ); msg->Add( collTop ); msg->Add( collBottom ); msg->Add( collOffSet ); @@ -4959,9 +5022,9 @@ msg->ClipToCurrentSize(); } -psPersistActor::psPersistActor( MsgEntry* me, csStringSet* msgstrings, csStringHashReversible* msgstringshash, iEngine *engine, bool forNPClient ) +psPersistActor::psPersistActor( MsgEntry* me, NetBase::AccessPointers* accessPointers, bool forNPClient ) { - ReadDRInfo(me, msgstrings, msgstringshash, engine); + ReadDRInfo(me, accessPointers); type = me->GetUInt32(); masqueradeType = me->GetUInt32(); @@ -4971,22 +5034,11 @@ if ( guild == " " ) guild.Clear(); - if(msgstrings) - { - factname = msgstrings->Request(csStringID(me->GetUInt32())); - matname = msgstrings->Request(csStringID(me->GetUInt32())); - race = msgstrings->Request(csStringID(me->GetUInt32())); - mountFactname = msgstrings->Request(csStringID(me->GetUInt32())); - MounterAnim = msgstrings->Request(csStringID(me->GetUInt32())); - } - else if(msgstringshash) - { - factname = msgstringshash->Request(csStringID(me->GetUInt32())); - matname = msgstringshash->Request(csStringID(me->GetUInt32())); - race = msgstringshash->Request(csStringID(me->GetUInt32())); - mountFactname = msgstringshash->Request(csStringID(me->GetUInt32())); - MounterAnim = msgstringshash->Request(csStringID(me->GetUInt32())); - } + factname = accessPointers->Request(csStringID(me->GetUInt32())); + matname = accessPointers->Request(csStringID(me->GetUInt32())); + race = accessPointers->Request(csStringID(me->GetUInt32())); + mountFactname = accessPointers->Request(csStringID(me->GetUInt32())); + MounterAnim = accessPointers->Request(csStringID(me->GetUInt32())); gender = me->GetInt16(); helmGroup = me->GetStr(); @@ -5022,11 +5074,11 @@ csString msgtext; } -csString psPersistActor::ToString(AccessPointers * access_ptrs) +csString psPersistActor::ToString(NetBase::AccessPointers * accessPointers) { csString msgtext; - msgtext.AppendFmt("DR: %s ", psDRMessage::ToString(access_ptrs).GetData() ); + msgtext.AppendFmt("DR: %s ", psDRMessage::ToString(accessPointers).GetData() ); msgtext.AppendFmt(" Type: %d",type); msgtext.AppendFmt(" MaskType: %d",masqueradeType); msgtext.AppendFmt(" Control: %s",(control?"true":"false")); @@ -5066,7 +5118,7 @@ //------------------------------------------------------------------------------ -PSF_IMPLEMENT_MSG_FACTORY4(psPersistItem,MSGTYPE_PERSIST_ITEM); +PSF_IMPLEMENT_MSG_FACTORY_ACCESS_POINTER(psPersistItem,MSGTYPE_PERSIST_ITEM); psPersistItem::psPersistItem( uint32_t clientNum, EID eid, @@ -5087,7 +5139,7 @@ msg->SetType(MSGTYPE_PERSIST_ITEM); msg->clientnum = clientNum; - msg->Add(eid.Unbox()); + msg->Add( eid.Unbox() ); msg->Add( (uint32_t) type ); msg->Add( name ); msg->Add( msgstrings->Request(factname).GetHash() ); @@ -5106,14 +5158,14 @@ } -psPersistItem::psPersistItem( MsgEntry* me, csStringHashReversible* msgstrings ) +psPersistItem::psPersistItem( MsgEntry* me, NetBase::AccessPointers * accessPointers ) { eid = EID(me->GetUInt32()); type = me->GetUInt32(); name = me->GetStr(); - factname = msgstrings->Request(csStringID(me->GetUInt32())); - matname = msgstrings->Request(csStringID(me->GetUInt32())); - sector = msgstrings->Request(csStringID(me->GetUInt32())); + factname = accessPointers->Request(csStringID(me->GetUInt32())); + matname = accessPointers->Request(csStringID(me->GetUInt32())); + sector = accessPointers->Request(csStringID(me->GetUInt32())); pos = me->GetVector(); xRot = me->GetFloat(); yRot = me->GetFloat(); @@ -5128,7 +5180,7 @@ } } -csString psPersistItem::ToString(AccessPointers * /*access_ptrs*/) +csString psPersistItem::ToString(NetBase::AccessPointers * /*accessPointers*/) { csString msgtext; @@ -5178,7 +5230,7 @@ mesh = me->GetStr(); } -csString psPersistActionLocation::ToString(AccessPointers * /*access_ptrs*/) +csString psPersistActionLocation::ToString(NetBase::AccessPointers * /*accessPointers*/) { csString msgtext; @@ -5208,7 +5260,7 @@ objectEID = EID(me->GetUInt32()); } -csString psRemoveObject::ToString(AccessPointers * /*access_ptrs*/) +csString psRemoveObject::ToString(Ne... [truncated message content] |