swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-10-08 23:12:52 -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/serverGame/src/shared/ai/AggroListProperty.h
+1 -1
View File
@@ -25,7 +25,7 @@ class AggroListProperty : public Property
{
public:
typedef stdset<CachedNetworkId>::fwd TargetList;
typedef std::set<CachedNetworkId> TargetList;
static int getAggroListPropertyResetTime();
static AggroListProperty * getAggroListProperty(Object & object);
engine/server/library/serverGame/src/shared/ai/AiCreatureCombatProfile.h
+1 -1
View File
@@ -20,7 +20,7 @@ public:
struct Action;
typedef stdvector<Action *>::fwd ActionList;
typedef std::vector<Action *> ActionList;
AiCreatureCombatProfile();
engine/server/library/serverGame/src/shared/ai/AiMovementLoiter.h
+1 -1
View File
@@ -85,7 +85,7 @@ protected:
, BCR_failure
};
typedef stdvector<AiLocation>::fwd CachedAiLocations;
typedef std::vector<AiLocation> CachedAiLocations;
AiLocation m_anchor;
AiLocation m_target;
engine/server/library/serverGame/src/shared/ai/AiMovementMove.h
+1 -1
View File
@@ -16,7 +16,7 @@ class PathGraph;
class PortalProperty;
class AiLocation;
typedef stdvector<int>::fwd IndexList;
typedef std::vector<int> IndexList;
// ======================================================================
// The simple move behavior moves to the waypoint, and then transitions
engine/server/library/serverGame/src/shared/ai/AiMovementPathFollow.h
+1 -1
View File
@@ -11,7 +11,7 @@
#include "serverGame/AiMovementWaypoint.h"
typedef stdlist<AiLocation>::fwd AiPath;
typedef std::list<AiLocation> AiPath;
class ServerPathBuilder;
// ======================================================================
engine/server/library/serverGame/src/shared/ai/AiMovementPatrol.h
+1 -1
View File
@@ -58,7 +58,7 @@ public:
protected:
stdvector<AiLocation>::fwd m_patrolPath;
std::vector<AiLocation> m_patrolPath;
bool m_random;
bool m_flip;
bool m_repeat;
engine/server/library/serverGame/src/shared/ai/HateList.h
+4 -4
View File
@@ -27,9 +27,9 @@ class HateList
{
public:
typedef stdmap<CachedNetworkId, float>::fwd UnSortedList;
typedef stdvector<std::pair<CachedNetworkId, float> >::fwd SortedList;
typedef stdset<CachedNetworkId>::fwd RecentList;
typedef std::map<CachedNetworkId, float> UnSortedList;
typedef std::vector<std::pair<CachedNetworkId, float> > SortedList;
typedef std::set<CachedNetworkId> RecentList;
static float getMaxDistanceToTarget();
@@ -92,7 +92,7 @@ private:
Archive::AutoDeltaVariable<float> m_maxHate;
Archive::AutoDeltaVariable<time_t> m_lastUpdateTime;
Archive::AutoDeltaVariable<time_t> m_autoExpireTargetDuration;
stdset<CachedNetworkId>::fwd m_recentHateList; // This is used for assist logic
std::set<CachedNetworkId> m_recentHateList; // This is used for assist logic
};
//----------------------------------------------------------------------
engine/server/library/serverGame/src/shared/ai/Squad.h
+2 -2
View File
@@ -23,8 +23,8 @@ public:
friend class SpaceSquadManager;
typedef stdmap<CachedNetworkId, PersistentCrcString const *>::fwd UnitMap;
typedef stdvector<CachedNetworkId>::fwd UnitList;
typedef std::map<CachedNetworkId, PersistentCrcString const *> UnitMap;
typedef std::vector<CachedNetworkId> UnitList;
static void install();
engine/server/library/serverGame/src/shared/behavior/AiShipAttackTargetList.h
+2 -2
View File
@@ -36,8 +36,8 @@ public:
AiShipAttackTargetEntry();
};
typedef stdmap<CachedNetworkId, AiShipAttackTargetEntry>::fwd TargetList;
typedef stdvector<std::pair<CachedNetworkId, AiShipAttackTargetEntry> >::fwd SortedTargetList;
typedef std::map<CachedNetworkId, AiShipAttackTargetEntry> TargetList;
typedef std::vector<std::pair<CachedNetworkId, AiShipAttackTargetEntry> > SortedTargetList;
public:
engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackFighter_Maneuver.h
+1 -1
View File
@@ -48,7 +48,7 @@ public:
// Path management.
class Path;
typedef stdvector<Path*>::fwd PathList;
typedef std::vector<Path*> PathList;
void addPath(Path * path);
Path * getCurrentPath();
bool selectNextPath();
engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackFighter_Maneuver_Path.h
+1 -1
View File
@@ -56,7 +56,7 @@ private:
Path();
virtual ~Path();
typedef stddeque<Node>::fwd NodeList;
typedef std::deque<Node> NodeList;
NodeList * const m_nodeList;
private: // Disabled.
engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorDock.h
+1 -1
View File
@@ -53,7 +53,7 @@ private:
static char const * getDockingStateString(DockingState const dockingState);
#endif // _DEBUG
typedef stdlist<Transform>::fwd HardPointList;
typedef std::list<Transform> HardPointList;
ShipController & m_shipController;
CachedNetworkId m_dockTarget;
engine/server/library/serverGame/src/shared/behavior/ShipTurretTargetingSystem.h
+1 -1
View File
@@ -54,7 +54,7 @@ class ShipTurretTargetingSystem
bool buildTargetList();
protected:
typedef stdmap<NetworkId, int>::fwd TurretsPerTargetType;
typedef std::map<NetworkId, int> TurretsPerTargetType;
private:
ShipController & m_shipController;
engine/server/library/serverGame/src/shared/city/CityInterface.h
+8 -8
View File
@@ -25,22 +25,22 @@ class Vector;
class CityInterface // static
{
public:
static stdvector<int>::fwd const &getCitizenOfCityId(NetworkId const &citizenId);
static std::vector<int> const &getCitizenOfCityId(NetworkId const &citizenId);
static int getMilitiaOfCityId(NetworkId const &citizenId);
static void getAllCityIds(stdvector<int>::fwd &results);
static void getAllCityIds(std::vector<int> &results);
static int findCityByName(std::string const &name);
static int findCityByCityHall(NetworkId const &cityHallId);
static int getCityAtLocation(std::string const &planetName, int x, int z, int radius);
static bool cityExists(int cityId);
static void getCitizenIds(int cityId, stdvector<NetworkId>::fwd &results);
static void getCitizenIds(int cityId, std::vector<NetworkId> &results);
static int getCitizenCount(int cityId);
static void getCityStructureIds(int cityId, stdvector<NetworkId>::fwd &results);
static void getCityStructureIds(int cityId, std::vector<NetworkId> &results);
static CityInfo const &getCityInfo(int cityId);
static stdmap<int, CityInfo>::fwd const &getAllCityInfo();
static std::map<int, CityInfo> const &getAllCityInfo();
static CitizenInfo const *getCitizenInfo(int cityId, NetworkId const &citizenId);
static stdmap<std::pair<int, NetworkId>, CitizenInfo>::fwd const &getAllCitizensInfo();
static std::map<std::pair<int, NetworkId>, CitizenInfo> const &getAllCitizensInfo();
static CityStructureInfo const *getCityStructureInfo(int cityId, NetworkId const &structureId);
static stdmap<std::pair<int, NetworkId>, CityStructureInfo>::fwd const & getAllCityStructuresInfo();
static std::map<std::pair<int, NetworkId>, CityStructureInfo> const & getAllCityStructuresInfo();
static std::map<std::pair<std::string, int>, uint32> const & getGcwRegionDefenderCities();
static std::map<std::string, std::pair<int, int> > const & getGcwRegionDefenderCitiesCount();
static int getGcwRegionDefenderCitiesVersion();
@@ -69,7 +69,7 @@ public:
static void addCitizenRank(int cityId, NetworkId const &citizenId, std::string const &rankName);
static void removeCitizenRank(int cityId, NetworkId const &citizenId, std::string const &rankName);
static bool hasCitizenRank(int cityId, NetworkId const &citizenId, std::string const &rankName);
static void getCitizenRank(int cityId, NetworkId const &citizenId, stdvector<std::string>::fwd &ranks);
static void getCitizenRank(int cityId, NetworkId const &citizenId, std::vector<std::string> &ranks);
static void setCitizenTitle(int cityId, NetworkId const &citizenId, std::string const &citizenTitle);
static void setCityStructureInfo(int cityId, NetworkId const &structureId, int structureType, bool structureValid);
static void enterCityChatRoom(int cityId, CreatureObject const &who);
engine/server/library/serverGame/src/shared/command/CommandQueue.cpp
+1 -1
View File
@@ -1294,7 +1294,7 @@ void CommandQueue::executeCommand(Command const &command, NetworkId const &targe
status = Command::CEC_Success;
static bool s_tradeAllowedCommandsInit = false;
typedef stdvector<uint32>::fwd Uint32Vector;
typedef std::vector<uint32> Uint32Vector;
static Uint32Vector s_tradeAllowedCommands;
if (!s_tradeAllowedCommandsInit)
engine/server/library/serverGame/src/shared/commoditiesMarket/CommoditiesMarket.h
+4 -4
View File
@@ -86,14 +86,14 @@ public:
static void updateVendorStatus(const NetworkId & vendorId, int status);
static void updateVendorLocation(const ServerObject & vendor);
static void updateItemTypeMap(int itemTypeMapVersionNumber, const stdmap<int, stdset<int>::fwd >::fwd & itemTypeMap);
static void updateItemTypeMap(int itemTypeMapVersionNumber, const std::map<int, std::set<int> > & itemTypeMap);
static void updateItemTypeMap(int itemTypeMapVersionNumber, int itemType, int itemTemplateId);
static const stdmap<int, stdmap<int, std::pair<int, StringId> >::fwd >::fwd & getItemTypeMap();
static const std::map<int, std::map<int, std::pair<int, StringId> > > & getItemTypeMap();
static int getItemTypeMapVersionNumber();
static void updateResourceTypeMap(int resourceTypeMapVersionNumber, const stdmap<int, stdset<std::string>::fwd >::fwd & resourceTypeMap);
static void updateResourceTypeMap(int resourceTypeMapVersionNumber, const std::map<int, std::set<std::string> > & resourceTypeMap);
static void updateResourceTypeMap(int resourceTypeMapVersionNumber, int resourceClassCrc, const std::string & resourceName);
static const stdmap<int, stdset<std::string>::fwd >::fwd & getResourceTypeMap();
static const std::map<int, std::set<std::string> > & getResourceTypeMap();
static int getResourceTypeMapVersionNumber();
static void sendToCommoditiesServer(const GameNetworkMessage & message);
engine/server/library/serverGame/src/shared/console/ConsoleCommandParserSpawner.cpp
+1 -2
View File
@@ -76,9 +76,8 @@ bool ConsoleCommandParserSpawner::performParsing (const NetworkId &, const Strin
static const Unicode::String header(Unicode::narrowToWide(std::string("Creature Listing - ID: POS: Auth Server: Template Name\n")));
result += header;
const CreatureObject::AllCreaturesSet & creatureList = CreatureObject::getAllCreatures();
CreatureObject::AllCreaturesSet::const_iterator i;
int count = 0;
for(i = creatureList.begin(); i != creatureList.end(); ++i)
for(auto i = creatureList.begin(); i != creatureList.end(); ++i)
{
const CreatureObject * creature = (*i);
if(creature)
engine/server/library/serverGame/src/shared/controller/AiCreatureController.h
+2 -2
View File
@@ -65,8 +65,8 @@ public:
void moveTo (CellProperty const * cell, Vector const & target_p, float const radius = 0.0f);
void moveTo (Unicode::String const & targetName);
void patrol ( stdvector<Location>::fwd const & locations, bool random, bool flip, bool repeat, int startPoint);
void patrol ( stdvector<Unicode::String>::fwd const & locations, bool random, bool flip, bool repeat, int startPoint);
void patrol ( std::vector<Location> const & locations, bool random, bool flip, bool repeat, int startPoint);
void patrol ( std::vector<Unicode::String> const & locations, bool random, bool flip, bool repeat, int startPoint);
bool wander ( float minLength, float maxLength, float minAngle, float maxAngle, float minDelay, float maxDelay );
void loiter (CellProperty const * homeCell, Vector const & home_p, float const minDistance, float const maxDistance, float const minDelay, float const maxDelay);
void loiter (NetworkId const & target, float const minDistance, float const maxDistance, float const minDelay, float const maxDelay);
engine/server/library/serverGame/src/shared/controller/AiShipController.h
+4 -4
View File
@@ -45,9 +45,9 @@ public:
AO_count
};
typedef stdvector<Transform>::fwd TransformList;
typedef stdvector<CachedNetworkId>::fwd CachedNetworkIdList;
typedef stdvector<NetworkId>::fwd NetworkIdList;
typedef std::vector<Transform> TransformList;
typedef std::vector<CachedNetworkId> CachedNetworkIdList;
typedef std::vector<NetworkId> NetworkIdList;
static void install();
@@ -168,7 +168,7 @@ protected:
private:
typedef stdset<CachedNetworkId>::fwd CachedNetworkIdSet;
typedef std::set<CachedNetworkId> CachedNetworkIdSet;
enum CountermeasureState
{
engine/server/library/serverGame/src/shared/controller/CreatureController.cpp
+1 -1
View File
@@ -224,7 +224,7 @@ void CreatureController::handleMessage(const int message, const float value, con
{
const MessageQueueNetworkId * const msg = NON_NULL(dynamic_cast<const MessageQueueNetworkId *>(data));
typedef stdvector<InstallationResourceData>::fwd DataVector;
typedef std::vector<InstallationResourceData> DataVector;
DataVector dv;
HarvesterInstallationObject * const harvester = dynamic_cast<HarvesterInstallationObject *>(ServerWorld::findObjectByNetworkId(msg->getNetworkId()));
engine/server/library/serverGame/src/shared/controller/PlayerShipController.h
+1 -1
View File
@@ -80,7 +80,7 @@ private:
private:
typedef stdmap<NetworkId, int>::fwd GunnerWeaponIndexList;
typedef std::map<NetworkId, int> GunnerWeaponIndexList;
uint32 m_clientToServerLastSyncStamp;
std::set<int> m_teleportIds;
engine/server/library/serverGame/src/shared/controller/ShipController.h
+2 -2
View File
@@ -30,8 +30,8 @@ class ShipController : public TangibleController
{
public:
typedef stdset<CachedNetworkId>::fwd CachedNetworkIdList;
typedef stdmultiset<CachedNetworkId>::fwd DockedByList;
typedef std::set<CachedNetworkId> CachedNetworkIdList;
typedef std::multiset<CachedNetworkId> DockedByList;
explicit ShipController(ShipObject * newOwner);
virtual ~ShipController();
engine/server/library/serverGame/src/shared/core/AttribModNameManager.h
+1 -1
View File
@@ -54,7 +54,7 @@ private:
};
typedef std::set<std::string> Names;
typedef stdmap<uint32, Names::const_iterator>::fwd CrcNameMap;
typedef std::map<uint32, Names::const_iterator> CrcNameMap;
Names * m_names;
CrcNameMap * m_crcMap;
engine/server/library/serverGame/src/shared/core/BiographyManager.cpp
+1 -1
View File
@@ -22,7 +22,7 @@
// ======================================================================
bool BiographyManager::m_installed = false;
stdmap<NetworkId, stdvector<CachedNetworkId>::fwd >::fwd *BiographyManager::m_retrievalQueue;
std::map<NetworkId, std::vector<CachedNetworkId> > *BiographyManager::m_retrievalQueue;
BiographyManager::BiographyManager()
engine/server/library/serverGame/src/shared/core/BiographyManager.h
+1 -1
View File
@@ -43,7 +43,7 @@ private:
/**
* Map of (object bio) -> (set of objects that want the bio when it's loaded)
*/
static stdmap<NetworkId, stdvector<CachedNetworkId>::fwd >::fwd *m_retrievalQueue;
static std::map<NetworkId, std::vector<CachedNetworkId> > *m_retrievalQueue;
};
// ======================================================================
engine/server/library/serverGame/src/shared/core/Client.h
+2 -2
View File
@@ -40,7 +40,7 @@ class Client : public MessageDispatch::Receiver, public MessageDispatch::Emitter
public:
typedef std::map<uint32, int> AccountFeatureIdList;
Client (ConnectionServerConnection & connection, const NetworkId & characterObjectId, const std::string& accountName, const std::string& ipAddr, bool isSecure, bool isSkipLoadScreen, unsigned int stationId, stdset<NetworkId>::fwd const & observedObjects, uint32 gameFeatures, uint32 subscriptionFeatures, AccountFeatureIdList const & accountFeatureIds, unsigned int entitlementTotalTime, unsigned int entitlementEntitledTime, unsigned int entitlementTotalTimeSinceLastLogin, unsigned int entitlementEntitledTimeSinceLastLogin, int buddyPoints, std::vector<std::pair<NetworkId, std::string> > const & consumedRewardEvents, std::vector<std::pair<NetworkId, std::string> > const & claimedRewardItems, bool usingAdminLogin, CombatDataTable::CombatSpamFilterType combatSpamFilter, int combatSpamRangeSquaredFilter, int furnitureRotationDegree, bool hasUnoccupiedJediSlot, bool isJediSlotCharacter, bool sendToStarport = false);
Client (ConnectionServerConnection & connection, const NetworkId & characterObjectId, const std::string& accountName, const std::string& ipAddr, bool isSecure, bool isSkipLoadScreen, unsigned int stationId, std::set<NetworkId> const & observedObjects, uint32 gameFeatures, uint32 subscriptionFeatures, AccountFeatureIdList const & accountFeatureIds, unsigned int entitlementTotalTime, unsigned int entitlementEntitledTime, unsigned int entitlementTotalTimeSinceLastLogin, unsigned int entitlementEntitledTimeSinceLastLogin, int buddyPoints, std::vector<std::pair<NetworkId, std::string> > const & consumedRewardEvents, std::vector<std::pair<NetworkId, std::string> > const & claimedRewardItems, bool usingAdminLogin, CombatDataTable::CombatSpamFilterType combatSpamFilter, int combatSpamRangeSquaredFilter, int furnitureRotationDegree, bool hasUnoccupiedJediSlot, bool isJediSlotCharacter, bool sendToStarport = false);
virtual ~Client ();
static void install();
@@ -215,7 +215,7 @@ private:
unsigned int m_entitlementEntitledTimeSinceLastLogin;
int m_buddyPoints;
std::set<NetworkId> m_previousObservedObjects;
stdvector<Watcher<ServerSynchronizedUi> >::fwd m_syncUIs;
std::vector<Watcher<ServerSynchronizedUi> > m_syncUIs;
std::vector<std::pair<NetworkId, std::string> > m_consumedRewardEvents;
std::vector<std::pair<NetworkId, std::string> > m_claimedRewardItems;
bool m_usingAdminLogin;
engine/server/library/serverGame/src/shared/core/CombatTracker.h
+1 -1
View File
@@ -27,7 +27,7 @@ public:
static void removeDefender(TangibleObject *defender);
private:
static void getInterestedViewers(TangibleObject const *defender, stdvector<ServerObject *>::fwd &combatViewers);
static void getInterestedViewers(TangibleObject const *defender, std::vector<ServerObject *> &combatViewers);
};
// ======================================================================
engine/server/library/serverGame/src/shared/core/ConfigServerGame.h
+1 -1
View File
@@ -580,7 +580,7 @@ class ConfigServerGame
static Data *data;
static Vector startingPosition;
static stdmap<std::string, std::string>::fwd m_components;
static std::map<std::string, std::string> m_components;
public:
engine/server/library/serverGame/src/shared/core/ConsentManager.h
+1 -1
View File
@@ -37,7 +37,7 @@ private:
ConsentManager &operator =(ConsentManager const &);
private:
stdmap<NetworkId, stdlist<std::pair<int, CallbackFunction> >::fwd >::fwd m_consentMap;
std::map<NetworkId, std::list<std::pair<int, CallbackFunction> > > m_consentMap;
int m_nextId;
};
engine/server/library/serverGame/src/shared/core/GameServer.h
+6 -6
View File
@@ -62,8 +62,8 @@ class GameServer :
public MessageDispatch::Receiver
{
public:
typedef stdunordered_map<NetworkId, Client *, NetworkId::Hash>::fwd ClientMap;
typedef stdvector<ConnectionServerConnection *>::fwd ConnectionServerVector;
typedef std::unordered_map<NetworkId, Client *, NetworkId::Hash> ClientMap;
typedef std::vector<ConnectionServerConnection *> ConnectionServerVector;
virtual ~GameServer ();
@@ -117,10 +117,10 @@ public:
void loadTerrain ();
stdvector<uint32>::fwd const &getAllGameServerPids() const;
std::vector<uint32> const &getAllGameServerPids() const;
bool hasConnectionsToOtherGameServers() const;
void getObjectsWithClients(stdvector<ServerObject *>::fwd &objects) const;
void getObjectsWithClients(std::vector<ServerObject *> &objects) const;
static uint64 getTotalObjectCreatesReceived();
static uint64 getTotalObjectCreatesSent();
@@ -185,8 +185,8 @@ private:
//-----------------------------------------------------------------------
// maps
typedef stdmap<NetworkId, stdvector<NetworkId>::fwd >::fwd PendingContainedObjectsMap;
typedef stdmap<uint32, const CentralCreateCharacter *>::fwd CharactersPendingCreationMap;
typedef std::map<NetworkId, std::vector<NetworkId> > PendingContainedObjectsMap;
typedef std::map<uint32, const CentralCreateCharacter *> CharactersPendingCreationMap;
bool m_done;
uint32 m_processId;
engine/server/library/serverGame/src/shared/core/InstantDeleteList.h
+1 -1
View File
@@ -26,7 +26,7 @@ class InstantDeleteList
static bool isOnList(const ObjectTemplate &theTemplate);
private:
typedef stdset<uint32>::fwd ListType;
typedef std::set<uint32> ListType;
static ListType *ms_theList;
};
engine/server/library/serverGame/src/shared/core/MessageToQueue.cpp
+1 -1
View File
@@ -342,7 +342,7 @@ void MessageToQueue::sendRecurringMessageToC (const NetworkId &objectId, const
// ----------------------------------------------------------------------
void MessageToQueue::sendRecurringMessageToJava(const NetworkId &objectId, const std::string &method, const stdvector<int8>::fwd &packedData, int delay)
void MessageToQueue::sendRecurringMessageToJava(const NetworkId &objectId, const std::string &method, const std::vector<int8> &packedData, int delay)
{
WARNING_DEBUG_FATAL(delay < 0, ("Sent messageTo with negative delay. Target %s, method %s, delay %f",objectId.getValueString().c_str(), method.c_str(), delay));
if (delay < 0)
engine/server/library/serverGame/src/shared/core/MessageToQueue.h
+2 -2
View File
@@ -30,9 +30,9 @@ public:
static unsigned long getEffectiveMessageToTime();
static void sendMessageToC (const NetworkId &objectId, const std::string &method, const std::string &data, int delay, bool guaranteed, NetworkId const & undeliveredCallbackObject=NetworkId::cms_invalid, std::string const & undeliveredCallbackMethod=ms_nullString);
static void sendMessageToJava (const NetworkId &objectId, const std::string &method, const stdvector<int8>::fwd &packedData, int delay, bool guaranteed, NetworkId const & undeliveredCallbackObject=NetworkId::cms_invalid, std::string const & undeliveredCallbackMethod=ms_nullString);
static void sendMessageToJava (const NetworkId &objectId, const std::string &method, const std::vector<int8> &packedData, int delay, bool guaranteed, NetworkId const & undeliveredCallbackObject=NetworkId::cms_invalid, std::string const & undeliveredCallbackMethod=ms_nullString);
static void sendRecurringMessageToC (const NetworkId &objectId, const std::string &method, const std::string & data, int delay);
static void sendRecurringMessageToJava (const NetworkId &objectId, const std::string &method, const stdvector<int8>::fwd &packedData, int delay);
static void sendRecurringMessageToJava (const NetworkId &objectId, const std::string &method, const std::vector<int8> &packedData, int delay);
static void cancelRecurringMessageTo (const NetworkId &objectId, const std::string &method);
static void update (float frameTime);
static void addToScheduler (ServerObject const & object, unsigned long callTime);
engine/server/library/serverGame/src/shared/core/MoveSimManager.cpp
+1 -1
View File
@@ -27,7 +27,7 @@
namespace MoveSimManagerNamespace
{
typedef stdvector<NetworkId>::fwd NetworkIdVector;
typedef std::vector<NetworkId> NetworkIdVector;
NetworkIdVector s_moveSimCreatures;
const char * const templateName_npc = "object/mobile/kaadu_hue.iff";
engine/server/library/serverGame/src/shared/core/NameManager.cpp
+1 -1
View File
@@ -464,7 +464,7 @@ void NameManager::releasePlayerName(const NetworkId &id)
// ----------------------------------------------------------------------
void NameManager::addPlayers(const stdvector<NetworkId>::fwd &ids, const stdvector<int>::fwd &stationIds, const stdvector<std::string>::fwd &names, const stdvector<std::string>::fwd &fullNames, const stdvector<int>::fwd &createTimes, const stdvector<int>::fwd &lastLoginTimes)
void NameManager::addPlayers(const std::vector<NetworkId> &ids, const std::vector<int> &stationIds, const std::vector<std::string> &names, const std::vector<std::string> &fullNames, const std::vector<int> &createTimes, const std::vector<int> &lastLoginTimes)
{
DEBUG_FATAL(ids.size() != stationIds.size(),("Programmer bug: Vectors ids and stationIds must be the same size.\n"));
DEBUG_FATAL(ids.size() != names.size(),("Programmer bug: Vectors ids and names must be the same size.\n"));
engine/server/library/serverGame/src/shared/core/NameManager.h
+12 -12
View File
@@ -33,7 +33,7 @@ class NameManager
public:
int getTotalPlayerCount () const;
void addPlayer (const NetworkId &id, uint32 stationId, const std::string &name, const std::string &fullName, time_t createTime, time_t lastLoginTime, bool notifyOtherServers);
void addPlayers (const stdvector<NetworkId>::fwd &ids, const stdvector<int>::fwd &stationIds, const stdvector<std::string>::fwd &names, const stdvector<std::string>::fwd &fullNames, const stdvector<int>::fwd &createTimes, const stdvector<int>::fwd &lastLoginTimes);
void addPlayers (const std::vector<NetworkId> &ids, const std::vector<int> &stationIds, const std::vector<std::string> &names, const std::vector<std::string> &fullNames, const std::vector<int> &createTimes, const std::vector<int> &lastLoginTimes);
void renamePlayer (const NetworkId &id, const Unicode::String &name, const Unicode::String &fullName);
std::string debugGetNameList () const;
bool isPlayer (NetworkId const & possiblePlayer) const;
@@ -43,14 +43,14 @@ class NameManager
const std::string & getPlayerFullName (const NetworkId &id) const;
int getPlayerCreateTime (const NetworkId &id) const;
int getPlayerLastLoginTime (const NetworkId &id) const;
void getPlayerWithLastLoginTimeAfter (time_t time, stdmultimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> >::fwd &result) const;
void getPlayerWithLastLoginTimeBefore (time_t time, stdmultimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> >::fwd &result) const;
void getPlayerWithLastLoginTimeBetween (time_t timeLowerRange, time_t timeUpperRange, stdmultimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> >::fwd &result) const;
void getPlayerWithLastLoginTimeAfterDistribution (stdmap<int, std::pair<std::string, int> >::fwd &result) const;
void getPlayerWithCreateTimeAfter (time_t time, stdmultimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> >::fwd &result) const;
void getPlayerWithCreateTimeBefore (time_t time, stdmultimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> >::fwd &result) const;
void getPlayerWithCreateTimeBetween (time_t timeLowerRange, time_t timeUpperRange, stdmultimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> >::fwd &result) const;
void getPlayerWithCreateTimeAfterDistribution (stdmap<int, std::pair<std::string, int> >::fwd &result) const;
void getPlayerWithLastLoginTimeAfter (time_t time, std::multimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> > &result) const;
void getPlayerWithLastLoginTimeBefore (time_t time, std::multimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> > &result) const;
void getPlayerWithLastLoginTimeBetween (time_t timeLowerRange, time_t timeUpperRange, std::multimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> > &result) const;
void getPlayerWithLastLoginTimeAfterDistribution (std::map<int, std::pair<std::string, int> > &result) const;
void getPlayerWithCreateTimeAfter (time_t time, std::multimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> > &result) const;
void getPlayerWithCreateTimeBefore (time_t time, std::multimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> > &result) const;
void getPlayerWithCreateTimeBetween (time_t timeLowerRange, time_t timeUpperRange, std::multimap<time_t, std::pair<std::pair<NetworkId, uint32>, std::string> > &result) const;
void getPlayerWithCreateTimeAfterDistribution (std::map<int, std::pair<std::string, int> > &result) const;
void releasePlayerName (const NetworkId &id);
Unicode::String generateRandomName (const std::string &directory, const std::string &nameTable) const;
Unicode::String generateUniqueRandomName (const std::string &directory, const std::string &nameTable) const;
@@ -85,9 +85,9 @@ class NameManager
time_t lastLoginTime;
};
typedef stdmap<NameTableIdentifier, NameGenerator*>::fwd NameGeneratorMapType;
typedef stdmap<NetworkId, CharacterData>::fwd IdToCharacterDataMapType;
typedef stdmap<std::string, NetworkId>::fwd NameToIdMapType;
typedef std::map<NameTableIdentifier, NameGenerator*> NameGeneratorMapType;
typedef std::map<NetworkId, CharacterData> IdToCharacterDataMapType;
typedef std::map<std::string, NetworkId> NameToIdMapType;
private:
mutable NameGeneratorMapType * m_nameGenerators;
engine/server/library/serverGame/src/shared/core/NonCriticalTaskQueue.h
+1 -1
View File
@@ -55,7 +55,7 @@ class NonCriticalTaskQueue : public Singleton2<NonCriticalTaskQueue>
~NonCriticalTaskQueue ();
private:
typedef stdlist<TaskRequest*>::fwd TaskListType;
typedef std::list<TaskRequest*> TaskListType;
TaskListType *m_tasks;
};
engine/server/library/serverGame/src/shared/core/NpcConversation.h
+1 -1
View File
@@ -66,7 +66,7 @@ private:
CachedNetworkId m_player;
CachedNetworkId m_npc;
typedef stdvector<Response>::fwd ResponseVector;
typedef std::vector<Response> ResponseVector;
ResponseVector * m_responses;
uint32 m_appearanceOverrideSharedTemplateCrc;
engine/server/library/serverGame/src/shared/core/ObserveTracker.h
+5 -5
View File
@@ -26,13 +26,13 @@ public:
static void update();
static bool isObserving(Client const &client, ServerObject const &obj);
static void onObjectControlled(Client &client, ServerObject &obj, stdset<NetworkId>::fwd const &oldObserveList);
static void onClientControlComplete(Client &client, stdset<NetworkId>::fwd const &oldObserveList);
static void onClientEnteredNetworkTriggerVolume(Client &client, TriggerVolume &triggerVolume, stdset<NetworkId>::fwd const *oldObserveList = 0);
static void onObjectControlled(Client &client, ServerObject &obj, std::set<NetworkId> const &oldObserveList);
static void onClientControlComplete(Client &client, std::set<NetworkId> const &oldObserveList);
static void onClientEnteredNetworkTriggerVolume(Client &client, TriggerVolume &triggerVolume, std::set<NetworkId> const *oldObserveList = 0);
static void onClientExitedNetworkTriggerVolume(Client &client, TriggerVolume &triggerVolume);
static void onClientAddedVisibleObjectSpace(Client &client, ServerObject &visibleObject);
static void onClientLostVisibleObjectSpace(Client &client, ServerObject &visibleObject);
static void onClientEnteredPortalTriggerVolume(Client &client, TriggerVolume &triggerVolume, stdset<NetworkId>::fwd const *oldObserveList = 0);
static void onClientEnteredPortalTriggerVolume(Client &client, TriggerVolume &triggerVolume, std::set<NetworkId> const *oldObserveList = 0);
static void onClientExitedPortalTriggerVolume(Client &client, TriggerVolume &triggerVolume);
static bool onClientOpenedContainer(Client &client, ServerObject &obj, int sequence, std::string const &slotDesc, bool sendOpenContainerNotification = true);
static bool onClientClosedContainer(Client &client, ServerObject &obj);
@@ -49,7 +49,7 @@ public:
static void onCraftingPrototypeCreated(ServerObject const &objOwner, ServerObject &objPrototype);
static void onCraftingEndCraftingSession(ServerObject const &objOwner, ServerObject &objPrototype);
static void onMissionCriticalObjectAdded(ServerObject const &playerObject, ServerObject &criticalShip);
static void onMakeVendorInventory(ServerObject &vendorInventory, stdset<Client *>::fwd const & oldInventoryObservers);
static void onMakeVendorInventory(ServerObject &vendorInventory, std::set<Client *> const & oldInventoryObservers);
static void onClientAboutToOpenPublicContainer(Client & client, ServerObject & container);
};
engine/server/library/serverGame/src/shared/core/PlanetMapManagerServer.h
+3 -3
View File
@@ -21,11 +21,11 @@ class PlanetMapManagerServer
{
public:
typedef stdvector<MapLocation>::fwd MapLocationVector;
typedef stdvector<int>::fwd IntVector;
typedef std::vector<MapLocation> MapLocationVector;
typedef std::vector<int> IntVector;
static void handleClientRequest (const Client & client, const GetMapLocationsMessage & msg);
static void handleClientRequestGetSpecificMapLocationsMessage (const Client & client, const stdset<std::pair<std::string, NetworkId> >::fwd & msg);
static void handleClientRequestGetSpecificMapLocationsMessage (const Client & client, const std::set<std::pair<std::string, NetworkId> > & msg);
static bool addMapLocation (const MapLocation & loc, int mapLocationType, bool enforceLocationCountLimits);
static bool removeMapLocation (const NetworkId & id);
engine/server/library/serverGame/src/shared/core/ProxyList.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef _ProxyList_H_
#define _ProxyList_H_
typedef stdset<uint32>::fwd ProxyList;
typedef std::set<uint32> ProxyList;
#endif // _ProxyList_H_
engine/server/library/serverGame/src/shared/core/PurgeManager.h
+1 -1
View File
@@ -23,7 +23,7 @@
class PurgeManager
{
public:
static void handleStructuresAndVendorsForPurge(StationId stationId, stdvector<std::pair<NetworkId, NetworkId> >::fwd const & structures, stdvector<std::pair<NetworkId, std::pair<NetworkId, Unicode::String> > >::fwd const & vendors, bool warnOnly);
static void handleStructuresAndVendorsForPurge(StationId stationId, std::vector<std::pair<NetworkId, NetworkId> > const & structures, std::vector<std::pair<NetworkId, std::pair<NetworkId, Unicode::String> > > const & vendors, bool warnOnly);
};
// ======================================================================
engine/server/library/serverGame/src/shared/core/RegexList.h
+1 -1
View File
@@ -39,7 +39,7 @@ public:
private:
class Entry;
typedef stdvector<Entry*>::fwd EntryVector;
typedef std::vector<Entry*> EntryVector;
private:
engine/server/library/serverGame/src/shared/core/ServerUIManager.h
+2 -2
View File
@@ -42,8 +42,8 @@ private:
static int getNewPageId();
private:
static stdmap<int, ServerUIPage*>::fwd m_pages;
static stdmultimap<NetworkId, int>::fwd m_primaryControlledObjectMap;
static std::map<int, ServerUIPage*> m_pages;
static std::multimap<NetworkId, int> m_primaryControlledObjectMap;
static int m_pageCounter;
};
engine/server/library/serverGame/src/shared/core/ServerUniverse.cpp
+2 -2
View File
@@ -527,7 +527,7 @@ std::string ServerUniverse::generateRandomResourceName(const std::string &nameTa
// ----------------------------------------------------------------------
void ServerUniverse::resourceClassTreeLoaded(stdmap<int, ResourceClassObject*>::fwd &resourceClasses)
void ServerUniverse::resourceClassTreeLoaded(std::map<int, ResourceClassObject*> &resourceClasses)
{
ServerResourceClassObject::loadDistributionFromIff(resourceClasses);
}
@@ -660,7 +660,7 @@ ResourceTypeObject const * ServerUniverse::pickRandomNonDepletedResource(const s
// ----------------------------------------------------------------------
void ServerUniverse::createGroup(GroupMemberParam const & leader, stdvector<GroupMemberParam>::fwd const & members)
void ServerUniverse::createGroup(GroupMemberParam const & leader, std::vector<GroupMemberParam> const & members)
{
if (m_authoritative)
GroupObject::createGroup(leader, members);
engine/server/library/serverGame/src/shared/core/ServerUniverse.h
+11 -11
View File
@@ -65,12 +65,12 @@ public:
void registerPlanetObject (PlanetObject &newPlanet);
void registerResourceTypeObject (ResourceTypeObject &newType, bool newlySpawned);
void sendUpdatedTypeToAllServers (ResourceTypeObject &changedType);
virtual void resourceClassTreeLoaded (stdmap<int, ResourceClassObject*>::fwd &resourceClasses);
virtual void resourceClassTreeLoaded (std::map<int, ResourceClassObject*> &resourceClasses);
std::string generateRandomResourceName (const std::string &nameTable) const;
ResourceTypeObject const * pickRandomNonDepletedResource (const std::string &parentResourceClassName) const;
// int extractResourceFromRandomPool (const std::string &parentResourceClassName, int amount, const Vector &pos);
virtual ResourceClassObject* makeResourceClassObject();
void createGroup (GroupMemberParam const & leader, stdvector<GroupMemberParam>::fwd const & members);
void createGroup (GroupMemberParam const & leader, std::vector<GroupMemberParam> const & members);
void onServerConnectionClosed (uint32 processId);
void updatePopulationList (const PopulationList &newData);
int getPopulationAtLocation (const std::string &scene, int x, int z) const;
@@ -91,7 +91,7 @@ public:
int getGcwGroupImperialScorePercentile(std::string const & gcwGroup) const; // the rebel score is 100 - the imperial score
static void setConnectedCharacterLfgData(const NetworkId & characterId, const LfgCharacterData & lfgCharacterData);
static stdmap<NetworkId, LfgCharacterData>::fwd const & getConnectedCharacterLfgData();
static std::map<NetworkId, LfgCharacterData> const & getConnectedCharacterLfgData();
static void setConnectedCharacterGroupData(const NetworkId & characterId, const NetworkId & groupId);
@@ -115,7 +115,7 @@ public:
static void setConnectedCharacterBiographyData(const NetworkId & characterId, const Unicode::String & biography);
static void removeConnectedCharacterBiographyData(const NetworkId & characterId);
static stdmap<NetworkId, Unicode::String>::fwd const & getConnectedCharacterBiographyData();
static std::map<NetworkId, Unicode::String> const & getConnectedCharacterBiographyData();
static void removeConnectedCharacterData(const NetworkId & characterId);
@@ -136,7 +136,7 @@ private:
private:
//TODO: consistency about whether STL containers are pointers or not
typedef stdvector<CachedNetworkId*>::fwd UniverseObjectList;
typedef std::vector<CachedNetworkId*> UniverseObjectList;
UniverseObjectList * m_universeObjectList;
UniverseObjectList * m_pendingUniverseObjects;
bool m_loaded;
@@ -148,7 +148,7 @@ private:
//
// Planet Objects
//
typedef stdmap<const std::string, PlanetObject*>::fwd PlanetNameMap;
typedef std::map<const std::string, PlanetObject*> PlanetNameMap;
PlanetObject *m_thisPlanet;
PlanetObject *m_tatooinePlanet;
@@ -157,9 +157,9 @@ private:
//
// Resource Type Objects
//
typedef stdmap<std::string, ResourceTypeObject*>::fwd ResourceTypeNameMap;
typedef stdmap<NetworkId, ResourceTypeObject*>::fwd ResourceTypeIdMap;
typedef stdvector<ResourceTypeObject*>::fwd ResourcesToSendType;
typedef std::map<std::string, ResourceTypeObject*> ResourceTypeNameMap;
typedef std::map<NetworkId, ResourceTypeObject*> ResourceTypeIdMap;
typedef std::vector<ResourceTypeObject*> ResourcesToSendType;
ResourceTypeNameMap *m_resourceTypeNameMap;
ResourceTypeIdMap *m_resourceTypeIdMap;
@@ -173,8 +173,8 @@ private:
// bool m_loaded;
// Theater data
typedef stdmap<const std::string, const NetworkId>::fwd TheaterNameIdMap;
typedef stdmap<const NetworkId, const std::string>::fwd TheaterIdNameMap;
typedef std::map<const std::string, const NetworkId> TheaterNameIdMap;
typedef std::map<const NetworkId, const std::string> TheaterIdNameMap;
TheaterNameIdMap * m_theaterNameIdMap;
TheaterIdNameMap * m_theaterIdNameMap;
engine/server/library/serverGame/src/shared/core/ServerWorld.h
+26 -26
View File
@@ -64,28 +64,28 @@ public:
static ServerObject * findObjectByNetworkId (const NetworkId& id, bool searchQueuedList=false);
static ServerObject * findUninitializedObjectByNetworkId(const NetworkId& id);
static void findObjectsInRange (const Vector & location, const float distance, stdvector<ServerObject *>::fwd & results);
static void findStaticCollidableObjectsInRange (const Vector & location, const float distance, stdvector<ServerObject *>::fwd & results);
static void findCreaturesInRange (const Vector & location, const float distance, stdvector<ServerObject *>::fwd & results);
static void findAuthoritativeNonPlayerCreaturesInRange(const Vector & location, const float distance, stdvector<ServerObject *>::fwd & results);
static void findCreaturesOfNicheInRange (const Vector & location, const float distance, int niche, int mask, stdvector<ServerObject *>::fwd & results);
static void findCreaturesOfSpeciesInRange (const Vector & location, const float distance, int species, stdvector<ServerObject *>::fwd & results);
static void findCreaturesOfRaceInRange (const Vector & location, const float distance, int species, int race, stdvector<ServerObject *>::fwd & results);
static void findNonCreaturesInRange (const Vector & location, const float distance, stdvector<ServerObject *>::fwd & results);
static void findNPCsInRange (const Vector & location, const float distance, stdvector<ServerObject *>::fwd & results);
static void findPlayerCreaturesInRange (const Vector & location, const float distance, stdvector<ServerObject *>::fwd & results);
static void findObjectsInRange (const Vector & location, const float distance, std::vector<ServerObject *> & results);
static void findStaticCollidableObjectsInRange (const Vector & location, const float distance, std::vector<ServerObject *> & results);
static void findCreaturesInRange (const Vector & location, const float distance, std::vector<ServerObject *> & results);
static void findAuthoritativeNonPlayerCreaturesInRange(const Vector & location, const float distance, std::vector<ServerObject *> & results);
static void findCreaturesOfNicheInRange (const Vector & location, const float distance, int niche, int mask, std::vector<ServerObject *> & results);
static void findCreaturesOfSpeciesInRange (const Vector & location, const float distance, int species, std::vector<ServerObject *> & results);
static void findCreaturesOfRaceInRange (const Vector & location, const float distance, int species, int race, std::vector<ServerObject *> & results);
static void findNonCreaturesInRange (const Vector & location, const float distance, std::vector<ServerObject *> & results);
static void findNPCsInRange (const Vector & location, const float distance, std::vector<ServerObject *> & results);
static void findPlayerCreaturesInRange (const Vector & location, const float distance, std::vector<ServerObject *> & results);
static void findObjectsInCone (const Object & coneCenterObject, const Object & coneDirectionObject, const float distance, float angle, stdvector<ServerObject *>::fwd & results);
static void findObjectsInCone (const Object & coneCenterObject, const Location & coneDirection, const float distance, float angle, stdvector<ServerObject *>::fwd & results);
static void findCreaturesInCone (const Object & coneCenterObject, const Object & coneDirectionObject, const float distance, float angle, stdvector<ServerObject *>::fwd & results);
static void findCreaturesInCone (const Object & coneCenterObject, const Location & coneDirection, const float distance, float angle, stdvector<ServerObject *>::fwd & results);
static void findAuthoritativeNonPlayerCreaturesInCone(const Object & coneCenterObject, const Object & coneDirectionObject, const float distance, float angle, stdvector<ServerObject *>::fwd & results);
static void findCreaturesOfNicheInCone (const Object & coneCenterObject, const Object & coneDirectionObject, const float distance, float angle, int niche, int mask, stdvector<ServerObject *>::fwd & results);
static void findCreaturesOfSpeciesInCone (const Object & coneCenterObject, const Object & coneDirectionObject, const float distance, float angle, int species, stdvector<ServerObject *>::fwd & results);
static void findCreaturesOfRaceInCone (const Object & coneCenterObject, const Object & coneDirectionObject, const float distance, float angle, int species, int race, stdvector<ServerObject *>::fwd & results);
static void findNonCreaturesInCone (const Object & coneCenterObject, const Object & coneDirectionObject, const float distance, float angle, stdvector<ServerObject *>::fwd & results);
static void findNPCsInCone (const Object & coneCenterObject, const Object & coneDirectionObject, const float distance, float angle, stdvector<ServerObject *>::fwd & results);
static void findPlayerCreaturesInCone (const Object & coneCenterObject, const Object & coneDirectionObject, const float distance, float angle, stdvector<ServerObject *>::fwd & results);
static void findObjectsInCone (const Object & coneCenterObject, const Object & coneDirectionObject, const float distance, float angle, std::vector<ServerObject *> & results);
static void findObjectsInCone (const Object & coneCenterObject, const Location & coneDirection, const float distance, float angle, std::vector<ServerObject *> & results);
static void findCreaturesInCone (const Object & coneCenterObject, const Object & coneDirectionObject, const float distance, float angle, std::vector<ServerObject *> & results);
static void findCreaturesInCone (const Object & coneCenterObject, const Location & coneDirection, const float distance, float angle, std::vector<ServerObject *> & results);
static void findAuthoritativeNonPlayerCreaturesInCone(const Object & coneCenterObject, const Object & coneDirectionObject, const float distance, float angle, std::vector<ServerObject *> & results);
static void findCreaturesOfNicheInCone (const Object & coneCenterObject, const Object & coneDirectionObject, const float distance, float angle, int niche, int mask, std::vector<ServerObject *> & results);
static void findCreaturesOfSpeciesInCone (const Object & coneCenterObject, const Object & coneDirectionObject, const float distance, float angle, int species, std::vector<ServerObject *> & results);
static void findCreaturesOfRaceInCone (const Object & coneCenterObject, const Object & coneDirectionObject, const float distance, float angle, int species, int race, std::vector<ServerObject *> & results);
static void findNonCreaturesInCone (const Object & coneCenterObject, const Object & coneDirectionObject, const float distance, float angle, std::vector<ServerObject *> & results);
static void findNPCsInCone (const Object & coneCenterObject, const Object & coneDirectionObject, const float distance, float angle, std::vector<ServerObject *> & results);
static void findPlayerCreaturesInCone (const Object & coneCenterObject, const Object & coneDirectionObject, const float distance, float angle, std::vector<ServerObject *> & results);
static ServerObject * findClosestNPC (const Vector & location, float distance);
static ServerObject * findClosestPlayer (const Vector & location, float distance);
@@ -129,8 +129,8 @@ public:
static bool isSpaceBattlefieldZoneWithPvp ();
static void removeObjectTriggerVolume (TriggerVolume * triggerVolume);
static void dumpObjectSphereTree (stdvector<std::pair<ServerObject *, Sphere> >::fwd & results);
static void dumpTriggerSphereTree (stdvector<std::pair<TriggerVolume *, Sphere> >::fwd & results);
static void dumpObjectSphereTree (std::vector<std::pair<ServerObject *, Sphere> > & results);
static void dumpTriggerSphereTree (std::vector<std::pair<TriggerVolume *, Sphere> > & results);
static const WeatherData & getWeather ();
@@ -145,9 +145,9 @@ public:
static void onPreloadComplete ();
static bool isPreloadComplete ();
static void getSpatialChatListeners(ServerObject &source, float distance, stdvector<ServerObject *>::fwd &results);
static void getSpatialChatListeners(ServerObject &source, float distance, std::vector<ServerObject *> &results);
static int getNumMoveLists(stdvector<int>::fwd & moveListSize);
static int getNumMoveLists(std::vector<int> & moveListSize);
static void setNumMoveLists(int numMoveLists);
protected:
@@ -166,7 +166,7 @@ private:
static ServerObject* createNewObjectIntermediate(ServerObject* newObject, ServerObject & container, bool persisted, bool); ///< Called by CreateNewObject(*) functions. This is provided to share code.
static ServerObject* createNewObjectIntermediate(ServerObject* newObject, ServerObject & container, const SlotId & slotId, bool persisted);
static ServerObject *findClosestObjectInList(const Vector &location, const stdvector<ServerObject*>::fwd &candidates);
static ServerObject *findClosestObjectInList(const Vector &location, const std::vector<ServerObject*> &candidates);
static void addTangibleObject(ServerObject * object);
static void removeTangibleObject(ServerObject * object);
engine/server/library/serverGame/src/shared/core/StaticLootItemManager.h
+1 -1
View File
@@ -18,7 +18,7 @@ class NetworkId;
class StaticLootItemManager
{
public:
typedef stdvector<std::pair<std::string, Unicode::String> >::fwd AttributeVector;
typedef std::vector<std::pair<std::string, Unicode::String> > AttributeVector;
static void sendDataToClient(NetworkId const & playerId, std::string const & staticItemName);
static void getAttributes(NetworkId const & playerId, std::string const & staticItemName, AttributeVector & data);
engine/server/library/serverGame/src/shared/core/VeteranRewardManager.h
+3 -3
View File
@@ -44,10 +44,10 @@ class VeteranRewardManager
static bool isEventAccountUnique(std::string const & eventName);
static bool isItemAccountUnique(std::string const & itemName);
static bool isItemAccountUniqueFeatureId(std::string const & itemName);
static void verifyFeatureIdTransactions(CreatureObject & playerCreature, stdmap<std::string, int>::fwd const & transactionsFromLoginServer);
static void verifyFeatureIdTransactions(CreatureObject & playerCreature, std::map<std::string, int> const & transactionsFromLoginServer);
static void migrateVeteranRewardsClaimInformation(CreatureObject & playerCreature);
static void getConsumedEvents(ServerObject const & playerCreature, stdvector<std::string>::fwd & consumedEvents);
static void getClaimedItems(ServerObject const & playerCreature, stdvector<std::string>::fwd & claimedItems);
static void getConsumedEvents(ServerObject const & playerCreature, std::vector<std::string> & consumedEvents);
static void getClaimedItems(ServerObject const & playerCreature, std::vector<std::string> & claimedItems);
static void tcgRedemption(CreatureObject const & playerCreature, ServerObject & item, int featureId, int adjustment);
static bool checkForTcgRedemptionInProgress(ServerObject const & item);
static void handleTcgRedemptionResponse(ServerObject & item, AdjustAccountFeatureIdResponse const & response);
engine/server/library/serverGame/src/shared/guild/GuildInterface.h
+7 -7
View File
@@ -69,7 +69,7 @@ public:
static int getGuildId(NetworkId const &memberId);
static int getGuildIdForSponsored(NetworkId const &memberId);
static int getGuildIdForGuildLeader(NetworkId const &leaderId);
static void getAllGuildIds(stdvector<int>::fwd &results);
static void getAllGuildIds(std::vector<int> &results);
static int findGuild(std::string const &name);
static bool guildExists(int guildId);
static std::pair<int, time_t> const *hasDeclaredWarAgainst(int actorGuildId, int targetGuildId);
@@ -96,18 +96,18 @@ public:
static std::map<std::pair<std::string, int>, uint32> const & getGcwRegionDefenderGuilds();
static std::map<std::string, std::pair<int, int> > const & getGcwRegionDefenderGuildsCount();
static int getGcwRegionDefenderGuildsVersion();
static void getGuildMemberIds(int guildId, stdvector<NetworkId>::fwd &results);
static void getGuildMemberIdsWithPermissions(int guildId, int permissions, stdvector<NetworkId>::fwd &results);
static void getGuildMemberIds(int guildId, std::vector<NetworkId> &results);
static void getGuildMemberIdsWithPermissions(int guildId, int permissions, std::vector<NetworkId> &results);
static int getGuildCountMembersOnly(int guildId);
static int getGuildCountSponsoredOnly(int guildId);
static int getGuildCountMembersAndSponsored(int guildId);
static int getGuildCountMembersGuildWarPvPEnabled(int guildId);
static GuildMemberInfo const *getGuildMemberInfo(int guildId, NetworkId const &memberId);
static bool getGuildMemberGuildWarEnabled(int guildId, NetworkId const &memberId);
static stdvector<int>::fwd const &getGuildEnemies(int guildId);
static stdmap<int, std::pair<int, time_t> >::fwd const &getGuildEnemiesKillInfo(int guildId);
static std::vector<int> const &getGuildEnemies(int guildId);
static std::map<int, std::pair<int, time_t> > const &getGuildEnemiesKillInfo(int guildId);
static std::pair<int, time_t> const &getGuildEnemyKillInfo(int guildIdA, int guildIdB);
static stdvector<int>::fwd const &getGuildsAtWarWith(int guildId);
static std::vector<int> const &getGuildsAtWarWith(int guildId);
static ScriptParams const *getMasterGuildWarTableDictionary();
static void updateInactiveGuildWarTrackingInfo(GuildObject &masterGuildObject, int guildAId, int guildAKillCount, int guildBId, int guildBKillCount);
static ScriptParams const *getInactiveGuildWarTableDictionary();
@@ -131,7 +131,7 @@ public:
static void addGuildMemberRank(int guildId, NetworkId const &memberId, std::string const &rankName);
static void removeGuildMemberRank(int guildId, NetworkId const &memberId, std::string const &rankName);
static bool hasGuildMemberRank(int guildId, NetworkId const &memberId, std::string const &rankName);
static void getGuildMemberRank(int guildId, NetworkId const &memberId, stdvector<std::string>::fwd &ranks);
static void getGuildMemberRank(int guildId, NetworkId const &memberId, std::vector<std::string> &ranks);
static void setGuildEnemy(int guildId, int enemyId);
static void removeGuildEnemy(int guildId, int enemyId);
static void updateGuildWarKillTracking(CreatureObject const &killer, CreatureObject const &victim);
engine/server/library/serverGame/src/shared/network/Chat.cpp
+1 -1
View File
@@ -567,7 +567,7 @@ void Chat::uninvite(const std::string & to, const std::string & room)
//----------------------------------------------------------------------
void Chat::inviteGroupMembers(const NetworkId & invitor, const ChatAvatarId & groupLeader, const std::string & room, const stdvector<NetworkId>::fwd & members)
void Chat::inviteGroupMembers(const NetworkId & invitor, const ChatAvatarId & groupLeader, const std::string & room, const std::vector<NetworkId> & members)
{
ChatInviteGroupMembersToRoom inviteMessage(invitor, groupLeader, room, members);
sendToChatServer(inviteMessage);
engine/server/library/serverGame/src/shared/network/Chat.h
+2 -2
View File
@@ -77,7 +77,7 @@ public:
static void sendSystemMessage (const std::string & to, const ProsePackage & pp);
static void invite (const std::string & to, const std::string & room);
static void uninvite (const std::string & to, const std::string & room);
static void inviteGroupMembers (const NetworkId & invitor, const ChatAvatarId & groupLeader, const std::string & room, const stdvector<NetworkId>::fwd & members);
static void inviteGroupMembers (const NetworkId & invitor, const ChatAvatarId & groupLeader, const std::string & room, const std::vector<NetworkId> & members);
static unsigned int isAllowedToEnterRoom(const CreatureObject & who, const std::string & room);
@@ -99,7 +99,7 @@ private:
static Chat * m_instance;
ChatAvatarId * m_serverAvatar;
ChatServerConnection * m_chatServer;
stdvector<Archive::ByteStream>::fwd m_deferredChatMessages;
std::vector<Archive::ByteStream> m_deferredChatMessages;
std::string m_gameCode;
};
engine/server/library/serverGame/src/shared/object/BaselineDistributionListPool.h
+1 -1
View File
@@ -20,7 +20,7 @@ class Client;
class BaselineDistributionListPool
{
public:
static stdvector<Watcher<Client> >::fwd *get(ServerObject const &obj, bool allocIfNeeded);
static std::vector<Watcher<Client> > *get(ServerObject const &obj, bool allocIfNeeded);
static void free(ServerObject const &obj);
};
engine/server/library/serverGame/src/shared/object/BuildingObject.cpp
+1 -1
View File
@@ -648,7 +648,7 @@ bool BuildingObject::isVisibleOnClient (const Client & /*client*/) const
// ----------------------------------------------------------------------
void BuildingObject::getAttributes(stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const
void BuildingObject::getAttributes(std::vector<std::pair<std::string, Unicode::String> > &data) const
{
TangibleObject::getAttributes(data);
}
engine/server/library/serverGame/src/shared/object/BuildingObject.h
+2 -2
View File
@@ -44,7 +44,7 @@ public:
virtual Controller* createDefaultController(void);
void addMembersToPackages ();
virtual void getAttributes (stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const;
virtual void getAttributes (std::vector<std::pair<std::string, Unicode::String> > &data) const;
int getMaintenanceCost() const;
void setMaintenanceCost(int newConst);
@@ -89,7 +89,7 @@ public:
};
};
typedef stdunordered_set<const BuildingObject *, BuildingObjectPointerHash>::fwd AllBuildingsSet;
typedef std::unordered_set<const BuildingObject *, BuildingObjectPointerHash> AllBuildingsSet;
static const AllBuildingsSet & getAllBuildings();
protected:
engine/server/library/serverGame/src/shared/object/CellObject.cpp
+1 -1
View File
@@ -581,7 +581,7 @@ bool CellObject::isVisibleOnClient (const Client & /*client*/) const
// ----------------------------------------------------------------------
void CellObject::getAttributes (stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const
void CellObject::getAttributes (std::vector<std::pair<std::string, Unicode::String> > &data) const
{
ServerObject::getAttributes(data);
}
engine/server/library/serverGame/src/shared/object/CellObject.h
+1 -1
View File
@@ -69,7 +69,7 @@ public:
bool isAllowed(CreatureObject const &who) const;
virtual bool isVisibleOnClient (const Client & client) const;
void addMembersToPackages();
virtual void getAttributes (stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const;
virtual void getAttributes (std::vector<std::pair<std::string, Unicode::String> > &data) const;
virtual const NetworkId & getOwnerId() const;
virtual bool isOwner(NetworkId const &id, Client const *client) const;
engine/server/library/serverGame/src/shared/object/CellPermissions.h
+2 -2
View File
@@ -92,7 +92,7 @@ namespace CellPermissions
std::string m_permissionString;
};
typedef stdset<PermissionObject>::fwd PermissionList;
typedef std::set<PermissionObject> PermissionList;
//----------------------------------------------------------------------
@@ -109,7 +109,7 @@ namespace CellPermissions
void init(BuildingObject *building);
void getCellPermissions(ServerObject &obj);
void handleCellPermissionsUpdateIfNeeded(ServerObject &obj, unsigned int &permPos, stdvector<CreatureObject*>::fwd &expel);
void handleCellPermissionsUpdateIfNeeded(ServerObject &obj, unsigned int &permPos, std::vector<CreatureObject*> &expel);
private:
ProfilerAutoBlock m_profilerBlock;
engine/server/library/serverGame/src/shared/object/CityObject.cpp
+2 -2
View File
@@ -394,7 +394,7 @@ void CityObject::setupUniverse()
// ----------------------------------------------------------------------
void CityObject::getAttributes(stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const
void CityObject::getAttributes(std::vector<std::pair<std::string, Unicode::String> > &data) const
{
UniverseObject::getAttributes(data);
}
@@ -1980,7 +1980,7 @@ CitizenInfo const *CityObject::getCitizenInfo(int cityId, NetworkId const &citiz
// ----------------------------------------------------------------------
void CityObject::getCityStructureIds(int cityId, stdvector<NetworkId>::fwd &results) const
void CityObject::getCityStructureIds(int cityId, std::vector<NetworkId> &results) const
{
results.clear();
engine/server/library/serverGame/src/shared/object/CityObject.h
+9 -9
View File
@@ -32,7 +32,7 @@ public:
virtual Controller* createDefaultController();
virtual void setupUniverse();
virtual void getAttributes(stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const;
virtual void getAttributes(std::vector<std::pair<std::string, Unicode::String> > &data) const;
virtual void unload();
int createCity(std::string const &cityName, NetworkId const &cityHallId, std::string const &cityPlanet, int x, int z, int radius, NetworkId const &leaderId, int incomeTax, int propertyTax, int salesTax, Vector const &travelLoc, int travelCost, bool travelInterplanetary, Vector const &cloneLoc, Vector const &cloneRespawn, NetworkId const &cloneRespawnCell, NetworkId const &cloneId, int cityId = 0);
@@ -57,24 +57,24 @@ public:
void addCitizenRank(int cityId, NetworkId const &citizenId, std::string const &rankName);
void removeCitizenRank(int cityId, NetworkId const &citizenId, std::string const &rankName);
bool hasCitizenRank(int cityId, NetworkId const &citizenId, std::string const &rankName);
void getCitizenRank(int cityId, NetworkId const &citizenId, stdvector<std::string>::fwd &ranks);
void getCitizenRank(int cityId, NetworkId const &citizenId, std::vector<std::string> &ranks);
void setCitizenTitle(int cityId, NetworkId const &citizenId, std::string const &citizenTitle);
void setCityStructure(int cityId, NetworkId const &structureId, int structureType, bool structureValid);
bool cityExists(int cityId) const;
CityInfo const &getCityInfo(int cityId) const;
void getAllCityIds(stdvector<int>::fwd &results) const;
stdmap<int, CityInfo>::fwd const &getAllCityInfo() const;
void getAllCityIds(std::vector<int> &results) const;
std::map<int, CityInfo> const &getAllCityInfo() const;
int findCityByName(std::string const &name) const;
int findCityByCityHall(NetworkId const &cityHallId) const;
int getCityAtLocation(std::string const &planetName, int x, int z, int radius) const;
void getCitizenIds(int cityId, stdvector<NetworkId>::fwd &results) const;
stdmap<std::pair<int, NetworkId>, CitizenInfo>::fwd const &getAllCitizensInfo() const;
void getCitizenIds(int cityId, std::vector<NetworkId> &results) const;
std::map<std::pair<int, NetworkId>, CitizenInfo> const &getAllCitizensInfo() const;
CitizenInfo const *getCitizenInfo(int cityId, NetworkId const &citizenId) const;
void getCityStructureIds(int cityId, stdvector<NetworkId>::fwd &results) const;
stdmap<std::pair<int, NetworkId>, CityStructureInfo>::fwd const & getAllCityStructuresInfo() const;
void getCityStructureIds(int cityId, std::vector<NetworkId> &results) const;
std::map<std::pair<int, NetworkId>, CityStructureInfo> const & getAllCityStructuresInfo() const;
CityStructureInfo const *getCityStructureInfo(int cityId, NetworkId const &structureId) const;
stdvector<int>::fwd const & getCitizenOfCityId(NetworkId const &citizenId) const;
std::vector<int> const & getCitizenOfCityId(NetworkId const &citizenId) const;
std::map<std::pair<std::string, int>, uint32> const & getGcwRegionDefenderCities() const;
std::map<std::string, std::pair<int, int> > const & getGcwRegionDefenderCitiesCount() const;
engine/server/library/serverGame/src/shared/object/CreatureObject.cpp
+4 -4
View File
@@ -422,7 +422,7 @@ namespace CreatureObjectNamespace
const NetworkId & targetId = target.getNetworkId ();
typedef stdvector<NetworkId>::fwd NetworkIdVector;
typedef std::vector<NetworkId> NetworkIdVector;
static NetworkIdVector ids;
ids.clear ();
@@ -444,7 +444,7 @@ namespace CreatureObjectNamespace
static const std::string objvarname_vendorList = "player_structure.vendor.vendorList";
const Unicode::String & requestorFirstName = object.getAssignedObjectFirstName ();
typedef stdvector<Unicode::String>::fwd StringVector;
typedef std::vector<Unicode::String> StringVector;
static StringVector sv;
sv.clear ();
@@ -8909,7 +8909,7 @@ void CreatureObject::updateMissionRequestQueue()
// ----------------------------------------------------------------------
void CreatureObject::getAttributes(stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const
void CreatureObject::getAttributes(std::vector<std::pair<std::string, Unicode::String> > &data) const
{
TangibleObject::getAttributes(data);
}
@@ -13910,7 +13910,7 @@ bool CreatureObject::stillHasBuffState(uint32 buffNameCrc, int state) const
// ----------------------------------------------------------------------
void CreatureObject::getAllBuffs(stdvector<uint32>::fwd & buffCrcs) const
void CreatureObject::getAllBuffs(std::vector<uint32> & buffCrcs) const
{
buffCrcs.clear();
buffCrcs.reserve(m_buffs.size());
engine/server/library/serverGame/src/shared/object/CreatureObject.h
+18 -18
View File
@@ -166,9 +166,9 @@ public:
static char const * getMentalStateString(MentalStates::Enumerator const mentalState);
static char const * getBehaviorString(Behaviors::Enumerator const behavior);
typedef stdmap<std::string, int>::fwd ExperiencePointMap;
typedef stdset<const SkillObject *>::fwd SkillList;
typedef stdvector<std::string>::fwd StringVector;
typedef std::map<std::string, int> ExperiencePointMap;
typedef std::set<const SkillObject *> SkillList;
typedef std::vector<std::string> StringVector;
typedef std::pair<std::pair<NetworkId /*player*/, std::string /*name*/>, NetworkId /*ship*/> PlayerAndShipPair;
CreatureObject(const ServerCreatureObjectTemplate* newTemplate);
@@ -229,7 +229,7 @@ public:
int getShockWounds () const;
void setShockWounds (int wound);
void setAttribute (Attributes::Enumerator attribute, Attributes::Value value);
virtual void getAttributes (stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const;
virtual void getAttributes (std::vector<std::pair<std::string, Unicode::String> > &data) const;
void sendTimedModData (uint32 id, float time, bool updateCache = true);
void sendCancelTimedMod (uint32 id);
@@ -277,13 +277,13 @@ public:
virtual const std::set<TriggerVolume *> * getTriggerVolumeEntered () const;
// crafting functions
const stdmap<std::pair<uint32, uint32>,int>::fwd & getDraftSchematics () const;
const std::map<std::pair<uint32, uint32>,int> & getDraftSchematics () const;
bool isIngredientInInventory(const Object & ingredient) const;
void disableSchematicFiltering(void);
void enableSchematicFiltering(void);
bool isSchematicFilteringEnabled(void);
void getManufactureSchematics(stdvector<const ManufactureSchematicObject *>::fwd & schematics);
void getManufactureSchematics(stdvector<const ManufactureSchematicObject *>::fwd & schematics, uint32 craftingTypes);
void getManufactureSchematics(std::vector<const ManufactureSchematicObject *> & schematics);
void getManufactureSchematics(std::vector<const ManufactureSchematicObject *> & schematics, uint32 craftingTypes);
// inventory functions
bool isItemEquipped (const Object & item) const;
@@ -292,7 +292,7 @@ public:
int getExperiencePoints(const std::string & experienceType) const;
const std::map<std::string, int> & getExperiencePoints() const;
const SkillList & getSkillList() const;
const stdmap<std::string, std::pair<int, int> >::fwd & getModMap() const;
const std::map<std::string, std::pair<int, int> > & getModMap() const;
const int getModValue(const std::string & modName) const;
const int getEnhancedModValue(const std::string & modName) const;
const int getEnhancedModValueUncapped(const std::string & modName) const; // This version does not respect getMaxCreatureSkillModBonus
@@ -337,7 +337,7 @@ public:
void removeAllAttributeModifiers ();
void removeAllAttributeAndSkillmodMods ();
const AttribMod::AttribMod * getAttributeModifier(const std::string & modName) const;
const stdmap<uint32, CreatureMod>::fwd & getAttributeModifiers () const;
const std::map<uint32, CreatureMod> & getAttributeModifiers () const;
// Mental state functions
MentalStates::Value getMentalState(MentalStates::Enumerator attribute) const;
@@ -345,7 +345,7 @@ public:
MentalStates::Value getUnmodifiedMentalState(MentalStates::Enumerator attribute) const;
MentalStates::Value getMaxMentalState(MentalStates::Enumerator attribute) const;
float getMentalStateDecay(MentalStates::Enumerator state) const;
void getBehaviorTargets(Behaviors::Enumerator behavior, stdvector<NetworkId>::fwd &targets);
void getBehaviorTargets(Behaviors::Enumerator behavior, std::vector<NetworkId> &targets);
Behaviors::Enumerator getBehavior() const;
Behaviors::Enumerator getBehaviorToward(const NetworkId &target) const;
@@ -489,8 +489,8 @@ public:
bool detachAllRiders();
CreatureObject const *getPrimaryMountingRider() const;
CreatureObject *getPrimaryMountingRider();
void getMountingRiders(stdvector<const CreatureObject *>::fwd & riders) const;
void getMountingRiders(stdvector<CreatureObject *>::fwd & riders);
void getMountingRiders(std::vector<const CreatureObject *> & riders) const;
void getMountingRiders(std::vector<CreatureObject *> & riders);
// Called on rider.
bool mountCreature(CreatureObject &mountObject);
@@ -507,7 +507,7 @@ public:
bool pilotShip(ServerObject &pilotSlotObject);
bool unpilotShip();
void getAllShipsInDatapad(stdvector<NetworkId>::fwd & ships) const;
void getAllShipsInDatapad(std::vector<NetworkId> & ships) const;
// ======
@@ -519,7 +519,7 @@ public:
};
};
typedef stdunordered_set<const CreatureObject *, CreatureObjectPointerHash>::fwd AllCreaturesSet;
typedef std::unordered_set<const CreatureObject *, CreatureObjectPointerHash> AllCreaturesSet;
static const AllCreaturesSet & getAllCreatures();
bool monitorCreatureMovement(const CachedNetworkId &ofTarget, float i_skittishness, float i_curve);
@@ -613,7 +613,7 @@ public:
void addBuff(uint32 buffNameCrc, float duration = 0.0f, float dynamicValue = 0.0f, NetworkId caster = NetworkId::cms_invalid, uint32 stackCount = 1 );
void addBuff(uint32 buffNameCrc, float timeTillRemoval, float dynamicValue, float totalDuration, NetworkId caster, uint32 stackCount = 1);
void removeBuff(uint32 buffNameCrc);
void getAllBuffs(stdvector<uint32>::fwd & buffCrcs) const;
void getAllBuffs(std::vector<uint32> & buffCrcs) const;
bool getBuff(uint32 buffNameCrc, Buff & buff) const;
void decrementBuff(uint32 const buffNameCrc, uint32 const stacksToRemove = 1);
void decayBuff(uint32 buffNameCrc, float decayPercentage);
@@ -648,7 +648,7 @@ public:
unsigned long getLastWaterDamageTime() const;
void setLastWaterDamageTime(unsigned long newTime);
stdmap<std::string, int>::fwd const & getCommandList() const;
std::map<std::string, int> const & getCommandList() const;
void clearCommands();
bool grantCommand(std::string const & commandName, bool fromSkill);
void revokeCommand(std::string const & command, bool fromSkill, bool ignoreCount = false);
@@ -758,7 +758,7 @@ private:
void addAttribBonus(int attrib, int bonus);
void updateSlopeMovement(const std::string & modName);
int getCurrentTargetsTotal(const stdmap<Attributes::Enumerator, Attributes::Value>::fwd & targets);
int getCurrentTargetsTotal(const std::map<Attributes::Enumerator, Attributes::Value> & targets);
int changeAttribModCurrentValue(Attributes::Enumerator attrib, int delta, bool checkPoolOverflow);
void recomputeAttribModTotals(bool checkPoolOverflow);
@@ -799,7 +799,7 @@ private:
};
friend struct StateChangeCallback;
typedef stdvector<MessageQueueMissionListResponseData>::fwd MessageQueueMissionListResponseDataVector;
typedef std::vector<MessageQueueMissionListResponseData> MessageQueueMissionListResponseDataVector;
MessageQueueMissionListResponseDataVector m_missionResponseEntries;
static const SharedObjectTemplate * m_defaultSharedTemplate; // template to use if no shared template is given
engine/server/library/serverGame/src/shared/object/DistributionListStack.h
+1 -1
View File
@@ -22,7 +22,7 @@ class ConnectionServerConnection;
class DistributionListStack
{
public:
static stdmap<ConnectionServerConnection *, stdvector<NetworkId>::fwd>::fwd &alloc();
static std::map<ConnectionServerConnection *, std::vector<NetworkId>> &alloc();
static void release();
private:
engine/server/library/serverGame/src/shared/object/DraftSchematicObject.cpp
+1 -1
View File
@@ -557,7 +557,7 @@ void DraftSchematicObject::remove()
// ----------------------------------------------------------------------
void DraftSchematicObject::getAttributes(stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const
void DraftSchematicObject::getAttributes(std::vector<std::pair<std::string, Unicode::String> > &data) const
{
IntangibleObject::getAttributes(data);
}
engine/server/library/serverGame/src/shared/object/DraftSchematicObject.h
+1 -1
View File
@@ -60,7 +60,7 @@ public:
float getManufactureTime(void) const;
float getPrototypeTime(void) const;
bool mustDestroyIngredients(void) const;
virtual void getAttributes(stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const;
virtual void getAttributes(std::vector<std::pair<std::string, Unicode::String> > &data) const;
const StringId getExperimentalAttributeFromAttribute(int index) const;
const StringId getExperimentalAttributeFromAttribute(const StringId & attribName) const;
engine/server/library/serverGame/src/shared/object/FactoryObject.h
+1 -1
View File
@@ -36,7 +36,7 @@ public:
virtual Controller* createDefaultController(void);
void addMembersToPackages ();
virtual void getAttributes (stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const;
virtual void getAttributes (std::vector<std::pair<std::string, Unicode::String> > &data) const;
bool startCraftingSession(ManufactureSchematicObject & schematic);
bool endCraftingSession();
engine/server/library/serverGame/src/shared/object/GroupObject.cpp
+1 -1
View File
@@ -829,7 +829,7 @@ void GroupObject::onVoiceChatRoomCreate(std::string const &name) // static
// ----------------------------------------------------------------------
void GroupObject::getAttributes(stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const
void GroupObject::getAttributes(std::vector<std::pair<std::string, Unicode::String> > &data) const
{
UniverseObject::getAttributes(data);
}
engine/server/library/serverGame/src/shared/object/GroupObject.h
+3 -3
View File
@@ -27,7 +27,7 @@ class ServerGroupObjectTemplate;
class GroupObject: public UniverseObject
{
public:
typedef stdvector<GroupMemberParam>::fwd GroupMemberParamVector;
typedef std::vector<GroupMemberParam> GroupMemberParamVector;
GroupObject(ServerGroupObjectTemplate const *newTemplate);
virtual ~GroupObject();
@@ -50,12 +50,12 @@ public:
static int maximumMembersInGroup();
typedef std::pair<NetworkId, std::string> GroupMember;
typedef stdvector<GroupMember>::fwd GroupMemberVector;
typedef std::vector<GroupMember> GroupMemberVector;
typedef std::pair<NetworkId /*ship*/, int /*formation slot*/> GroupShipFormationMember;
typedef std::pair<NetworkId /*POB ship*/, NetworkId /*owner of the POB*/> GroupPOBShipAndOwner;
std::string const & getGroupName () const;
void getGroupMemberIds (stdvector<NetworkId>::fwd &members) const;
void getGroupMemberIds (std::vector<NetworkId> &members) const;
NetworkId const & getGroupLeaderId () const;
std::string const & getGroupLeaderName () const;
bool isGroupFull () const;
engine/server/library/serverGame/src/shared/object/GuildObject.h
+7 -7
View File
@@ -32,22 +32,22 @@ public:
virtual Controller* createDefaultController();
virtual void setupUniverse();
virtual bool isVisibleOnClient(const Client &client) const;
virtual void getAttributes(stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const;
virtual void getAttributes(std::vector<std::pair<std::string, Unicode::String> > &data) const;
virtual void unload();
GuildInfo const * getGuildInfo(int guildId) const;
GuildMemberInfo const * getGuildMemberInfo(int guildId, NetworkId const &memberId) const;
stdset<std::string>::fwd const &getGuildEnemies() const;
std::set<std::string> const &getGuildEnemies() const;
void getAllGuildIds(stdvector<int>::fwd &results) const;
void getAllGuildIds(std::vector<int> &results) const;
int findGuild(std::string const &name) const;
bool guildExists(int guildId) const;
int getGuildId(NetworkId const &memberId) const;
int getGuildIdForSponsored(NetworkId const &memberId) const;
int getGuildIdForGuildLeader(NetworkId const &leaderId) const;
void getGuildMemberIds(int guildId, stdvector<NetworkId>::fwd &results) const;
void getMemberIdsWithPermissions(int guildId, int permissions, stdvector<NetworkId>::fwd &results) const;
void getGuildMemberIds(int guildId, std::vector<NetworkId> &results) const;
void getMemberIdsWithPermissions(int guildId, int permissions, std::vector<NetworkId> &results) const;
int createGuild(std::string const &guildName, std::string const &guildAbbrev, int guildId = 0);
void disbandGuild(int guildId);
@@ -63,7 +63,7 @@ public:
void addGuildMemberRank(int guildId, NetworkId const &memberId, std::string const &rankName);
void removeGuildMemberRank(int guildId, NetworkId const &memberId, std::string const &rankName);
bool hasGuildMemberRank(int guildId, NetworkId const &memberId, std::string const &rankName);
void getGuildMemberRank(int guildId, NetworkId const &memberId, stdvector<std::string>::fwd &ranks);
void getGuildMemberRank(int guildId, NetworkId const &memberId, std::vector<std::string> &ranks);
void setGuildLeader(int guildId, NetworkId const &leaderId);
void setGuildElectionEndTime(int guildId, int electionPreviousEndTime, int electionNextEndTime);
void setGuildFaction(int guildId, uint32 guildFaction);
@@ -77,7 +77,7 @@ public:
void calculateGcwImperialScorePercentileForSwg();
void depersistGcwImperialScorePercentile();
void updateGcwImperialScorePercentile(stdset<std::string>::fwd const & gcwScoreCategories);
void updateGcwImperialScorePercentile(std::set<std::string> const & gcwScoreCategories);
void updateGcwRegionDefenderBonus(std::string const & gcwScoreCategory);
std::map<std::string, int> const & getGcwImperialScorePercentile() const;
std::map<std::string, int> const & getGcwGroupImperialScorePercentile() const;
engine/server/library/serverGame/src/shared/object/HarvesterInstallationObject.cpp
+1 -1
View File
@@ -754,7 +754,7 @@ void HarvesterInstallationObject::sendResourceDataToClient(CreatureObject &clien
// ----------------------------------------------------------------------
void HarvesterInstallationObject::getAttributes(stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const
void HarvesterInstallationObject::getAttributes(std::vector<std::pair<std::string, Unicode::String> > &data) const
{
InstallationObject::getAttributes(data);
}
engine/server/library/serverGame/src/shared/object/HarvesterInstallationObject.h
+4 -4
View File
@@ -34,7 +34,7 @@ public:
virtual Controller* createDefaultController(void);
void addMembersToPackages();
virtual float alter(float time);
virtual void getAttributes(stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const;
virtual void getAttributes(std::vector<std::pair<std::string, Unicode::String> > &data) const;
//simulation functions:
virtual void activate (const NetworkId &actorId);
@@ -48,9 +48,9 @@ public:
virtual void handleCMessageTo (const MessageToPayload &message);
//getters
typedef stdvector<InstallationResourceData>::fwd ResourceDataVector;
typedef std::vector<InstallationResourceData> ResourceDataVector;
typedef std::pair<NetworkId, float> HopperContentElement;
typedef stdvector<HopperContentElement>::fwd HopperContentsVector;
typedef std::vector<HopperContentElement> HopperContentsVector;
float getHopperContents(HopperContentsVector * data=nullptr) const;
void getResourceData(ResourceDataVector & data);
@@ -98,7 +98,7 @@ private:
Archive::AutoDeltaVariable<float> m_hopperAmount; // amount of resource in the hopper. 0=empty, >0 = hopper containes that quantity of m_hopperResource, <0 = use object variables instead (contains multiple resources)
//EPM
stdvector<ResourceTypeObject const *>::fwd * m_survey;
std::vector<ResourceTypeObject const *> * m_survey;
uint32 m_surveyTime;
/// Members yet to be implemented.
engine/server/library/serverGame/src/shared/object/InstallationObject.cpp
+1 -1
View File
@@ -325,7 +325,7 @@ void InstallationObject::handleCMessageTo (const MessageToPayload &message)
// ----------------------------------------------------------------------
void InstallationObject::getAttributes(stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const
void InstallationObject::getAttributes(std::vector<std::pair<std::string, Unicode::String> > &data) const
{
TangibleObject::getAttributes(data);
}
engine/server/library/serverGame/src/shared/object/InstallationObject.h
+2 -2
View File
@@ -34,7 +34,7 @@ public:
virtual Controller* createDefaultController(void);
void addMembersToPackages();
virtual float alter(float time);
virtual void getAttributes(stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const;
virtual void getAttributes(std::vector<std::pair<std::string, Unicode::String> > &data) const;
virtual void getByteStreamFromAutoVariable(const std::string & name, Archive::ByteStream & target) const;
virtual void setAutoVariableFromByteStream(const std::string & name, const Archive::ByteStream & source);
@@ -67,7 +67,7 @@ public:
};
};
typedef stdunordered_set<const InstallationObject *, InstallationObjectPointerHash>::fwd AllInstallationsSet;
typedef std::unordered_set<const InstallationObject *, InstallationObjectPointerHash> AllInstallationsSet;
static const AllInstallationsSet & getAllInstallations();
protected:
engine/server/library/serverGame/src/shared/object/IntangibleObject.cpp
+1 -1
View File
@@ -930,7 +930,7 @@ bool IntangibleObject::setTheaterName(const std::string & name)
// ----------------------------------------------------------------------
void IntangibleObject::getAttributes(stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const
void IntangibleObject::getAttributes(std::vector<std::pair<std::string, Unicode::String> > &data) const
{
ServerObject::getAttributes(data);
}
engine/server/library/serverGame/src/shared/object/IntangibleObject.h
+1 -1
View File
@@ -46,7 +46,7 @@ public:
virtual void onPermanentlyDestroyed();
virtual bool persist();
virtual bool isVisibleOnClient (const Client & client) const;
virtual void getAttributes (stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const;
virtual void getAttributes (std::vector<std::pair<std::string, Unicode::String> > &data) const;
virtual bool onContainerAboutToTransfer(ServerObject * destination, ServerObject* transferer);
int getCount(void) const;
engine/server/library/serverGame/src/shared/object/ManufactureInstallationObject.h
+1 -1
View File
@@ -78,7 +78,7 @@ private:
class TaskManufactureObject;
friend class TaskManufactureObject;
typedef stdvector<std::pair<CachedNetworkId, int> >::fwd IngredientVector;
typedef std::vector<std::pair<CachedNetworkId, int> > IngredientVector;
void restoreIngredients(IngredientVector const &ingredients);
void destroyIngredients(IngredientVector const &ingredients);
engine/server/library/serverGame/src/shared/object/ManufactureSchematicObject.h
+1 -1
View File
@@ -151,7 +151,7 @@ public:
public:
// <name, <isComponent, countPerItem> >
typedef std::pair<Unicode::String, std::pair<bool, int> > IngredientInfo;
typedef stdvector<IngredientInfo>::fwd IngredientInfoVector;
typedef std::vector<IngredientInfo> IngredientInfoVector;
void getIngredientInfo (IngredientInfoVector & iiv) const;
protected:
engine/server/library/serverGame/src/shared/object/MissionObject.cpp
+1 -1
View File
@@ -200,7 +200,7 @@ void MissionObject::setMissionHolderId(const NetworkId & h)
//-----------------------------------------------------------------------
void MissionObject::getAttributes(stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const
void MissionObject::getAttributes(std::vector<std::pair<std::string, Unicode::String> > &data) const
{
IntangibleObject::getAttributes(data);
std::string const & missionType = getMissionTypeString();
engine/server/library/serverGame/src/shared/object/MissionObject.h
+1 -1
View File
@@ -44,7 +44,7 @@ public:
void endMission (const bool succeeded);
const NetworkId & getMissionHolderId () const;
virtual void getAttributes (stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const;
virtual void getAttributes (std::vector<std::pair<std::string, Unicode::String> > &data) const;
/*mission data*/
engine/server/library/serverGame/src/shared/object/PatrolPathNodeProperty.h
+3 -3
View File
@@ -28,12 +28,12 @@ public:
~PatrolPathNodeProperty();
void addRoot(const ServerObject & root);
const stdset<CachedNetworkId>::fwd & getRoots() const;
const std::set<CachedNetworkId> & getRoots() const;
bool hasRoot(const ServerObject & root) const;
private:
stdset<CachedNetworkId>::fwd * m_roots;
std::set<CachedNetworkId> * m_roots;
private:
PatrolPathNodeProperty();
@@ -44,7 +44,7 @@ private:
// ======================================================================
inline const stdset<CachedNetworkId>::fwd & PatrolPathNodeProperty::getRoots() const
inline const std::set<CachedNetworkId> & PatrolPathNodeProperty::getRoots() const
{
return *m_roots;
}
engine/server/library/serverGame/src/shared/object/PatrolPathRootProperty.h
+2 -2
View File
@@ -36,12 +36,12 @@ public:
void addPatrollingObject(const ServerObject & ai);
void removePatrollingObject(const ServerObject & ai);
const stdset<ConstWatcher<ServerObject> >::fwd & getPatrollingObjects() const;
const std::set<ConstWatcher<ServerObject> > & getPatrollingObjects() const;
private:
int m_observerCount;
stdset<ConstWatcher<ServerObject> >::fwd * m_patrollers;
std::set<ConstWatcher<ServerObject> > * m_patrollers;
private:
PatrolPathRootProperty();
engine/server/library/serverGame/src/shared/object/PlanetObject.h
+8 -8
View File
@@ -54,7 +54,7 @@ public:
public:
const std::string & getName () const;
void setPlanetName (const std::string &newName);
virtual void getAttributes (stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const;
virtual void getAttributes (std::vector<std::pair<std::string, Unicode::String> > &data) const;
//resource pools functions
void getAvailableResourceList (std::vector<ResourceTypeObject const *> &buffer) const;
@@ -72,10 +72,10 @@ public:
//-- planetary map support
typedef stdvector<MapLocation>::fwd MapLocationVector;
typedef stdmap<NetworkId, MapLocation>::fwd MapLocationMap;
typedef std::vector<MapLocation> MapLocationVector;
typedef std::map<NetworkId, MapLocation> MapLocationMap;
typedef Archive::AutoDeltaMap<NetworkId, MapLocation> ArchiveMapLocationMap;
typedef stdvector<int>::fwd IntVector;
typedef std::vector<int> IntVector;
bool addMapLocation (const MapLocation &location, int mapLocationType, bool enforceLocationCountLimits);
bool removeMapLocation (const NetworkId &id);
@@ -93,10 +93,10 @@ public:
int getNumberOfTravelPoints () const;
const TravelPoint* getTravelPoint (int travelPointIndex) const;
const TravelPoint* getTravelPoint (const std::string& name) const;
void getTravelPointNameList (stdvector<std::string>::fwd& travelPointNameList) const;
void getTravelPointPointList (stdvector<Vector>::fwd& travelPointPointList) const;
void getTravelPointCostList (stdvector<int>::fwd& travelPointCostList) const;
void getTravelPointInterplanetaryList (stdvector<bool>::fwd& travelPointInterplanetaryList) const;
void getTravelPointNameList (std::vector<std::string>& travelPointNameList) const;
void getTravelPointPointList (std::vector<Vector>& travelPointPointList) const;
void getTravelPointCostList (std::vector<int>& travelPointCostList) const;
void getTravelPointInterplanetaryList (std::vector<bool>& travelPointInterplanetaryList) const;
std::set<std::pair<std::pair<int32, std::string>, std::pair<NetworkId, Unicode::String> > > const & getCollectionServerFirst() const;
int getCollectionServerFirstUpdateNumber() const;
engine/server/library/serverGame/src/shared/object/PlayerObject.cpp
+2 -2
View File
@@ -3305,7 +3305,7 @@ void PlayerObject::stopCrafting (bool normalExit)
// ----------------------------------------------------------------------
void PlayerObject::getAttributes(stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const
void PlayerObject::getAttributes(std::vector<std::pair<std::string, Unicode::String> > &data) const
{
IntangibleObject::getAttributes(data);
}
@@ -7862,7 +7862,7 @@ bool PlayerObject::hasCompletedCollectionBook(std::string const & bookName) cons
// ----------------------------------------------------------------------
int PlayerObject::getCompletedCollectionSlotCountInCollection(std::string const & collectionName, stdvector<CollectionsDataTable::CollectionInfoSlot const *>::fwd * collectionInfo /*= nullptr*/) const
int PlayerObject::getCompletedCollectionSlotCountInCollection(std::string const & collectionName, std::vector<CollectionsDataTable::CollectionInfoSlot const *> * collectionInfo /*= nullptr*/) const
{
if (collectionInfo)
collectionInfo->clear();
engine/server/library/serverGame/src/shared/object/PlayerObject.h
+23 -23
View File
@@ -63,10 +63,10 @@ public:
time_t m_time;
};
typedef stdlist<ChatLogEntry>::fwd ChatLog;
typedef stdvector<std::string>::fwd StringVector;
typedef stdmap<std::string, int>::fwd ExperiencePointMap;
typedef stdmap<NetworkId, Waypoint>::fwd WaypointMap;
typedef std::list<ChatLogEntry> ChatLog;
typedef std::vector<std::string> StringVector;
typedef std::map<std::string, int> ExperiencePointMap;
typedef std::map<NetworkId, Waypoint> WaypointMap;
typedef Archive::AutoDeltaPackedMap<uint32, PlayerQuestData> PlayerQuestDataMap;
explicit PlayerObject(const ServerPlayerObjectTemplate* newTemplate);
@@ -76,7 +76,7 @@ public:
virtual PlayerObject const *asPlayerObject() const;
static void removeDefaultTemplate(void);
static stdset<PlayerObject const *>::fwd const &getAllPlayerObjects();
static std::set<PlayerObject const *> const &getAllPlayerObjects();
void addMembersToPackages ();
Waypoint const createWaypoint (const Location & location, bool ignoreLimits);
@@ -88,7 +88,7 @@ public:
WaypointMap const &getWaypoints () const;
void setGroupWaypoints (WaypointMap const &groupWaypointMap);
virtual void getAttributes (stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const;
virtual void getAttributes (std::vector<std::pair<std::string, Unicode::String> > &data) const;
virtual void endBaselines();
virtual void onLoadedFromDatabase();
static std::string getAccountDescription(const ServerObject *);
@@ -213,21 +213,21 @@ public:
// crafting functions
bool isCrafting(void) const;
const stdmap<std::pair<uint32, uint32>,int>::fwd & getDraftSchematics () const;
const std::map<std::pair<uint32, uint32>,int> & getDraftSchematics () const;
const CachedNetworkId & getCraftingTool () const;
void setCraftingTool(const TangibleObject & tool);
const CachedNetworkId & getCraftingStation () const;
void setCraftingStation(const TangibleObject * station);
const DraftSchematicObject * getCurrentDraftSchematic () const;
bool requestCraftingSession(const NetworkId & toolId);
void sendUseableDraftSchematics(stdvector<uint32>::fwd & schematicNames);
void sendUseableDraftSchematics(std::vector<uint32> & schematicNames);
bool requestDraftSlots(uint32 draftSchematicCrc, MessageQueueDraftSlots * message, MessageQueueDraftSlotsQueryResponse * queryMessage);
void selectDraftSchematic(int index);
Crafting::CraftingError fillSlot(int slotIndex, int slotOptionIndex, const NetworkId & ingredientIndex);
Crafting::CraftingError emptySlot(int slotIndex, const NetworkId & targetContainer);
int goToNextCraftingStage ();
int startCraftingExperiment ();
Crafting::CraftingResult experiment(const stdvector<MessageQueueCraftExperiment::ExperimentInfo>::fwd & experiments, int totalPoints, int corelevel);
Crafting::CraftingResult experiment(const std::vector<MessageQueueCraftExperiment::ExperimentInfo> & experiments, int totalPoints, int corelevel);
bool customize(int property, int value) const;
int setCustomizationData(const Unicode::String & name, int appearanceIndex, const std::vector<Crafting::CustomValue> & customizations, int itemCount) const;
bool createPrototype(bool keepPrototype);
@@ -276,8 +276,8 @@ public:
bool questHasActiveQuestTask(uint32 questCrc, int taskId) const;
bool questHasCompletedQuestTask(uint32 questCrc, int taskId) const;
uint32 questGetQuestStatus(uint32 const questCrc) const;
stdvector<int>::fwd questGetAllActiveQuestIds() const;
stdvector<int>::fwd questGetAllCompletedQuestIds() const;
std::vector<int> questGetAllActiveQuestIds() const;
std::vector<int> questGetAllCompletedQuestIds() const;
bool questPlayerCanClaimRewardFor(uint32 questCrc);
uint32 getCurrentQuest() const;
@@ -361,8 +361,8 @@ public:
bool getCollectionSlotValue(std::string const & slotName, unsigned long & value) const;
bool getCollectionSlotValue(CollectionsDataTable::CollectionInfoSlot const & slotInfo, unsigned long & value) const;
bool hasCompletedCollectionSlotPrereq(std::string const & slotName, stdvector<CollectionsDataTable::CollectionInfoSlot const *>::fwd * collectionInfo = nullptr) const;
bool hasCompletedCollectionSlotPrereq(CollectionsDataTable::CollectionInfoSlot const & slotInfo, stdvector<CollectionsDataTable::CollectionInfoSlot const *>::fwd * collectionInfo = nullptr) const;
bool hasCompletedCollectionSlotPrereq(std::string const & slotName, std::vector<CollectionsDataTable::CollectionInfoSlot const *> * collectionInfo = nullptr) const;
bool hasCompletedCollectionSlotPrereq(CollectionsDataTable::CollectionInfoSlot const & slotInfo, std::vector<CollectionsDataTable::CollectionInfoSlot const *> * collectionInfo = nullptr) const;
bool hasCompletedCollectionSlot(std::string const & slotName) const;
bool hasCompletedCollectionSlot(CollectionsDataTable::CollectionInfoSlot const & slotInfo) const;
@@ -374,17 +374,17 @@ public:
bool hasCompletedCollectionBook(std::string const & bookName) const;
int getCompletedCollectionSlotCountInCollection(std::string const & collectionName, stdvector<CollectionsDataTable::CollectionInfoSlot const *>::fwd * collectionInfo = nullptr) const;
int getCompletedCollectionSlotCountInCollection(std::string const & collectionName, std::vector<CollectionsDataTable::CollectionInfoSlot const *> * collectionInfo = nullptr) const;
int getCompletedCollectionSlotCountInPage(std::string const & pageName, stdvector<CollectionsDataTable::CollectionInfoSlot const *>::fwd * collectionInfo = nullptr) const;
int getCompletedCollectionCountInPage(std::string const & pageName, stdvector<CollectionsDataTable::CollectionInfoCollection const *>::fwd * collectionInfo = nullptr) const;
int getCompletedCollectionSlotCountInPage(std::string const & pageName, std::vector<CollectionsDataTable::CollectionInfoSlot const *> * collectionInfo = nullptr) const;
int getCompletedCollectionCountInPage(std::string const & pageName, std::vector<CollectionsDataTable::CollectionInfoCollection const *> * collectionInfo = nullptr) const;
int getCompletedCollectionSlotCountInBook(std::string const & bookName, stdvector<CollectionsDataTable::CollectionInfoSlot const *>::fwd * collectionInfo = nullptr) const;
int getCompletedCollectionCountInBook(std::string const & bookName, stdvector<CollectionsDataTable::CollectionInfoCollection const *>::fwd * collectionInfo = nullptr) const;
int getCompletedCollectionPageCountInBook(std::string const & bookName, stdvector<CollectionsDataTable::CollectionInfoPage const *>::fwd * collectionInfo = nullptr) const;
int getCompletedCollectionBookCount(stdvector<CollectionsDataTable::CollectionInfoBook const *>::fwd * collectionInfo = nullptr) const;
int getCompletedCollectionSlotCountInBook(std::string const & bookName, std::vector<CollectionsDataTable::CollectionInfoSlot const *> * collectionInfo = nullptr) const;
int getCompletedCollectionCountInBook(std::string const & bookName, std::vector<CollectionsDataTable::CollectionInfoCollection const *> * collectionInfo = nullptr) const;
int getCompletedCollectionPageCountInBook(std::string const & bookName, std::vector<CollectionsDataTable::CollectionInfoPage const *> * collectionInfo = nullptr) const;
int getCompletedCollectionBookCount(std::vector<CollectionsDataTable::CollectionInfoBook const *> * collectionInfo = nullptr) const;
void migrateLegacyBadgesToCollection(stdvector<int>::fwd const & badges);
void migrateLegacyBadgesToCollection(std::vector<int> const & badges);
// chat spam info
int getChatSpamSpatialNumCharacters() const;
@@ -530,7 +530,7 @@ private:
Archive::AutoDeltaVariable<CachedNetworkId> m_craftingTool; // tool a player is crafting with
Archive::AutoDeltaVariable<CachedNetworkId> m_craftingStation; // station a player is crafting with
Archive::AutoDeltaVariable<NetworkId> m_craftingComponentBioLink;// bio-link id of a component
stdvector<uint32>::fwd m_useableDraftSchematics; // draft schematics a player may currently select from
std::vector<uint32> m_useableDraftSchematics; // draft schematics a player may currently select from
ConstWatcher<DraftSchematicObject> m_draftSchematic; // draft schematic the player is crafting with
static bool m_allowEmptySlot; // flag to allow emptySlot() to be called when not in the crafting assembly stage.
@@ -740,7 +740,7 @@ inline int32 PlayerObject::getSessionLastActiveTime() const
// ----------------------------------------------------------------------
inline const stdmap<std::pair<uint32, uint32>,int>::fwd & PlayerObject::getDraftSchematics () const
inline const std::map<std::pair<uint32, uint32>,int> & PlayerObject::getDraftSchematics () const
{
return m_draftSchematics.getMap();
}
engine/server/library/serverGame/src/shared/object/PlayerQuestObject.cpp
+1 -1
View File
@@ -169,7 +169,7 @@ void PlayerQuestObject::endBaselines()
//-----------------------------------------------------------------------
void PlayerQuestObject::getAttributes(stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const
void PlayerQuestObject::getAttributes(std::vector<std::pair<std::string, Unicode::String> > &data) const
{
TangibleObject::getAttributes(data);
engine/server/library/serverGame/src/shared/object/PlayerQuestObject.h
+1 -1
View File
@@ -31,7 +31,7 @@ public:
virtual bool onContainerAboutToTransfer(ServerObject * destination, ServerObject* transferer);
virtual int onContainerAboutToGainItem(ServerObject& item, ServerObject* transferer);
virtual void getAttributes (stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const;
virtual void getAttributes (std::vector<std::pair<std::string, Unicode::String> > &data) const;
virtual void onAddedToWorld ();
engine/server/library/serverGame/src/shared/object/ResourceContainerObject.cpp
+1 -1
View File
@@ -516,7 +516,7 @@ std::string ResourceContainerObject::getItemLog() const
// ----------------------------------------------------------------------
void ResourceContainerObject::getAttributes(stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const
void ResourceContainerObject::getAttributes(std::vector<std::pair<std::string, Unicode::String> > &data) const
{
TangibleObject::getAttributes(data);
engine/server/library/serverGame/src/shared/object/ResourceContainerObject.h
+2 -2
View File
@@ -29,7 +29,7 @@ class ResourceContainerObject : public TangibleObject
// Container transfers
bool addResource (const NetworkId &resourceType, int amount, const NetworkId &sourcePlayer);
bool addResource (ResourceTypeObject const * const resourceType, int amount, NetworkId const & sourcePlayer);
bool removeResource (const NetworkId &resourceType, int amount, stdvector<std::pair<NetworkId, int> >::fwd *sources);
bool removeResource (const NetworkId &resourceType, int amount, std::vector<std::pair<NetworkId, int> > *sources);
bool removeResourceWithoutExperience(const NetworkId &resourceType, int amount); //TODO: rewrite crafting to handle experience, remove this function
bool transferTo (ResourceContainerObject &destination, int amount);
bool splitContainer (int amount, const CachedNetworkId &destContainer, int arrangementId, const Vector &newLocation, ServerObject *actor);
@@ -44,7 +44,7 @@ class ResourceContainerObject : public TangibleObject
void setResourceCtsData(int quantity, const std::string & resourceData);
std::string debugPrint () const;
virtual void getAttributes (stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const;
virtual void getAttributes (std::vector<std::pair<std::string, Unicode::String> > &data) const;
virtual void endBaselines ();
virtual std::string getItemLog() const;
engine/server/library/serverGame/src/shared/object/ResourceTypeObject.cpp
+1 -1
View File
@@ -231,7 +231,7 @@ void ResourceTypeObject::getCrateTemplate(std::string &buffer) const
/**
* Get only those attributes specific to the resource
*/
void ResourceTypeObject::getResourceAttributes (stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const
void ResourceTypeObject::getResourceAttributes (std::vector<std::pair<std::string, Unicode::String> > &data) const
{
for (AttributesType::const_iterator i=m_attributes.begin(); i!=m_attributes.end(); ++i)
{
engine/server/library/serverGame/src/shared/object/ResourceTypeObject.h
+2 -2
View File
@@ -56,8 +56,8 @@ class ResourceTypeObject
bool hasPoolForPlanet (const NetworkId &planet) const;
bool isDerivedFrom (const ResourceClassObject &masterClass) const;
void getCrateTemplate (std::string &buffer) const;
void getResourceAttributes (stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const;
const stdmap<std::string, int>::fwd & getResourceAttributes () const;
void getResourceAttributes (std::vector<std::pair<std::string, Unicode::String> > &data) const;
const std::map<std::string, int> & getResourceAttributes () const;
ResourceFractalData const & getFractalData() const;
uint32 getDepletedTimestamp() const;
void deplete ();
engine/server/library/serverGame/src/shared/object/ServerObject.cpp
+3 -3
View File
@@ -7327,7 +7327,7 @@ std::string ServerObject::getLogDescription(const ServerObject * source)
void ServerObject::retrieveStoredObjectAttributes (AttributeVector & av) const
{
typedef stdvector<Unicode::String>::fwd UnicodeStringVector;
typedef std::vector<Unicode::String> UnicodeStringVector;
static UnicodeStringVector kv;
static UnicodeStringVector vv;
@@ -7358,7 +7358,7 @@ void ServerObject::retrieveStoredObjectAttributes (AttributeVector & av) const
void ServerObject::storeObjectAttributes (const ServerObject & prototype)
{
typedef stdvector<Unicode::String>::fwd UnicodeStringVector;
typedef std::vector<Unicode::String> UnicodeStringVector;
static UnicodeStringVector kv;
static UnicodeStringVector vv;
@@ -7398,7 +7398,7 @@ void ServerObject::clearStoredObjectAttributes ()
void ServerObject::replaceStoredObjectAttribute(Unicode::String const & attribute, Unicode::String const & value)
{
typedef stdvector<Unicode::String>::fwd UnicodeStringVector;
typedef std::vector<Unicode::String> UnicodeStringVector;
static UnicodeStringVector kv;
static UnicodeStringVector vv;
engine/server/library/serverGame/src/shared/object/ServerObject.h
+22 -22
View File
@@ -381,12 +381,12 @@ public:
int getTotalMoney () const;
public:
void scriptTransferCashTo (const NetworkId &target, int amount, const NetworkId &replyTo, const std::string &successCallback, const std::string &failCallback, const stdvector<int8>::fwd &packedDictionary);
void scriptTransferBankCreditsTo (const NetworkId &target, int amount, const NetworkId &replyTo, const std::string &successCallback, const std::string &failCallback, const stdvector<int8>::fwd &packedDictionary);
void scriptWithdrawCashFromBank (int amount, const NetworkId &replyTo, const std::string &successCallback, const std::string &failCallback, const stdvector<int8>::fwd &packedDictionary);
void scriptDepositCashToBank (int amount, const NetworkId &replyTo, const std::string &successCallback, const std::string &failCallback, const stdvector<int8>::fwd &packedDictionary);
void scriptTransferBankCreditsTo (const std::string &target, int amount, const NetworkId &replyTo, const std::string &successCallback, const std::string &failCallback, const stdvector<int8>::fwd &packedDictionary);
void scriptTransferBankCreditsFrom(const std::string &source, int amount, const NetworkId &replyTo, const std::string &successCallback, const std::string &failCallback, const stdvector<int8>::fwd &packedDictionary);
void scriptTransferCashTo (const NetworkId &target, int amount, const NetworkId &replyTo, const std::string &successCallback, const std::string &failCallback, const std::vector<int8> &packedDictionary);
void scriptTransferBankCreditsTo (const NetworkId &target, int amount, const NetworkId &replyTo, const std::string &successCallback, const std::string &failCallback, const std::vector<int8> &packedDictionary);
void scriptWithdrawCashFromBank (int amount, const NetworkId &replyTo, const std::string &successCallback, const std::string &failCallback, const std::vector<int8> &packedDictionary);
void scriptDepositCashToBank (int amount, const NetworkId &replyTo, const std::string &successCallback, const std::string &failCallback, const std::vector<int8> &packedDictionary);
void scriptTransferBankCreditsTo (const std::string &target, int amount, const NetworkId &replyTo, const std::string &successCallback, const std::string &failCallback, const std::vector<int8> &packedDictionary);
void scriptTransferBankCreditsFrom(const std::string &source, int amount, const NetworkId &replyTo, const std::string &successCallback, const std::string &failCallback, const std::vector<int8> &packedDictionary);
void sendControllerMessageToAuthServer(GameControllerMessage cm, MessageQueue::Data *msg, float value = 0.0f);
static std::string getLogDescription(const ServerObject * object);
@@ -478,7 +478,7 @@ public:
public:
void addSynchronizedUi (const stdvector<NetworkId>::fwd & clients);
void addSynchronizedUi (const std::vector<NetworkId> & clients);
void addSynchronizedUiClient (ServerObject & client);
bool areContentsVisibleToClient (const Client &) const;
void attachStartupScripts ();
@@ -489,7 +489,7 @@ public:
const int getCacheVersion () const;
Client * getClient () const;
int getObserversCount () const;
stdset<Client *>::fwd const & getObservers () const;
std::set<Client *> const & getObservers () const;
void addObserver (Client * client);
void removeObserver (Client * client);
void clearObservers ();
@@ -508,22 +508,22 @@ public:
void eraseObjVarListEntries(std::string const &name);
void copyObjVars(std::string const &name, ServerObject const &srcObject, std::string const &srcVarName);
bool setObjVarItem(std::string const &name, int value);
bool setObjVarItem(std::string const &name, stdvector<int>::fwd const &value);
bool setObjVarItem(std::string const &name, std::vector<int> const &value);
bool setObjVarItem(std::string const &name, float value);
bool setObjVarItem(std::string const &name, stdvector<float>::fwd const &value);
bool setObjVarItem(std::string const &name, std::vector<float> const &value);
bool setObjVarItem(std::string const &name, std::string const &value);
bool setObjVarItem(std::string const &name, Unicode::String const &value);
bool setObjVarItem(std::string const &name, stdvector<Unicode::String>::fwd const &value);
bool setObjVarItem(std::string const &name, std::vector<Unicode::String> const &value);
bool setObjVarItem(std::string const &name, NetworkId const &value);
bool setObjVarItem(std::string const &name, stdvector<NetworkId>::fwd const &value);
bool setObjVarItem(std::string const &name, std::vector<NetworkId> const &value);
bool setObjVarItem(std::string const &name, DynamicVariableLocationData const &value);
bool setObjVarItem(std::string const &name, stdvector<DynamicVariableLocationData>::fwd const &value);
bool setObjVarItem(std::string const &name, std::vector<DynamicVariableLocationData> const &value);
bool setObjVarItem(std::string const &name, StringId const &value);
bool setObjVarItem(std::string const &name, stdvector<StringId>::fwd const &value);
bool setObjVarItem(std::string const &name, std::vector<StringId> const &value);
bool setObjVarItem(std::string const &name, Transform const &value);
bool setObjVarItem(std::string const &name, stdvector<Transform>::fwd const &value);
bool setObjVarItem(std::string const &name, std::vector<Transform> const &value);
bool setObjVarItem(std::string const &name, Vector const &value);
bool setObjVarItem(std::string const &name, stdvector<Vector>::fwd const &value);
bool setObjVarItem(std::string const &name, std::vector<Vector> const &value);
bool setObjVarItem(std::string const &name, DynamicVariable const &value);
std::string const getPackedObjVars(std::string const &prefix) const;
@@ -566,7 +566,7 @@ public:
void sendCreateAndBaselinesToDatabaseServer() const;
void forwardServerCreateAndBaselines() const;
void sendToClientsInUpdateRange (const GameNetworkMessage & message, bool reliable, bool includeSelf=true) const;
static void sendToSpecifiedClients (const GameNetworkMessage & message, bool reliable, const stdvector<NetworkId>::fwd & clients);
static void sendToSpecifiedClients (const GameNetworkMessage & message, bool reliable, const std::vector<NetworkId> & clients);
void appendMessage (int message, float value, uint32 flags = GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT);
void appendMessage (int message, float value, MessageQueue::Data *data, uint32 flags = GameControllerMessageFlags::SEND | GameControllerMessageFlags::RELIABLE | GameControllerMessageFlags::DEST_AUTH_CLIENT);
virtual void setAuthServerProcessId (uint32 processId);
@@ -592,7 +592,7 @@ public:
void updatePositionOnPlanetServer (bool forceUpdate = false);
int getGameObjectType () const;
typedef stdvector<std::pair<std::string, Unicode::String> >::fwd AttributeVector;
typedef std::vector<std::pair<std::string, Unicode::String> > AttributeVector;
virtual void getAttributes (AttributeVector &data) const = 0;
virtual void getAttributes (const NetworkId & playerId, AttributeVector &data) const;
virtual void getAttributesForAuction (AttributeVector &data) const;
@@ -616,7 +616,7 @@ public:
void setLayer (TerrainGenerator::Layer* layer);
TerrainGenerator::Layer* getLayer () const;
virtual void getAuthClients(stdset<Client const *>::fwd &authClients) const;
virtual void getAuthClients(std::set<Client const *> &authClients) const;
virtual void setCacheVersion (const int cacheVersion);
void setDefaultAlterTime(float time);
@@ -628,7 +628,7 @@ public:
// ai patrol pathing support
void setPatrolPathRoot (const ServerObject & root);
const stdset<CachedNetworkId>::fwd & getPatrolPathRoots () const;
const std::set<CachedNetworkId> & getPatrolPathRoots () const;
void addPatrolPathingObject (const ServerObject & ai);
void removePatrolPathingObject (const ServerObject & ai);
void addPatrolPathObserver ();
@@ -788,7 +788,7 @@ private:
Watcher<ServerSynchronizedUi> m_synchronizedUi;
// list of objects with sync ui that are waiting for this object to have a client
// attached, due to an authority transfer
stdvector<NetworkId>::fwd * m_pendingSyncUi;
std::vector<NetworkId> * m_pendingSyncUi;
/** Flag for whether the object is persisted
*/
@@ -1055,7 +1055,7 @@ inline int ServerObject::getObserversCount() const
//-----------------------------------------------------------------------
inline stdset<Client *>::fwd const &ServerObject::getObservers() const
inline std::set<Client *> const &ServerObject::getObservers() const
{
return m_observers;
}
engine/server/library/serverGame/src/shared/object/ServerResourceClassObject.h
+3 -3
View File
@@ -40,8 +40,8 @@ class ServerResourceClassObject : public ResourceClassObject
virtual void debugOutput (std::string &output, int numSpaces=0) const;
int numTypesCouldSpawn () const;
int getNumTypes () const;
void getResourceTypes (stdvector<ResourceTypeObject const *>::fwd & types) const;
void getAllDerivedResourceTypes(stdvector<ResourceTypeObject const *>::fwd & types) const;
void getResourceTypes (std::vector<ResourceTypeObject const *> & types) const;
void getAllDerivedResourceTypes(std::vector<ResourceTypeObject const *> & types) const;
bool hasDerivedResourceType() const;
ResourceTypeObject const * getAResourceType() const;
ResourceFractalData const & getFractalData() const;
@@ -56,7 +56,7 @@ class ServerResourceClassObject : public ResourceClassObject
void checkRanges ();
void checkAttributeLimits();
void spawnAsNeeded ();
static void loadDistributionFromIff (stdmap<int, ResourceClassObject*>::fwd &resourceClasses);
static void loadDistributionFromIff (std::map<int, ResourceClassObject*> &resourceClasses);
private:
// simulation helper functions
engine/server/library/serverGame/src/shared/object/ShipObject.h
+7 -7
View File
@@ -56,10 +56,10 @@ public:
static ShipObject const * asShipObject(Object const * object);
static ShipObject * asShipObject(Object * object);
typedef stdvector<int>::fwd IntVector;
typedef stdmap<NetworkId, int>::fwd NetworkIdIntMap;
typedef std::vector<int> IntVector;
typedef std::map<NetworkId, int> NetworkIdIntMap;
typedef std::pair<Unicode::String, std::string> ResourceTypeInfoPair;
typedef stdmap<NetworkId, ResourceTypeInfoPair>::fwd ResourceTypeInfoMap;
typedef std::map<NetworkId, ResourceTypeInfoPair> ResourceTypeInfoMap;
public:
@@ -86,7 +86,7 @@ public:
CreatureObject const *getPilot() const;
CreatureObject *getPilot();
void findAllPassengers(stdvector<CreatureObject *>::fwd & passengers, bool onlyPlayerControlled);
void findAllPassengers(std::vector<CreatureObject *> & passengers, bool onlyPlayerControlled);
Vector getCurrentVelocity_p() const;
Vector getTargetLead_p(const Vector & startPosition_p, float projectileSpeed) const;
@@ -149,7 +149,7 @@ public:
bool getSlotTargetable(ShipChassisSlotType::Type slot) const;
bool isValidTargetableSlot (ShipChassisSlotType::Type slot) const;
int findTargetChassisSlotByPosition(Vector const & position_o) const;
void findTransformsForComponent(int const chassisSlot, stdvector<Transform>::fwd & transforms) const;
void findTransformsForComponent(int const chassisSlot, std::vector<Transform> & transforms) const;
AppearanceTemplate const * getExteriorAppearance() const;
int getNumberOfHits() const;
@@ -444,7 +444,7 @@ public:
float getChassisSpeedMaximumModifier() const;
void setChassisSpeedMaximumModifier(float f);
virtual void getAuthClients(stdset<Client const *>::fwd &authClients) const;
virtual void getAuthClients(std::set<Client const *> &authClients) const;
void stopFiringWeapon(int weaponIndex);
@@ -613,7 +613,7 @@ private:
float m_timeSinceLastPowerPulse;
typedef stdvector<FireShotQueueData>::fwd FireShotQueue;
typedef std::vector<FireShotQueueData> FireShotQueue;
FireShotQueue * m_fireShotQueue;
static float const ms_powerPulsePeriodSecs;
engine/server/library/serverGame/src/shared/object/StaticObject.cpp
+1 -1
View File
@@ -156,7 +156,7 @@ bool StaticObject::canDropInWorld() const
//-----------------------------------------------------------------------
void StaticObject::getAttributes(stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const
void StaticObject::getAttributes(std::vector<std::pair<std::string, Unicode::String> > &data) const
{
ServerObject::getAttributes(data);
}
engine/server/library/serverGame/src/shared/object/StaticObject.h
+1 -1
View File
@@ -31,7 +31,7 @@ public:
virtual bool canDropInWorld() const;
virtual bool isVisibleOnClient (const Client & client) const;
virtual void getAttributes (stdvector<std::pair<std::string, Unicode::String> >::fwd &data) const;
virtual void getAttributes (std::vector<std::pair<std::string, Unicode::String> > &data) const;
protected:
engine/server/library/serverGame/src/shared/object/TangibleObject.cpp
+2 -2
View File
@@ -5350,7 +5350,7 @@ bool TangibleObject::isOnAdminList(const CreatureObject& player) const
// 1) All player are stored as network IDs represented as a string
// 2) All guilds are stored as guild IDs represted as a string and prefixed with "guild:"
typedef stdvector<Unicode::String>::fwd StringVector;
typedef std::vector<Unicode::String> StringVector;
static StringVector sv;
sv.clear ();
@@ -5390,7 +5390,7 @@ bool TangibleObject::isOnHopperList(const CreatureObject& player) const
// 1) All player are stored as network IDs represented as a string
// 2) All guilds are stored as guild IDs represted as a string and prefixed with "guild:"
typedef stdvector<Unicode::String>::fwd StringVector;
typedef std::vector<Unicode::String> StringVector;
static StringVector sv;
sv.clear ();
engine/server/library/serverGame/src/shared/object/TangibleObject.h
+5 -5
View File
@@ -52,7 +52,7 @@ namespace CombatEngineData
struct CombatData;
struct DamageData;
typedef stdvector<CachedNetworkId>::fwd TargetIdList;
typedef std::vector<CachedNetworkId> TargetIdList;
};
namespace LocalObjectFlags
@@ -224,7 +224,7 @@ public:
virtual void unload();
virtual void onPermanentlyDestroyed();
void getEquippedItems(uint32 combatBone, stdvector<TangibleObject *>::fwd & items) const;
void getEquippedItems(uint32 combatBone, std::vector<TangibleObject *> & items) const;
TangibleObject * getRandomEquippedItem(uint32 combatBone) const;
@@ -287,7 +287,7 @@ public:
bool addSkillModSocketBonuses(const std::vector<std::pair<std::string, int> > & skillModBonuses);
int getSkillModSockets(void) const;
void setSkillModSockets(int sockets);
void getRequiredCertifications(stdvector<std::string>::fwd & results) const;
void getRequiredCertifications(std::vector<std::string> & results) const;
void forceExecuteCommand(Command const &command, NetworkId const &targetId, Unicode::String const &params, Command::ErrorCode &status, bool commandIsFromCommandQueue);
virtual void setOwnerId(const NetworkId &id);
@@ -354,7 +354,7 @@ public:
bool isInNpcConversation () const;
void addConversation (const NetworkId & conversant);
void removeConversation (const NetworkId & conversant);
const stdvector<NetworkId>::fwd & getConversations () const;
const std::vector<NetworkId> & getConversations () const;
void handlePlayerResponseToNpcConversation (const std::string & conversationName, const NetworkId & player, const StringId & response, const ProsePackage & pp);
virtual void setCacheVersion (const int cacheVersion);
@@ -761,7 +761,7 @@ inline bool TangibleObject::isInNpcConversation () const
//-----------------------------------------------------------------------
inline const stdvector<NetworkId>::fwd & TangibleObject::getConversations () const
inline const std::vector<NetworkId> & TangibleObject::getConversations () const
{
return m_conversations.get ();
}
engine/server/library/serverGame/src/shared/object/TangibleObject_Conversation.cpp
+1 -1
View File
@@ -174,7 +174,7 @@ void TangibleObject::endNpcConversation()
{
// since m_conversations will be changed as players are forced out
// of the conversation, we need to make a copy of our conversants
typedef stdvector<NetworkId>::fwd NetworkIdVector;
typedef std::vector<NetworkId> NetworkIdVector;
NetworkIdVector conversants(m_conversations.get());
{
engine/server/library/serverGame/src/shared/object/TriggerVolume.h
+1 -1
View File
@@ -60,7 +60,7 @@ public:
void setSpatialSubdivisionHandle(SpatialSubdivisionHandle *newHandle);
void objectMoved(ServerObject &object);
void objectDestroyed(ServerObject &object);
void contentsChanged(stdvector<ServerObject *>::fwd const &newSortedContents);
void contentsChanged(std::vector<ServerObject *> const &newSortedContents);
static void runScriptTriggers();
virtual bool isNetworkTriggerVolume() const;

Some files were not shown because too many files have changed in this diff Show More