swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-09-28 13:12:56 -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/shared/library/sharedNetworkMessages/src/shared/chat/ChatInviteGroupMembersToRoom.cpp
+1 -1
View File
@@ -10,7 +10,7 @@
//-----------------------------------------------------------------------
ChatInviteGroupMembersToRoom::ChatInviteGroupMembersToRoom(const NetworkId & i, const ChatAvatarId & g, const std::string & r, const stdvector<NetworkId>::fwd & m) :
ChatInviteGroupMembersToRoom::ChatInviteGroupMembersToRoom(const NetworkId & i, const ChatAvatarId & g, const std::string & r, const std::vector<NetworkId> & m) :
GameNetworkMessage("ChatInviteGroupMembersToRoom"),
invitorNetworkId(i),
groupLeaderId(g),
engine/shared/library/sharedNetworkMessages/src/shared/chat/ChatInviteGroupMembersToRoom.h
+2 -2
View File
@@ -17,14 +17,14 @@
class ChatInviteGroupMembersToRoom : public GameNetworkMessage
{
public:
ChatInviteGroupMembersToRoom(const NetworkId & invitor, const ChatAvatarId & groupLeaderId, const std::string & roomName, const stdvector<NetworkId>::fwd & members);
ChatInviteGroupMembersToRoom(const NetworkId & invitor, const ChatAvatarId & groupLeaderId, const std::string & roomName, const std::vector<NetworkId> & members);
explicit ChatInviteGroupMembersToRoom(Archive::ReadIterator & source);
~ChatInviteGroupMembersToRoom();
const NetworkId & getInvitorNetworkId() const;
const ChatAvatarId & getGroupLeaderId () const;
const std::string & getRoomName () const;
const stdvector<NetworkId>::fwd & getInvitedMembers () const;
const std::vector<NetworkId> & getInvitedMembers () const;
private:
ChatInviteGroupMembersToRoom & operator = (const ChatInviteGroupMembersToRoom & rhs);
engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AIDebuggingMessages.h
+6 -6
View File
@@ -212,10 +212,10 @@ public:
void setLocation(const Vector& v);
int getParent() const;
void setParent(int p);
const stdvector<int>::fwd& getChildren() const;
void setChildren(const stdvector<int>::fwd& c);
const stdvector<int>::fwd& getSiblings() const;
void setSiblings(const stdvector<int>::fwd& c);
const std::vector<int>& getChildren() const;
void setChildren(const std::vector<int>& c);
const std::vector<int>& getSiblings() const;
void setSiblings(const std::vector<int>& c);
int getType() const;
void setType(int t);
int getLevel() const;
@@ -348,8 +348,8 @@ public:
NetworkId const &getObjectId() const;
void setObjectId(NetworkId const & pathId);
stdvector<AIPathInfo_NodeInfo>::fwd const &getNodes() const;
void setNodes(stdvector<AIPathInfo_NodeInfo>::fwd const &n);
std::vector<AIPathInfo_NodeInfo> const &getNodes() const;
void setNodes(std::vector<AIPathInfo_NodeInfo> const &n);
private:
Archive::AutoVariable<NetworkId> m_objectId;
engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AttributeListMessage.h
+1 -1
View File
@@ -24,7 +24,7 @@ public:
static const char * const MessageType;
typedef std::pair<std::string, Unicode::String> AttributePair;
typedef stdvector<AttributePair>::fwd AttributeVector;
typedef std::vector<AttributePair> AttributeVector;
AttributeListMessage(NetworkId const & id, AttributeVector const & data, int const revision);
AttributeListMessage(std::string const & staticItemName, AttributeVector const & data, int const revision);
engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AuctionQueryHeadersResponseMessage.h
+2 -2
View File
@@ -26,8 +26,8 @@ public:
static const char * const MessageType;
typedef stdvector<Auction::ItemDataHeader>::fwd AuctionHeaderVector;
typedef stdvector<Auction::PalettizedItemDataHeader>::fwd PalettizedAuctionHeaderVector;
typedef std::vector<Auction::ItemDataHeader> AuctionHeaderVector;
typedef std::vector<Auction::PalettizedItemDataHeader> PalettizedAuctionHeaderVector;
AuctionQueryHeadersResponseMessage(int requestId, int typeFlag, AuctionHeaderVector const &auctionData, uint16 queryOffset, bool hasMorePages);
explicit AuctionQueryHeadersResponseMessage(Archive::ReadIterator &source);
engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/AuctionQueryResponseMessage.h
+1 -1
View File
@@ -40,7 +40,7 @@ class AuctionQueryResponseMessage : public GameNetworkMessage
{
public:
typedef AuctionQueryResponse_AuctionData AuctionData;
typedef stdvector<AuctionData>::fwd AuctionDataVector;
typedef std::vector<AuctionData> AuctionDataVector;
AuctionQueryResponseMessage(int requestId, int typeFlag, AuctionDataVector const &auctionData);
explicit AuctionQueryResponseMessage(Archive::ReadIterator &source);
engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ExpertiseRequestMessage.h
+3 -3
View File
@@ -21,8 +21,8 @@ public:
explicit ExpertiseRequestMessage(Archive::ReadIterator &source);
virtual ~ExpertiseRequestMessage();
stdvector<std::string>::fwd const &getAddExpertisesList() const;
void setAddExpertisesList(stdvector<std::string>::fwd const &addExpertisesList);
std::vector<std::string> const &getAddExpertisesList() const;
void setAddExpertisesList(std::vector<std::string> const &addExpertisesList);
bool getClearAllExpertisesFirst() const;
void setClearAllExpertisesFirst(bool clearAllExpertisesFirst);
@@ -38,7 +38,7 @@ private:
// ----------------------------------------------------------------------
inline stdvector<std::string>::fwd const &ExpertiseRequestMessage::getAddExpertisesList() const
inline std::vector<std::string> const &ExpertiseRequestMessage::getAddExpertisesList() const
{
return m_addExpertisesList.get();
}
engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/FactionResponseMessage.h
+3 -3
View File
@@ -26,7 +26,7 @@ public:
static const char * const MessageType;
FactionResponseMessage(int rebel, int imperial, int criminal, const stdvector<std::string>::fwd & npcFactionNameList, const stdvector<float>::fwd & npcFactionValueList);
FactionResponseMessage(int rebel, int imperial, int criminal, const std::vector<std::string> & npcFactionNameList, const std::vector<float> & npcFactionValueList);
explicit FactionResponseMessage(Archive::ReadIterator & source);
virtual ~FactionResponseMessage();
@@ -34,8 +34,8 @@ public:
int getFactionRebel () const;
int getFactionImperial() const;
int getFactionCriminal() const;
const stdvector<std::string>::fwd & getNPCFactionNames() const;
const stdvector<float>::fwd & getNPCFactionValues() const;
const std::vector<std::string> & getNPCFactionNames() const;
const std::vector<float> & getNPCFactionValues() const;
private:
Archive::AutoVariable<int> m_factionRebelValue;
engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/GetMapLocationsResponseMessage.h
+1 -1
View File
@@ -26,7 +26,7 @@ public:
static const char * const MessageType;
typedef stdvector<MapLocation>::fwd MapLocationVector;
typedef std::vector<MapLocation> MapLocationVector;
GetMapLocationsResponseMessage (const std::string &planetName, const MapLocationVector & locStatic, const MapLocationVector & locDynamic, const MapLocationVector & locPersist, int versionStatic, int versionDynamic, int versionPersist);
explicit GetMapLocationsResponseMessage (Archive::ReadIterator &source);
engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSchematics.h
+1 -1
View File
@@ -26,7 +26,7 @@ class MessageQueueDraftSchematics : public MessageQueue::Data
public:
typedef MessageQueueDraftSchematicsData SchematicData;
typedef stdvector<SchematicData>::fwd SchematicVector;
typedef std::vector<SchematicData> SchematicVector;
public:
engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSlots.h
+1 -1
View File
@@ -38,7 +38,7 @@ public:
int getSlotCount(void) const;
const Slot & getSlot(int index) const;
typedef stdvector<Slot>::fwd SlotVector;
typedef std::vector<Slot> SlotVector;
const SlotVector & getSlots() const;
void setSlots(const SlotVector & sv);
engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSlotsData.h
+1 -1
View File
@@ -21,7 +21,7 @@ class MessageQueueDraftSlotsData
{
public:
typedef MessageQueueDraftSlotsDataOption Option;
typedef stdvector<Option>::fwd OptionVector;
typedef std::vector<Option> OptionVector;
StringId name;
bool optional;
engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueDraftSlotsQueryResponse.h
+1 -1
View File
@@ -26,7 +26,7 @@ public:
typedef MessageQueueDraftSlotsData::Option Option;
typedef MessageQueueDraftSlotsData Slot;
typedef stdvector<Slot>::fwd SlotVector;
typedef std::vector<Slot> SlotVector;
public:
engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueHarvesterResourceData.h
+1 -1
View File
@@ -28,7 +28,7 @@ class MessageQueueHarvesterResourceData : public MessageQueue::Data
public:
typedef stdvector<InstallationResourceData>::fwd DataVector;
typedef std::vector<InstallationResourceData> DataVector;
MessageQueueHarvesterResourceData (const NetworkId & id, const DataVector & data);
virtual ~MessageQueueHarvesterResourceData();
engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueMissionListResponse.h
+1 -1
View File
@@ -23,7 +23,7 @@ class MessageQueueMissionListResponse : public MessageQueue::Data
public:
typedef MessageQueueMissionListResponseData DataElement;
typedef stdvector<DataElement>::fwd DataVector;
typedef std::vector<DataElement> DataVector;
public:
MessageQueueMissionListResponse();
engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueObjectMenuRequest.cpp
+1 -1
View File
@@ -30,7 +30,7 @@ void MessageQueueObjectMenuRequest::install()
//-----------------------------------------------------------------------
MessageQueueObjectMenuRequest::MessageQueueObjectMenuRequest (const NetworkId & targetId, const NetworkId & requestorId, const stdvector<ObjectMenuRequestData>::fwd & data, uint8 sequence) :
MessageQueueObjectMenuRequest::MessageQueueObjectMenuRequest (const NetworkId & targetId, const NetworkId & requestorId, const std::vector<ObjectMenuRequestData> & data, uint8 sequence) :
m_sequence (sequence),
m_data (data),
m_requestorId (requestorId),
engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueObjectMenuRequest.h
+4 -4
View File
@@ -36,10 +36,10 @@ class MessageQueueObjectMenuRequest : public MessageQueue::Data
public:
MessageQueueObjectMenuRequest (const NetworkId & id, const NetworkId & requestorId, const stdvector<ObjectMenuRequestData>::fwd & data, uint8 sequence);
MessageQueueObjectMenuRequest (const NetworkId & id, const NetworkId & requestorId, const std::vector<ObjectMenuRequestData> & data, uint8 sequence);
virtual ~MessageQueueObjectMenuRequest ();
const stdvector<ObjectMenuRequestData>::fwd & getData () const;
const std::vector<ObjectMenuRequestData> & getData () const;
const NetworkId & getRequestorId () const;
const NetworkId & getTargetId () const;
@@ -47,7 +47,7 @@ public:
private:
stdvector<ObjectMenuRequestData>::fwd m_data;
std::vector<ObjectMenuRequestData> m_data;
NetworkId m_requestorId;
NetworkId m_targetId;
@@ -58,7 +58,7 @@ private:
//----------------------------------------------------------------------
inline const stdvector<ObjectMenuRequestData>::fwd & MessageQueueObjectMenuRequest::getData () const
inline const std::vector<ObjectMenuRequestData> & MessageQueueObjectMenuRequest::getData () const
{
return m_data;
}
engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/MessageQueueResourceWeights.h
+3 -3
View File
@@ -30,8 +30,8 @@ public:
explicit MessageQueueResourceWeights (const std::pair<uint32, uint32> & combinedCrc);
virtual ~MessageQueueResourceWeights ();
typedef stdvector<std::pair<int, int> >::fwd WeightVector;
typedef stdvector<std::pair<int, WeightVector> >::fwd AttribWeightVector;
typedef std::vector<std::pair<int, int> > WeightVector;
typedef std::vector<std::pair<int, WeightVector> > AttribWeightVector;
void addAssemblyWeight (int attrib, int slot, int resource, int weight);
void addResourceMaxWeight (int attrib, int slot, int resource, int weight);
@@ -50,7 +50,7 @@ private:
AttribWeightVector m_assemblyWeights;
AttribWeightVector m_resourceMaxWeights;
std::pair<uint32, uint32> m_crc;
stdset<int>::fwd m_attribs;
std::set<int> m_attribs;
};
//----------------------------------------------------------------------
engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/PopulateMissionBrowserMessage.h
+3 -3
View File
@@ -22,14 +22,14 @@ class PopulateMissionBrowserMessage : public GameNetworkMessage
{
public:
PopulateMissionBrowserMessage(stdvector<NetworkId>::fwd const & missions);
PopulateMissionBrowserMessage(std::vector<NetworkId> const & missions);
explicit PopulateMissionBrowserMessage(Archive::ReadIterator &source);
~PopulateMissionBrowserMessage();
public: // methods
stdvector<NetworkId>::fwd const &getMissions() const;
std::vector<NetworkId> const &getMissions() const;
public: // types
@@ -39,7 +39,7 @@ private:
// ----------------------------------------------------------------------
inline stdvector<NetworkId>::fwd const & PopulateMissionBrowserMessage::getMissions() const
inline std::vector<NetworkId> const & PopulateMissionBrowserMessage::getMissions() const
{
return m_missions.get();
}
engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ResourceHarvesterActivatePageMessage.h
+1 -1
View File
@@ -27,7 +27,7 @@ public:
static const char * const MESSAGE_TYPE;
typedef stdvector<NetworkId>::fwd NetworkIdVector;
typedef std::vector<NetworkId> NetworkIdVector;
ResourceHarvesterActivatePageMessage (const NetworkId & harvesterId);
explicit ResourceHarvesterActivatePageMessage (Archive::ReadIterator & source);
engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/ServerUserInterfaceMessages.h
+1 -1
View File
@@ -78,7 +78,7 @@ public:
* could be a new widget description, an item for a data source, a property to set, etc.
*/
typedef SuiCreatePage_Command Command;
typedef stdvector<Command>::fwd CommandVector;
typedef std::vector<Command> CommandVector;
SuiCreatePage ();
explicit SuiCreatePage (Archive::ReadIterator & source);
engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/StatMigrationTargetsMessage.h
+2 -2
View File
@@ -19,13 +19,13 @@
class StatMigrationTargetsMessage : public GameNetworkMessage
{
public:
StatMigrationTargetsMessage(const stdvector<int>::fwd& targets, int pointsLeft);
StatMigrationTargetsMessage(const std::vector<int>& targets, int pointsLeft);
explicit StatMigrationTargetsMessage(Archive::ReadIterator &source);
~StatMigrationTargetsMessage();
public: // methods
int getPointsLeft() const;
stdvector<int>::fwd getTargets () const;
std::vector<int> getTargets () const;
public:
static const char* const cms_name;
engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/WhoListMessage.cpp
+1 -1
View File
@@ -35,7 +35,7 @@ m_data ()
//-----------------------------------------------------------------------
void WhoListMessage::setData (const stdvector<Unicode::String>::fwd & data)
void WhoListMessage::setData (const std::vector<Unicode::String> & data)
{
m_data.set (data);
}
engine/shared/library/sharedNetworkMessages/src/shared/clientGameServer/WhoListMessage.h
+3 -3
View File
@@ -32,8 +32,8 @@ public:
explicit WhoListMessage (Archive::ReadIterator & source);
virtual ~WhoListMessage ();
const stdvector<Unicode::String>::fwd & getDataArray () const;
void setData (const stdvector<Unicode::String>::fwd & data);
const std::vector<Unicode::String> & getDataArray () const;
void setData (const std::vector<Unicode::String> & data);
private:
@@ -46,7 +46,7 @@ private:
//-----------------------------------------------------------------------
inline const stdvector<Unicode::String>::fwd & WhoListMessage::getDataArray () const
inline const std::vector<Unicode::String> & WhoListMessage::getDataArray () const
{
return m_data.get ();
}
engine/shared/library/sharedNetworkMessages/src/shared/planetWatch/PlanetNodeStatusMessage.cpp
+1 -1
View File
@@ -45,7 +45,7 @@ void PlanetNodeStatusMessage::getData(std::vector<PlanetNodeStatusMessageData> &
// ======================================================================
PlanetNodeStatusMessageData::PlanetNodeStatusMessageData(int x, int z, bool loaded, const stdvector<uint32>::fwd &servers, const stdvector<int>::fwd &subscriptionCounts) :
PlanetNodeStatusMessageData::PlanetNodeStatusMessageData(int x, int z, bool loaded, const std::vector<uint32> &servers, const std::vector<int> &subscriptionCounts) :
m_x(x),m_z(z),m_loaded(loaded),m_servers(servers),m_subscriptionCounts(subscriptionCounts)
{
}
engine/shared/library/sharedNetworkMessages/src/shared/planetWatch/PlanetNodeStatusMessage.h
+1 -1
View File
@@ -25,7 +25,7 @@ class PlanetNodeStatusMessageData
std::vector<int> m_subscriptionCounts;
public:
PlanetNodeStatusMessageData(int x, int z, bool loaded, const stdvector<uint32>::fwd &servers, const stdvector<int>::fwd &subscriptionCounts);
PlanetNodeStatusMessageData(int x, int z, bool loaded, const std::vector<uint32> &servers, const std::vector<int> &subscriptionCounts);
PlanetNodeStatusMessageData();
};