swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-10-01 16:13:19 -04:00
Code Issues Projects Releases Wiki Activity

persister cleanup (still broke but logic is there for when it isn't); also replace all the SOE BS for forwarding stl port with native object classes because i thought that may be part of the problem...

Browse Source
This commit is contained in:
DarthArgus
2016-12-10 23:17:06 +00:00
parent 688ab3fc9e
commit 8e94519082
450 changed files with 1287 additions and 1494 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/server/library/serverNetworkMessages/src/shared/AvatarList.h
+1 -1
View File
@@ -29,7 +29,7 @@ struct AvatarRecord
// ======================================================================
typedef stdvector<AvatarRecord>::fwd AvatarList;
typedef std::vector<AvatarRecord> AvatarList;
// ======================================================================
engine/server/library/serverNetworkMessages/src/shared/centralGameServer/MessageToPayload.h
+2 -2
View File
@@ -44,7 +44,7 @@ public:
public:
MessageToPayload(const NetworkId &networkId, const MessageToId &messageId, const std::string &method, const std::string &packedData, unsigned long callTime, bool guaranteed, DeliveryType deliveryType, NetworkId const & undeliveredCallbackObject, std::string const & undeliveredCallbackMethod, int recurringTime);
MessageToPayload(const NetworkId &networkId, const MessageToId &messageId, const std::string &method, const stdvector<int8>::fwd &packedData, unsigned long callTime, bool guaranteed, DeliveryType deliveryType, NetworkId const & undeliveredCallbackObject, std::string const & undeliveredCallbackMethod, int recurringTime);
MessageToPayload(const NetworkId &networkId, const MessageToId &messageId, const std::string &method, const std::vector<int8> &packedData, unsigned long callTime, bool guaranteed, DeliveryType deliveryType, NetworkId const & undeliveredCallbackObject, std::string const & undeliveredCallbackMethod, int recurringTime);
MessageToPayload(MessageToPayload const & rhs);
MessageToPayload();
~MessageToPayload();
@@ -66,7 +66,7 @@ public:
NetworkId const &getNetworkId() const;
MessageToId const &getMessageId() const;
std::string const &getMethod() const;
stdvector<int8>::fwd const &getPackedDataVector() const;
std::vector<int8> const &getPackedDataVector() const;
std::string getDataAsString() const;
unsigned long getCallTime() const;
bool getGuaranteed() const;
engine/server/library/serverNetworkMessages/src/shared/centralGameServer/MessageToPayloadImpl.h
+1 -1
View File
@@ -26,7 +26,7 @@ class MessageToPayloadImpl
{
public:
MessageToPayloadImpl(const NetworkId &networkId, const MessageToId &messageId, const std::string &method, const std::string &packedData, unsigned long callTime, bool guaranteed, MessageToPayload::DeliveryType deliveryType, NetworkId const & undeliveredCallbackObject, std::string const & undeliveredCallbackMethod, int recurringTime);
MessageToPayloadImpl(const NetworkId &networkId, const MessageToId &messageId, const std::string &method, const stdvector<int8>::fwd &packedData, unsigned long callTime, bool guaranteed, MessageToPayload::DeliveryType deliveryType, NetworkId const & undeliveredCallbackObject, std::string const & undeliveredCallbackMethod, int recurringTime);
MessageToPayloadImpl(const NetworkId &networkId, const MessageToId &messageId, const std::string &method, const std::vector<int8> &packedData, unsigned long callTime, bool guaranteed, MessageToPayload::DeliveryType deliveryType, NetworkId const & undeliveredCallbackObject, std::string const & undeliveredCallbackMethod, int recurringTime);
MessageToPayloadImpl();
~MessageToPayloadImpl();
engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AddResourceTypeMessage.cpp
+1 -1
View File
@@ -10,7 +10,7 @@
// ======================================================================
AddResourceTypeMessage::AddResourceTypeMessage(stdvector<AddResourceTypeMessageNamespace::ResourceTypeData>::fwd const &data) :
AddResourceTypeMessage::AddResourceTypeMessage(std::vector<AddResourceTypeMessageNamespace::ResourceTypeData> const &data) :
GameNetworkMessage("AddResourceTypeMessage"),
m_data()
{
engine/server/library/serverNetworkMessages/src/shared/gameGameServer/AddResourceTypeMessage.h
+2 -2
View File
@@ -39,11 +39,11 @@ namespace AddResourceTypeMessageNamespace
class AddResourceTypeMessage : public GameNetworkMessage
{
public:
AddResourceTypeMessage (stdvector<AddResourceTypeMessageNamespace::ResourceTypeData>::fwd const &data);
AddResourceTypeMessage (std::vector<AddResourceTypeMessageNamespace::ResourceTypeData> const &data);
AddResourceTypeMessage (Archive::ReadIterator & source);
~AddResourceTypeMessage ();
stdvector<AddResourceTypeMessageNamespace::ResourceTypeData>::fwd const & getData() const;
std::vector<AddResourceTypeMessageNamespace::ResourceTypeData> const & getData() const;
private:
Archive::AutoArray<AddResourceTypeMessageNamespace::ResourceTypeData> m_data;
engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CharacterNamesMessage.h
+1 -1
View File
@@ -21,7 +21,7 @@
class CharacterNamesMessage : public GameNetworkMessage
{
public:
CharacterNamesMessage(const stdvector<NetworkId>::fwd &ids, const stdvector<int>::fwd &stationIds, const stdvector<std::string>::fwd &characterNames, const stdvector<std::string>::fwd &characterFullNames, const stdvector<int>::fwd &createTimes, const stdvector<int>::fwd &loginTimes);
CharacterNamesMessage(const std::vector<NetworkId> &ids, const std::vector<int> &stationIds, const std::vector<std::string> &characterNames, const std::vector<std::string> &characterFullNames, const std::vector<int> &createTimes, const std::vector<int> &loginTimes);
CharacterNamesMessage(Archive::ReadIterator & source);
~CharacterNamesMessage();
engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CreateGroupMessage.cpp
+1 -1
View File
@@ -11,7 +11,7 @@
// ======================================================================
CreateGroupMessage::CreateGroupMessage(GroupMemberParam const & leader, stdvector<GroupMemberParam>::fwd const & members) :
CreateGroupMessage::CreateGroupMessage(GroupMemberParam const & leader, std::vector<GroupMemberParam> const & members) :
GameNetworkMessage("CreateGroupMessage"),
m_leader(leader),
m_members(members)
engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CreateGroupMessage.h
+4 -4
View File
@@ -20,19 +20,19 @@
class CreateGroupMessage: public GameNetworkMessage
{
public:
CreateGroupMessage(GroupMemberParam const &leader, stdvector<GroupMemberParam>::fwd const & members);
CreateGroupMessage(GroupMemberParam const &leader, std::vector<GroupMemberParam> const & members);
CreateGroupMessage(Archive::ReadIterator &source);
~CreateGroupMessage();
GroupMemberParam const & getLeader() const;
stdvector<GroupMemberParam>::fwd const & getMembers() const;
std::vector<GroupMemberParam> const & getMembers() const;
private:
CreateGroupMessage(CreateGroupMessage const &);
CreateGroupMessage &operator=(CreateGroupMessage const &);
Archive::AutoVariable<GroupMemberParam> m_leader;
Archive::AutoVariable<stdvector<GroupMemberParam>::fwd > m_members;
Archive::AutoVariable<std::vector<GroupMemberParam> > m_members;
};
// ----------------------------------------------------------------------
@@ -44,7 +44,7 @@ inline GroupMemberParam const &CreateGroupMessage::getLeader() const
// ----------------------------------------------------------------------
inline stdvector<GroupMemberParam>::fwd const &CreateGroupMessage::getMembers() const
inline std::vector<GroupMemberParam> const &CreateGroupMessage::getMembers() const
{
return m_members.get();
}
engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CreateSyncUiMessage.h
+3 -3
View File
@@ -21,13 +21,13 @@
class CreateSyncUiMessage : public GameNetworkMessage
{
public:
CreateSyncUiMessage (const NetworkId& id, const stdvector<NetworkId>::fwd & clients);
CreateSyncUiMessage (const NetworkId& id, const std::vector<NetworkId> & clients);
CreateSyncUiMessage (Archive::ReadIterator & source);
~CreateSyncUiMessage ();
public:
const NetworkId& getId(void) const;
const stdvector<NetworkId>::fwd & getClients() const;
const std::vector<NetworkId> & getClients() const;
private:
Archive::AutoVariable<NetworkId> m_id; // id of the object
@@ -47,7 +47,7 @@ inline const NetworkId& CreateSyncUiMessage::getId(void) const
//-----------------------------------------------------------------------
inline const stdvector<NetworkId>::fwd & CreateSyncUiMessage::getClients() const
inline const std::vector<NetworkId> & CreateSyncUiMessage::getClients() const
{
return m_clients.get();
}
engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GetMoneyFromOfflineObjectMessage.cpp
+1 -1
View File
@@ -10,7 +10,7 @@
// ======================================================================
GetMoneyFromOfflineObjectMessage::GetMoneyFromOfflineObjectMessage(NetworkId const & sourceObject, int amount, NetworkId const & replyTo, std::string const & successCallback, std::string const & failCallback, stdvector<int8>::fwd const & packedDictionary, bool success) :
GetMoneyFromOfflineObjectMessage::GetMoneyFromOfflineObjectMessage(NetworkId const & sourceObject, int amount, NetworkId const & replyTo, std::string const & successCallback, std::string const & failCallback, std::vector<int8> const & packedDictionary, bool success) :
GameNetworkMessage("GetMoneyFromOfflineObjectMessage"),
m_sourceObject(sourceObject),
m_amount(amount),
engine/server/library/serverNetworkMessages/src/shared/gameGameServer/GetMoneyFromOfflineObjectMessage.h
+2 -2
View File
@@ -28,7 +28,7 @@
class GetMoneyFromOfflineObjectMessage : public GameNetworkMessage
{
public:
GetMoneyFromOfflineObjectMessage (NetworkId const & sourceObject, int amount, NetworkId const & replyTo, std::string const & successCallback, std::string const & failCallback, stdvector<int8>::fwd const & packedDictionary, bool success);
GetMoneyFromOfflineObjectMessage (NetworkId const & sourceObject, int amount, NetworkId const & replyTo, std::string const & successCallback, std::string const & failCallback, std::vector<int8> const & packedDictionary, bool success);
GetMoneyFromOfflineObjectMessage (Archive::ReadIterator & source);
~GetMoneyFromOfflineObjectMessage ();
@@ -38,7 +38,7 @@ class GetMoneyFromOfflineObjectMessage : public GameNetworkMessage
NetworkId const & getReplyTo() const;
std::string const & getSuccessCallback() const;
std::string const & getFailCallback() const;
stdvector<int8>::fwd const & getPackedDictionary() const;
std::vector<int8> const & getPackedDictionary() const;
bool getSuccess() const;
private:
engine/server/library/serverNetworkMessages/src/shared/gameGameServer/MessageQueuePvpCommand.h
+1 -1
View File
@@ -35,7 +35,7 @@ public:
int m_intParam2;
};
typedef stdvector<PvpCommand>::fwd PvpCommands;
typedef std::vector<PvpCommand> PvpCommands;
void addPvpCommand(uint32 command, NetworkId const &idParam, int intParam1, int intParam2);
PvpCommands const & getPvpCommands() const;