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...

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
@@ -23,7 +23,7 @@ class SphereTree;
typedef SphereTree<PathNode *, PathNodeSphereAccessor> PathNodeTree;
typedef stdvector<AxialBox>::fwd BoxList;
typedef std::vector<AxialBox> BoxList;
// ======================================================================
// CityPathGraph is a DynamicPathGraph with some specializations that
@@ -90,7 +90,7 @@ protected:
PathNodeTree * m_nodeTree;
//@todo: order the CityPathNodes below in such a way as to make searching for the closest one quick
stdmap<Unicode::String, stdset<CityPathNode *>::fwd >::fwd * m_namedNodes;
std::map<Unicode::String, std::set<CityPathNode *> > * m_namedNodes;
int m_token;
CachedNetworkId m_creatorId;
@@ -1072,7 +1072,7 @@ bool CityPathGraphManager::reloadPathNodes ( void )
// ----------------------------------------------------------------------
bool CityPathGraphManager::reloadPathNodes ( stdvector< ServerObject * >::fwd const & objects )
bool CityPathGraphManager::reloadPathNodes ( std::vector< ServerObject * > const & objects )
{
int objectCount = objects.size();
@@ -16,9 +16,9 @@ class CityPathGraph;
class CityPathNode;
class BuildingObject;
typedef stdmap< int, CityPathGraph * >::fwd CityGraphMap;
typedef std::map< int, CityPathGraph * > CityGraphMap;
typedef stdvector< Vector >::fwd PositionList;
typedef std::vector< Vector > PositionList;
// ======================================================================
@@ -55,7 +55,7 @@ public:
static bool destroyPathNodes ( ServerObject * building );
static bool reloadPathNodes ( void );
static bool reloadPathNodes ( stdvector< ServerObject * >::fwd const & objects );
static bool reloadPathNodes ( std::vector< ServerObject * > const & objects );
static bool markCityEntrance ( ServerObject * object );
static bool unmarkCityEntrance ( ServerObject * object );
@@ -210,7 +210,7 @@ void PathAutoGenerator::pathAutoCleanup(Vector const & pos_w, Unicode::String &
Vector const center((minX + maxX) * 0.5f, 0.0f, (minY + maxY) * 0.5f);
typedef stdvector<ServerObject *>::fwd ServerObjectVector;
typedef std::vector<ServerObject *> ServerObjectVector;
ServerObjectVector sv;
@@ -9,6 +9,9 @@
#ifndef INCLUDED_ServerPathBuilder_H
#define INCLUDED_ServerPathBuilder_H
#include <vector>
#include <list>
#include "serverGame/AiLocation.h"
#include "Unicode.h"
@@ -22,8 +25,8 @@ class PathSearch;
class PathNode;
class ServerObject;
typedef stdlist<AiLocation>::fwd AiPath;
typedef stdvector<int>::fwd IndexList;
typedef std::list<AiLocation> AiPath;
typedef std::vector<int> IndexList;
// ======================================================================
@@ -69,7 +69,7 @@ protected:
// ----------
typedef stdset<Client*>::fwd ClientList;
typedef std::set<Client*> ClientList;
ClientList * m_clientList;