mirror of
https://bitbucket.org/theswgsource/src-1.2.git
synced 2026-08-01 02:15:54 -04:00
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
@@ -58,7 +58,7 @@ public:
|
||||
|
||||
private:
|
||||
|
||||
typedef stdvector<Watcher<Object> >::fwd ObjectVector;
|
||||
typedef std::vector<Watcher<Object> > ObjectVector;
|
||||
bool m_altering;
|
||||
ObjectVector * m_objectVector;
|
||||
ObjectVector * m_alterSafeObjectVector;
|
||||
|
||||
@@ -83,7 +83,7 @@ protected:
|
||||
|
||||
private:
|
||||
|
||||
typedef stdvector<Hardpoint*>::fwd HardpointList;
|
||||
typedef std::vector<Hardpoint*> HardpointList;
|
||||
|
||||
private:
|
||||
|
||||
|
||||
@@ -23,7 +23,7 @@ friend class ArrangementDescriptorList;
|
||||
|
||||
public:
|
||||
|
||||
typedef stdvector<SlotId>::fwd SlotIdVector;
|
||||
typedef std::vector<SlotId> SlotIdVector;
|
||||
|
||||
public:
|
||||
|
||||
@@ -40,7 +40,7 @@ public:
|
||||
|
||||
private:
|
||||
|
||||
typedef stdvector<SlotIdVector>::fwd ArrangementVector;
|
||||
typedef std::vector<SlotIdVector> ArrangementVector;
|
||||
|
||||
private:
|
||||
|
||||
|
||||
@@ -31,7 +31,7 @@ public:
|
||||
|
||||
private:
|
||||
|
||||
typedef stdmap<const CrcLowerString*, ArrangementDescriptor*, LessPointerComparator>::fwd DescriptorMap;
|
||||
typedef std::map<const CrcLowerString*, ArrangementDescriptor*, LessPointerComparator> DescriptorMap;
|
||||
|
||||
private:
|
||||
|
||||
|
||||
@@ -37,7 +37,7 @@ friend class SlotDescriptorList;
|
||||
|
||||
public:
|
||||
|
||||
typedef stdvector<SlotId>::fwd SlotIdVector;
|
||||
typedef std::vector<SlotId> SlotIdVector;
|
||||
|
||||
public:
|
||||
|
||||
|
||||
@@ -38,7 +38,7 @@ public:
|
||||
|
||||
private:
|
||||
|
||||
typedef stdmap<const CrcLowerString*, SlotDescriptor*, LessPointerComparator>::fwd DescriptorMap;
|
||||
typedef std::map<const CrcLowerString*, SlotDescriptor*, LessPointerComparator> DescriptorMap;
|
||||
|
||||
private:
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@ class SlotIdManager
|
||||
{
|
||||
public:
|
||||
|
||||
typedef stdvector<std::string>::fwd AnythingSlotVector;
|
||||
typedef std::vector<std::string> AnythingSlotVector;
|
||||
|
||||
public:
|
||||
|
||||
@@ -34,7 +34,7 @@ public:
|
||||
static bool isInstalled();
|
||||
|
||||
static SlotId findSlotId(const CrcString &slotName);
|
||||
static void findSlotIdsForCombatBone(uint32 bone, stdvector<SlotId>::fwd & slots);
|
||||
static void findSlotIdsForCombatBone(uint32 bone, std::vector<SlotId> & slots);
|
||||
|
||||
static CrcString const &getSlotName(SlotId const &slotId);
|
||||
static bool isSlotPlayerModifiable(const SlotId &slotId);
|
||||
|
||||
@@ -65,7 +65,7 @@ public:
|
||||
|
||||
private:
|
||||
|
||||
typedef stdmap<SlotId, int>::fwd SlotMap;
|
||||
typedef std::map<SlotId, int> SlotMap;
|
||||
|
||||
private:
|
||||
|
||||
|
||||
@@ -56,7 +56,7 @@ public:
|
||||
typedef void (*ConstIteratorCallback)(const std::string &fullVariablePathName, const CustomizationVariable *customizationVariable, void *context);
|
||||
typedef void (*IteratorCallback)(const std::string &fullVariablePathName, CustomizationVariable *customizationVariable, void *context);
|
||||
|
||||
typedef stdvector<byte>::fwd ByteVector;
|
||||
typedef std::vector<byte> ByteVector;
|
||||
|
||||
public:
|
||||
|
||||
@@ -116,8 +116,8 @@ private:
|
||||
|
||||
struct ModificationCallbackData;
|
||||
|
||||
typedef stdmap<CustomizationData*, int>::fwd CustomizationDataIntMap;
|
||||
typedef stdvector<ModificationCallbackData>::fwd ModificationCallbackDataVector;
|
||||
typedef std::map<CustomizationData*, int> CustomizationDataIntMap;
|
||||
typedef std::vector<ModificationCallbackData> ModificationCallbackDataVector;
|
||||
|
||||
private:
|
||||
|
||||
|
||||
+2
-2
@@ -52,8 +52,8 @@ public:
|
||||
|
||||
private:
|
||||
|
||||
typedef stdmap<const CrcLowerString, Directory*>::fwd DirectoryMap;
|
||||
typedef stdmap<const CrcLowerString, CustomizationVariable*>::fwd CustomizationVariableMap;
|
||||
typedef std::map<const CrcLowerString, Directory*> DirectoryMap;
|
||||
typedef std::map<const CrcLowerString, CustomizationVariable*> CustomizationVariableMap;
|
||||
|
||||
private:
|
||||
// Disabled.
|
||||
|
||||
@@ -23,7 +23,7 @@ friend class CustomizationData;
|
||||
|
||||
public:
|
||||
|
||||
typedef stdvector<byte>::fwd ByteVector;
|
||||
typedef std::vector<byte> ByteVector;
|
||||
|
||||
public:
|
||||
|
||||
|
||||
+1
-1
@@ -36,7 +36,7 @@ public:
|
||||
|
||||
private:
|
||||
|
||||
typedef stdlist<std::string>::fwd StringList;
|
||||
typedef std::list<std::string> StringList;
|
||||
|
||||
private:
|
||||
|
||||
|
||||
@@ -123,10 +123,10 @@ private:
|
||||
const int m_width;
|
||||
const int m_width_2;
|
||||
|
||||
typedef stdmap<const Object*, NoBuildEntry*>::fwd NoBuildEntryMap;
|
||||
typedef std::map<const Object*, NoBuildEntry*> NoBuildEntryMap;
|
||||
NoBuildEntryMap* const m_noBuildEntryMap;
|
||||
|
||||
typedef stdmap<const Object*, StructureFootprintEntry>::fwd StructureFootprintEntryMap;
|
||||
typedef std::map<const Object*, StructureFootprintEntry> StructureFootprintEntryMap;
|
||||
StructureFootprintEntryMap* const m_structureFootprintEntryMap;
|
||||
|
||||
SphereTree<const NoBuildEntry*, NoBuildEntrySphereExtentAccessor> m_sphereTree;
|
||||
|
||||
@@ -58,7 +58,7 @@ public:
|
||||
private:
|
||||
|
||||
struct rates;
|
||||
typedef stdmap<Postures::Enumerator, rates>::fwd PostureMap;
|
||||
typedef std::map<Postures::Enumerator, rates> PostureMap;
|
||||
|
||||
private:
|
||||
|
||||
|
||||
@@ -37,7 +37,7 @@ public:
|
||||
class ScheduleTimeComparator;
|
||||
|
||||
typedef uint64 ScheduleTime;
|
||||
typedef stdmultimap<ScheduleTime, Object*>::fwd ScheduleTimeMap;
|
||||
typedef std::multimap<ScheduleTime, Object*> ScheduleTimeMap;
|
||||
|
||||
public:
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@ class NetworkIdManager
|
||||
public:
|
||||
~NetworkIdManager();
|
||||
|
||||
typedef stdunordered_map<NetworkId, Object *, NetworkId::Hash>::fwd NetworkIdObjectHashMap;
|
||||
typedef std::unordered_map<NetworkId, Object *, NetworkId::Hash> NetworkIdObjectHashMap;
|
||||
|
||||
static void addObject (Object & newObject);
|
||||
static Object * getObjectById (const NetworkId & source);
|
||||
|
||||
@@ -399,8 +399,8 @@ namespace ObjectNamespace
|
||||
typedef std::map<PropertyId,int> PropertySearchStatistics;
|
||||
typedef std::vector<Property *> PropertyList;
|
||||
typedef std::vector<Object::PropertyList *> PropertyListList;
|
||||
typedef stdvector<Object *>::fwd AttachedObjects;
|
||||
typedef stdvector<AttachedObjects *>::fwd AttachedObjectsList;
|
||||
typedef std::vector<Object *> AttachedObjects;
|
||||
typedef std::vector<AttachedObjects *> AttachedObjectsList;
|
||||
|
||||
MemoryBlockManager *ms_transformMemoryBlockManager;
|
||||
DpvsObjectsList ms_systemAllocatedDpvsObjectsList;
|
||||
|
||||
@@ -90,7 +90,7 @@ public:
|
||||
DF_world // Place the object into the world cell.
|
||||
};
|
||||
|
||||
typedef stdvector<DPVS::Object *>::fwd DpvsObjects;
|
||||
typedef std::vector<DPVS::Object *> DpvsObjects;
|
||||
typedef uint64 ScheduleTime;
|
||||
|
||||
class NotificationList;
|
||||
@@ -327,7 +327,7 @@ public:
|
||||
bool getUseAlterScheduler() const;
|
||||
void setUseAlterScheduler(bool const useAlterScheduler);
|
||||
|
||||
virtual void getObjectInfo(stdmap<std::string, stdmap<std::string, Unicode::String>::fwd >::fwd & propertyMap) const;
|
||||
virtual void getObjectInfo(std::map<std::string, std::map<std::string, Unicode::String> > & propertyMap) const;
|
||||
|
||||
bool getShouldBakeIntoMesh() const;
|
||||
void setShouldBakeIntoMesh(bool bake);
|
||||
@@ -416,7 +416,7 @@ private:
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
|
||||
public:
|
||||
typedef stdvector<Property *>::fwd PropertyList;
|
||||
typedef std::vector<Property *> PropertyList;
|
||||
|
||||
protected:
|
||||
PropertyList * const m_propertyList;
|
||||
@@ -448,7 +448,7 @@ private:
|
||||
Dynamics *m_dynamics;
|
||||
|
||||
Object *m_attachedToObject;
|
||||
typedef stdvector<Object *>::fwd AttachedObjects;
|
||||
typedef std::vector<Object *> AttachedObjects;
|
||||
AttachedObjects *m_attachedObjects;
|
||||
DpvsObjects *m_dpvsObjects;
|
||||
|
||||
|
||||
@@ -56,7 +56,7 @@ public:
|
||||
|
||||
private:
|
||||
|
||||
typedef stdvector<Object *>::fwd ObjectVector;
|
||||
typedef std::vector<Object *> ObjectVector;
|
||||
bool m_altering;
|
||||
ObjectVector * m_objectVector;
|
||||
ObjectVector * m_alterSafeObjectVector;
|
||||
|
||||
@@ -194,7 +194,7 @@ void ObjectTemplateList::garbageCollect ()
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
|
||||
void ObjectTemplateList::getAllTemplateNamesFromCrcStringTable(stdvector<const char *>::fwd & objectTemplateNames)
|
||||
void ObjectTemplateList::getAllTemplateNamesFromCrcStringTable(std::vector<const char *> & objectTemplateNames)
|
||||
{
|
||||
ms_crcStringTable.getAllStrings(objectTemplateNames);
|
||||
}
|
||||
|
||||
@@ -60,7 +60,7 @@ public:
|
||||
|
||||
static void garbageCollect ();
|
||||
|
||||
static void getAllTemplateNamesFromCrcStringTable(stdvector<const char *>::fwd & objectTemplateNames);
|
||||
static void getAllTemplateNamesFromCrcStringTable(std::vector<const char *> & objectTemplateNames);
|
||||
|
||||
private:
|
||||
|
||||
|
||||
@@ -45,8 +45,8 @@ class CellProperty : public Container
|
||||
|
||||
public:
|
||||
|
||||
typedef stdvector<Vector>::fwd VertexList;
|
||||
typedef stdvector<Portal *>::fwd PortalList;
|
||||
typedef std::vector<Vector> VertexList;
|
||||
typedef std::vector<Portal *> PortalList;
|
||||
|
||||
typedef void (*AddToRenderWorldHookFunction) (Object& object);
|
||||
typedef Appearance *(*PolyAppearanceFactory)(VertexList const & verts, VectorArgb const & color);
|
||||
@@ -127,7 +127,7 @@ public:
|
||||
|
||||
CellProperty *getDestinationCell(const Vector &startPosition, const Vector &endPosition, float &t, bool passableOnly=false) const;
|
||||
CellProperty *getDestinationCell(const Object *object, int portalId) const;
|
||||
bool getDestinationCells(const Sphere &sphere, stdvector<CellProperty*>::fwd & outCells) const;
|
||||
bool getDestinationCells(const Sphere &sphere, std::vector<CellProperty*> & outCells) const;
|
||||
|
||||
bool isAdjacentTo(const CellProperty *cell) const;
|
||||
void addObject_w(Object &object);
|
||||
@@ -182,8 +182,8 @@ public:
|
||||
|
||||
private:
|
||||
|
||||
typedef stdvector<PortalObjectEntry>::fwd PortalObjectList;
|
||||
typedef stdvector<RenderHookFunction>::fwd RenderHookFunctionList;
|
||||
typedef std::vector<PortalObjectEntry> PortalObjectList;
|
||||
typedef std::vector<RenderHookFunction> RenderHookFunctionList;
|
||||
|
||||
private:
|
||||
|
||||
|
||||
@@ -39,7 +39,7 @@ class Portal
|
||||
|
||||
public:
|
||||
|
||||
typedef stdvector<Vector>::fwd VertexList;
|
||||
typedef std::vector<Vector> VertexList;
|
||||
typedef DPVS::Object *(*CreateDpvsPortalHookFunction)(Portal *owner);
|
||||
typedef void (*DestroyDpvsPortalHookFunction)(DPVS::Object *cellToDestroy);
|
||||
typedef void (*ClosedStateChangedHookFunction)(Portal &);
|
||||
@@ -47,7 +47,7 @@ public:
|
||||
static void install();
|
||||
static void remove();
|
||||
static void setHookFunctions(CreateDpvsPortalHookFunction createDpvsPortalHookFunction, DestroyDpvsPortalHookFunction destroyDpvsPortalHookFunction, ClosedStateChangedHookFunction closedStateChangedHookFunction, bool createDoors);
|
||||
static void preloadDoorStyle(const char *doorStyle, stdvector<const AppearanceTemplate*>::fwd& preloadAppearanceTemplateList);
|
||||
static void preloadDoorStyle(const char *doorStyle, std::vector<const AppearanceTemplate*>& preloadAppearanceTemplateList);
|
||||
|
||||
public:
|
||||
|
||||
|
||||
@@ -38,9 +38,9 @@ public:
|
||||
|
||||
public:
|
||||
|
||||
typedef stdvector<Portal *>::fwd PortalList;
|
||||
typedef stdvector<const char *>::fwd CellNameList;
|
||||
typedef stdvector<Vector>::fwd VertexList;
|
||||
typedef std::vector<Portal *> PortalList;
|
||||
typedef std::vector<const char *> CellNameList;
|
||||
typedef std::vector<Vector> VertexList;
|
||||
|
||||
typedef Object *(*BeginCreateObjectFunction)(int cellIndex);
|
||||
typedef void (*EndCreateObjectFunction)(Object *newObject);
|
||||
@@ -70,7 +70,7 @@ public:
|
||||
virtual int getTypeId() const;
|
||||
virtual void debugPrint(std::string &buffer) const;
|
||||
|
||||
bool serverEndBaselines(int crc,stdvector<Object*>::fwd &unfixables, bool authoritative);
|
||||
bool serverEndBaselines(int crc,std::vector<Object*> &unfixables, bool authoritative);
|
||||
|
||||
const PortalPropertyTemplate &getPortalPropertyTemplate() const;
|
||||
int getCrc() const;
|
||||
@@ -111,8 +111,8 @@ private:
|
||||
Object *m_obj;
|
||||
Transform m_transform;
|
||||
};
|
||||
typedef stdvector<FixupRec>::fwd FixupList;
|
||||
typedef stdvector<CellProperty*>::fwd CellList;
|
||||
typedef std::vector<FixupRec> FixupList;
|
||||
typedef std::vector<CellProperty*> CellList;
|
||||
|
||||
private:
|
||||
|
||||
|
||||
@@ -106,9 +106,9 @@ class PortalPropertyTemplateCell
|
||||
public:
|
||||
|
||||
typedef PortalPropertyTemplateCellLight Light;
|
||||
typedef stdvector<Light>::fwd LightList;
|
||||
typedef stdvector<Portal *>::fwd PortalList;
|
||||
typedef stdvector<PortalPropertyTemplateCellPortal *>::fwd PortalPropertyTemplateCellPortalList;
|
||||
typedef std::vector<Light> LightList;
|
||||
typedef std::vector<Portal *> PortalList;
|
||||
typedef std::vector<PortalPropertyTemplateCellPortal *> PortalPropertyTemplateCellPortalList;
|
||||
|
||||
public:
|
||||
|
||||
@@ -187,12 +187,12 @@ public:
|
||||
|
||||
|
||||
typedef PortalPropertyTemplateCell Cell;
|
||||
typedef stdvector<Cell *>::fwd CellList;
|
||||
typedef stdvector<Vector>::fwd VertexList;
|
||||
typedef stdvector<Portal *>::fwd PortalList;
|
||||
typedef stdvector<PortalOwners>::fwd PortalOwnersList;
|
||||
typedef stdvector<IndexedTriangleList *>::fwd PortalGeometryList;
|
||||
typedef stdvector<const char *>::fwd CellNameList;
|
||||
typedef std::vector<Cell *> CellList;
|
||||
typedef std::vector<Vector> VertexList;
|
||||
typedef std::vector<Portal *> PortalList;
|
||||
typedef std::vector<PortalOwners> PortalOwnersList;
|
||||
typedef std::vector<IndexedTriangleList *> PortalGeometryList;
|
||||
typedef std::vector<const char *> CellNameList;
|
||||
|
||||
public:
|
||||
|
||||
|
||||
Reference in New Issue
Block a user