swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-08-03 04:19:20 -04:00
Code Issues Projects Releases Wiki Activity

persister cleanup (still broke but logic is there for when it isn't); also replace all the SOE BS for forwarding stl port with native object classes because i thought that may be part of the problem...

Browse Source
This commit is contained in:
DarthArgus
2016-12-10 23:17:06 +00:00
parent 688ab3fc9e
commit 8e94519082
450 changed files with 1287 additions and 1494 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/shared/library/sharedUtility/src/shared/Callback.h
+1 -1
View File
@@ -44,7 +44,7 @@ private:
private:
typedef stdvector<CallbackReceiver *>::fwd CallbackReceiverVector;
typedef std::vector<CallbackReceiver *> CallbackReceiverVector;
int m_referenceCount;
CallbackReceiverVector m_receivers;
engine/shared/library/sharedUtility/src/shared/DataTableColumnType.h
+1 -1
View File
@@ -56,7 +56,7 @@ private:
DataType m_type;
DataType m_basicType;
std::string m_defaultValue;
typedef stdmap<std::string, int>::fwd StringIntMap;
typedef std::map<std::string, int> StringIntMap;
StringIntMap * m_enumMap;
DataTableCell * m_defaultCell;
};
engine/shared/library/sharedUtility/src/shared/DataTableManager.h
+2 -2
View File
@@ -40,9 +40,9 @@ private:
static DataTable* m_cachedTable;
static std::string m_cachedTableName;
static bool m_errorChecking;
static stdmap<std::string, DataTable *>::fwd m_tables;
static std::map<std::string, DataTable *> m_tables;
static bool m_installed;
static stdmultimap<std::string, DataTableReloadCallback>::fwd m_reloadCallbacks;
static std::multimap<std::string, DataTableReloadCallback> m_reloadCallbacks;
};
// ======================================================================
engine/shared/library/sharedUtility/src/shared/InteriorLayoutReaderWriter.h
+2 -2
View File
@@ -42,7 +42,7 @@ public:
//-- preload interface
int getNumberOfObjects() const;
typedef stdvector<CrcString const *>::fwd CrcStringVector;
typedef std::vector<CrcString const *> CrcStringVector;
void getObjectTemplateNames(CrcStringVector & crcStringVector);
//-- writer interface
@@ -66,7 +66,7 @@ private:
PersistentCrcString m_fileName;
class Node;
typedef stdmap<CrcString const *, Node *, LessPointerComparator>::fwd NodeMap;
typedef std::map<CrcString const *, Node *, LessPointerComparator> NodeMap;
NodeMap * const m_nodeMap;
int m_numberOfObjects;
};
engine/shared/library/sharedUtility/src/shared/OptionManager.h
+7 -7
View File
@@ -90,7 +90,7 @@ private:
Type m_type;
};
typedef stdvector<Option>::fwd OptionList;
typedef std::vector<Option> OptionList;
private:
@@ -114,22 +114,22 @@ private:
OptionList * const m_registeredOptionList;
OptionList * const m_savedOptionList;
typedef stdvector<char*>::fwd StringList;
typedef std::vector<char*> StringList;
StringList * const m_stringList;
typedef stdvector<bool*>::fwd BoolList;
typedef std::vector<bool*> BoolList;
BoolList * const m_boolList;
typedef stdvector<float*>::fwd FloatList;
typedef std::vector<float*> FloatList;
FloatList * const m_floatList;
typedef stdvector<int*>::fwd IntList;
typedef std::vector<int*> IntList;
IntList * const m_intList;
typedef stdvector<std::string*>::fwd StdStringList;
typedef std::vector<std::string*> StdStringList;
StdStringList * const m_stdStringList;
typedef stdvector<Unicode::String*>::fwd UnicodeStringList;
typedef std::vector<Unicode::String*> UnicodeStringList;
UnicodeStringList * const m_unicodeStringList;
};
engine/shared/library/sharedUtility/src/shared/RotaryCache.h
+2 -2
View File
@@ -49,14 +49,14 @@ protected:
void* value;
};
typedef stdlist<CacheListEntry>::fwd RotaryList;
typedef std::list<CacheListEntry> RotaryList;
struct CacheMapEntry
{
RotaryList::iterator iter;
};
typedef stdmap<unsigned int,CacheMapEntry>::fwd RotaryMap;
typedef std::map<unsigned int,CacheMapEntry> RotaryMap;
RotaryList mList;
RotaryMap mMap;
engine/shared/library/sharedUtility/src/shared/StartingLocationManager.cpp
+1 -1
View File
@@ -19,7 +19,7 @@
namespace StartingLocationManagerNamespace
{
typedef stdmap<std::string, StartingLocationData>::fwd StartingLocationMap;
typedef std::map<std::string, StartingLocationData> StartingLocationMap;
StartingLocationMap s_startingLocationMap;
typedef StartingLocationManager::StartingLocationVector StartingLocationVector;
engine/shared/library/sharedUtility/src/shared/StartingLocationManager.h
+1 -1
View File
@@ -18,7 +18,7 @@ class StartingLocationManager
{
public:
typedef stdvector<StartingLocationData>::fwd StartingLocationVector;
typedef std::vector<StartingLocationData> StartingLocationVector;
static const StartingLocationData * findLocationByName (const std::string & name);
static void getLocationsByPlanet (const std::string & planet, StartingLocationVector & slv);
engine/shared/library/sharedUtility/src/shared/UniqueNameList.h
+1 -1
View File
@@ -56,7 +56,7 @@ private:
struct NameInfo;
typedef stdvector<std::shared_ptr<NameInfo> >::fwd NameInfoVector;
typedef std::vector<std::shared_ptr<NameInfo> > NameInfoVector;
private:
engine/shared/library/sharedUtility/src/shared/WorldSnapshotReaderWriter.h
+5 -5
View File
@@ -119,7 +119,7 @@ public:
Node* m_parent;
std::string m_eventName;
typedef stdvector<Node*>::fwd NodeList;
typedef std::vector<Node*> NodeList;
NodeList* m_nodeList;
mutable SpatialSubdivisionHandle* m_spatialSubdivisionHandle;
@@ -169,16 +169,16 @@ private:
private:
typedef stdvector<Node*>::fwd NodeList;
typedef std::vector<Node*> NodeList;
NodeList* const m_nodeList;
typedef stdvector<char*>::fwd ObjectTemplateNameList;
typedef std::vector<char*> ObjectTemplateNameList;
ObjectTemplateNameList* const m_objectTemplateNameList;
typedef stdunordered_map<uint32, uint>::fwd ObjectTemplateCrcMap;
typedef std::unordered_map<uint32, uint> ObjectTemplateCrcMap;
ObjectTemplateCrcMap* const m_objectTemplateCrcMap; // map from crc to index in name list
typedef stdmap<int64, Node*>::fwd NetworkIdNodeMap;
typedef std::map<int64, Node*> NetworkIdNodeMap;
NetworkIdNodeMap* const m_networkIdNodeMap;
};