swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-10-19 09:02:53 -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/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();