swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-09-30 15:13:12 -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/sharedGame/src/shared/command/CommandTable.h
+2 -2
View File
@@ -22,9 +22,9 @@ class Command;
class CommandTable // static class
{
public:
typedef stdmap<uint32, Command>::fwd CommandMap;
typedef std::map<uint32, Command> CommandMap;
static void loadCommandTables (stdvector<std::string>::fwd const &commandTableFilenames);
static void loadCommandTables (std::vector<std::string> const &commandTableFilenames);
static void addCppFunction (std::string const &funcName, CommandCppFunc::Type func);
static Command const & getCommand (uint32 commandHash);
static CommandMap const & getCommandMap ();
engine/shared/library/sharedGame/src/shared/core/AiDebugString.h
+7 -7
View File
@@ -23,13 +23,13 @@ class AiDebugString
{
public:
typedef stdvector<Transform>::fwd TransformList;
typedef stdvector<std::string>::fwd TextList;
typedef stdvector<std::pair<CachedNetworkId, std::pair<Vector, PackedRgb> > >::fwd LineList;
typedef stdvector<std::pair<TransformList, bool/*cyclic*/> >::fwd PathList;
typedef stdvector<std::pair<CachedNetworkId, std::pair<Circle, PackedRgb> > >::fwd CircleList;
typedef stdvector<std::pair<Transform, float/*axisLength*/> >::fwd AxisList;
typedef stdvector<std::pair<float/*length*/, std::pair<float/*coneAngle*/, PackedRgb> > >::fwd ConeList;
typedef std::vector<Transform> TransformList;
typedef std::vector<std::string> TextList;
typedef std::vector<std::pair<CachedNetworkId, std::pair<Vector, PackedRgb> > > LineList;
typedef std::vector<std::pair<TransformList, bool/*cyclic*/> > PathList;
typedef std::vector<std::pair<CachedNetworkId, std::pair<Circle, PackedRgb> > > CircleList;
typedef std::vector<std::pair<Transform, float/*axisLength*/> > AxisList;
typedef std::vector<std::pair<float/*length*/, std::pair<float/*coneAngle*/, PackedRgb> > > ConeList;
// Use to custom embed multiple colors in text
engine/shared/library/sharedGame/src/shared/core/CollectionsDataTable.h
+19 -19
View File
@@ -68,7 +68,7 @@ public:
class CollectionInfoCollection
{
public:
CollectionInfoCollection(std::string const & cName, std::string const & pIcon, ShowIfNotYetEarnedType pShowIfNotYetEarned, bool pHidden, stdvector<std::string>::fwd const & pCategories, std::vector<std::string> const & pTitles, bool pNoReward, bool pTrackServerFirst, CollectionInfoPage const & pPage) :
CollectionInfoCollection(std::string const & cName, std::string const & pIcon, ShowIfNotYetEarnedType pShowIfNotYetEarned, bool pHidden, std::vector<std::string> const & pCategories, std::vector<std::string> const & pTitles, bool pNoReward, bool pTrackServerFirst, CollectionInfoPage const & pPage) :
name(cName), icon(pIcon), showIfNotYetEarned(pShowIfNotYetEarned), hidden(pHidden), categories(pCategories), titles(pTitles), noReward(pNoReward), trackServerFirst(pTrackServerFirst), serverFirstClaimTime(0), serverFirstClaimantId(), serverFirstClaimantName(), page(pPage) {};
std::string const name;
@@ -96,7 +96,7 @@ public:
friend class CollectionsDataTable;
public:
CollectionInfoSlot(std::string const & pName, std::string const & pIcon, ShowIfNotYetEarnedType pShowIfNotYetEarned, bool pHidden, bool pNotifyScriptOnModify, int pSlotIdIndex, int pBeginSlotId, int pAbsoluteBeginSlotId, int pEndSlotId, int pAbsoluteEndSlotId, unsigned long pMaxSlotValue, unsigned long pMaxValueForNumBits, stdvector<std::string>::fwd const & pCategories, stdvector<std::string>::fwd const & pPrereqs, std::string const & pMusic, std::vector<std::string> const & pTitles, CollectionInfoCollection const & pCollection) :
CollectionInfoSlot(std::string const & pName, std::string const & pIcon, ShowIfNotYetEarnedType pShowIfNotYetEarned, bool pHidden, bool pNotifyScriptOnModify, int pSlotIdIndex, int pBeginSlotId, int pAbsoluteBeginSlotId, int pEndSlotId, int pAbsoluteEndSlotId, unsigned long pMaxSlotValue, unsigned long pMaxValueForNumBits, std::vector<std::string> const & pCategories, std::vector<std::string> const & pPrereqs, std::string const & pMusic, std::vector<std::string> const & pTitles, CollectionInfoCollection const & pCollection) :
name(pName), icon(pIcon), showIfNotYetEarned(pShowIfNotYetEarned), hidden(pHidden), notifyScriptOnModify(pNotifyScriptOnModify), slotIdIndex(pSlotIdIndex), beginSlotId(pBeginSlotId), absoluteBeginSlotId(pAbsoluteBeginSlotId), endSlotId(pEndSlotId), absoluteEndSlotId(pAbsoluteEndSlotId), counterTypeSlot(pEndSlotId > 0), maxSlotValue(pMaxSlotValue), maxValueForNumBits(pMaxValueForNumBits), categories(pCategories), prereqsPtr(), music(pMusic), titles(pTitles), collection(pCollection), prereqs(pPrereqs) {};
std::string const name;
@@ -141,36 +141,36 @@ public:
static CollectionsDataTable::CollectionInfoSlot const * isASlotTitle(std::string const & titleName);
// collections
static stdvector<CollectionsDataTable::CollectionInfoSlot const *>::fwd const & getSlotsInCollection(std::string const & collectionName);
static std::vector<CollectionsDataTable::CollectionInfoSlot const *> const & getSlotsInCollection(std::string const & collectionName);
static std::vector<CollectionsDataTable::CollectionInfoCollection const *> const & getAllTitleableCollections();
static CollectionsDataTable::CollectionInfoCollection const * isACollectionTitle(std::string const & titleName);
static stdmap<std::string, CollectionsDataTable::CollectionInfoCollection const *>::fwd const & getAllServerFirstCollections();
static std::map<std::string, CollectionsDataTable::CollectionInfoCollection const *> const & getAllServerFirstCollections();
static CollectionsDataTable::CollectionInfoCollection const * getCollectionByName(std::string const & collectionName);
// pages
static stdvector<CollectionsDataTable::CollectionInfoSlot const *>::fwd const & getSlotsInPage(std::string const & pageName);
static stdvector<CollectionsDataTable::CollectionInfoCollection const *>::fwd const & getCollectionsInPage(std::string const & pageName);
static std::vector<CollectionsDataTable::CollectionInfoSlot const *> const & getSlotsInPage(std::string const & pageName);
static std::vector<CollectionsDataTable::CollectionInfoCollection const *> const & getCollectionsInPage(std::string const & pageName);
static std::vector<CollectionsDataTable::CollectionInfoPage const *> const & getAllTitleablePages();
static CollectionsDataTable::CollectionInfoPage const * isAPageTitle(std::string const & titleName);
static CollectionsDataTable::CollectionInfoPage const * getPageByName(std::string const & pageName);
// books
static stdvector<CollectionsDataTable::CollectionInfoSlot const *>::fwd const & getSlotsInBook(std::string const & bookName);
static stdvector<CollectionsDataTable::CollectionInfoCollection const *>::fwd const & getCollectionsInBook(std::string const & bookName);
static stdvector<CollectionsDataTable::CollectionInfoPage const *>::fwd const & getPagesInBook(std::string const & bookName);
static stdvector<CollectionsDataTable::CollectionInfoBook const *>::fwd const & getAllBooks();
static std::vector<CollectionsDataTable::CollectionInfoSlot const *> const & getSlotsInBook(std::string const & bookName);
static std::vector<CollectionsDataTable::CollectionInfoCollection const *> const & getCollectionsInBook(std::string const & bookName);
static std::vector<CollectionsDataTable::CollectionInfoPage const *> const & getPagesInBook(std::string const & bookName);
static std::vector<CollectionsDataTable::CollectionInfoBook const *> const & getAllBooks();
static CollectionsDataTable::CollectionInfoBook const * getBookByName(std::string const & bookName);
// categories
static stdvector<CollectionsDataTable::CollectionInfoSlot const *>::fwd const & getSlotsInCategory(std::string const & categoryName);
static stdvector<CollectionsDataTable::CollectionInfoSlot const *>::fwd const & getSlotsInCategoryByCollection(std::string const & collectionName, std::string const & categoryName);
static stdvector<CollectionsDataTable::CollectionInfoSlot const *>::fwd const & getSlotsInCategoryByPage(std::string const & pageName, std::string const & categoryName);
static stdvector<CollectionsDataTable::CollectionInfoSlot const *>::fwd const & getSlotsInCategoryByBook(std::string const & bookName, std::string const & categoryName);
static std::vector<CollectionsDataTable::CollectionInfoSlot const *> const & getSlotsInCategory(std::string const & categoryName);
static std::vector<CollectionsDataTable::CollectionInfoSlot const *> const & getSlotsInCategoryByCollection(std::string const & collectionName, std::string const & categoryName);
static std::vector<CollectionsDataTable::CollectionInfoSlot const *> const & getSlotsInCategoryByPage(std::string const & pageName, std::string const & categoryName);
static std::vector<CollectionsDataTable::CollectionInfoSlot const *> const & getSlotsInCategoryByBook(std::string const & bookName, std::string const & categoryName);
static stdset<std::string>::fwd const & getAllSlotCategoriesInCollection(std::string const & collectionName);
static stdset<std::string>::fwd const & getAllSlotCategoriesInPage(std::string const & pageName);
static stdset<std::string>::fwd const & getAllSlotCategoriesInBook(std::string const & bookName);
static stdset<std::string>::fwd const & getAllSlotCategories();
static std::set<std::string> const & getAllSlotCategoriesInCollection(std::string const & collectionName);
static std::set<std::string> const & getAllSlotCategoriesInPage(std::string const & pageName);
static std::set<std::string> const & getAllSlotCategoriesInBook(std::string const & bookName);
static std::set<std::string> const & getAllSlotCategories();
// misc
static Unicode::String localizeCollectionName(std::string const & name);
@@ -179,7 +179,7 @@ public:
static char const * getShowIfNotYetEarnedTypeString(ShowIfNotYetEarnedType const showIfNotYetEarned);
// "server first" processing
static void setServerFirstData(stdset<std::pair<std::pair<int32, std::string>, std::pair<NetworkId, Unicode::String> > >::fwd const & collectionServerFirst);
static void setServerFirstData(std::set<std::pair<std::pair<int32, std::string>, std::pair<NetworkId, Unicode::String> > > const & collectionServerFirst);
private: // disabled
engine/shared/library/sharedGame/src/shared/core/CommoditiesAdvancedSearchAttribute.h
+2 -2
View File
@@ -49,10 +49,10 @@ public:
SearchAttribute &operator =(SearchAttribute const &);
};
static stdmap<std::string, CommoditiesAdvancedSearchAttribute::SearchAttribute const *>::fwd const & getSearchAttributeForGameObjectType(int gameObjectType);
static std::map<std::string, CommoditiesAdvancedSearchAttribute::SearchAttribute const *> const & getSearchAttributeForGameObjectType(int gameObjectType);
static CommoditiesAdvancedSearchAttribute::SearchAttribute const * getSearchAttribute(int gameObjectType, std::string const & attributeName);
static stdmap<std::string, std::string>::fwd const & getSearchAttributeNameAliasesForGameObjectType(int gameObjectType);
static std::map<std::string, std::string> const & getSearchAttributeNameAliasesForGameObjectType(int gameObjectType);
static bool allowChildGameObjectTypeToInheritSearchAttribute(int gameObjectType);
engine/shared/library/sharedGame/src/shared/core/CraftingData.cpp
+1 -1
View File
@@ -209,7 +209,7 @@ const std::string & Crafting::getResourceAttributeName (int attr)
const StringId & Crafting::getResourceAttributeNameStringId (int attr)
{
typedef stdmap<int, StringId>::fwd ResourceAttributeNameStringIds;
typedef std::map<int, StringId> ResourceAttributeNameStringIds;
static ResourceAttributeNameStringIds sids;
const ResourceAttributeNameStringIds::iterator it = sids.find (attr);
engine/shared/library/sharedGame/src/shared/core/CraftingData.h
+3 -3
View File
@@ -147,7 +147,7 @@ namespace Crafting
CraftingType_Last = CT_mission,
};
typedef stdvector<std::string>::fwd StringVector;
typedef std::vector<std::string> StringVector;
void getCraftingTypeNames (uint32 types, StringVector & sv);
//------------------------------------------------------------------------------
@@ -229,8 +229,8 @@ namespace Crafting
IngredientSlot(enum IngredientType _ingredientType,
const StringId & _name,
const stdvector<NetworkId>::fwd &slotIngredients,
const stdvector<int>::fwd &slotIngredientsCount,
const std::vector<NetworkId> &slotIngredients,
const std::vector<int> &slotIngredientsCount,
float _complexity,
int _draftSlotOption,
int _draftSlotIndex);
engine/shared/library/sharedGame/src/shared/core/CustomizationManager.h
+3 -3
View File
@@ -93,8 +93,8 @@ public:
static std::string const cms_shared_owner_no_slash;
static std::string const cms_priv;
typedef stdvector<Customization>::fwd CustomizationVector;
typedef stdmap<std::string, CustomizationVector>::fwd CustomizationSpeciesMap;
typedef std::vector<Customization> CustomizationVector;
typedef std::map<std::string, CustomizationVector> CustomizationSpeciesMap;
static void install();
static void remove();
@@ -113,7 +113,7 @@ public:
static std::string convertServerHairTemplateNameToSharedHairTemplateName(std::string const &serverHairTemplateName);
static PaletteColumns getPaletteColumnDataShortName(std::string const & paletteName);
static PaletteColumns getPaletteColumnDataLongName(std::string const & paletteName);
static stdmap<std::string, PaletteColumns>::fwd const & getPaletteColumnData();
static std::map<std::string, PaletteColumns> const & getPaletteColumnData();
static bool isHoloemoteName(std::string const & holoemoteName);
static int const getRequiredHairSkillForHoloemote(std::string const & holoemoteName);
engine/shared/library/sharedGame/src/shared/core/DraftSchematicGroupManager.cpp
+1 -1
View File
@@ -26,7 +26,7 @@ namespace DraftSchematicGroupManagerNamespace
{
typedef DraftSchematicGroupManager::StringVector StringVector;
typedef DraftSchematicGroupManager::SchematicVector SchematicVector;
typedef stdmap<std::string, SchematicVector>::fwd GroupMapping;
typedef std::map<std::string, SchematicVector> GroupMapping;
GroupMapping s_groupMapping;
bool s_installed = false;
engine/shared/library/sharedGame/src/shared/core/DraftSchematicGroupManager.h
+2 -2
View File
@@ -14,8 +14,8 @@ class DraftSchematicGroupManager
{
public:
typedef stdvector<std::string>::fwd StringVector;
typedef stdvector<std::pair<uint32, uint32> >::fwd SchematicVector;
typedef std::vector<std::string> StringVector;
typedef std::vector<std::pair<uint32, uint32> > SchematicVector;
static void getGroups (StringVector & sv);
static bool getSchematicsForGroup (const std::string & group, SchematicVector & sv);
engine/shared/library/sharedGame/src/shared/core/FormManager.h
+18 -18
View File
@@ -20,7 +20,7 @@ class FormManager
{
public:
typedef Unicode::String PackedFormData;
typedef stdmap<std::string, stdvector<std::string>::fwd >::fwd UnpackedFormData;
typedef std::map<std::string, std::vector<std::string> > UnpackedFormData;
//the various types of fields that the form can support
enum FieldType
@@ -65,17 +65,17 @@ public:
bool isFloatType() const;
bool isStringType() const;
bool isArrayType() const;
bool isValidValue(std::string const & value, stdmap<std::string, std::string>::fwd const & pendingData, std::string & errorString /*OUT*/) const;
bool isValidValue(int value, stdmap<std::string, std::string>::fwd const & pendingData, std::string & errorString /*OUT*/) const;
bool isValidValue(float value, stdmap<std::string, std::string>::fwd const & pendingData, std::string & errorString /*OUT*/) const;
int getMinimumIntValue(stdmap<std::string, std::string>::fwd const & pendingData, std::string & validationField /*OUT*/) const;
int getMaximumIntValue(stdmap<std::string, std::string>::fwd const & pendingData, std::string & validationField /*OUT*/) const;
float getMinimumFloatValue(stdmap<std::string, std::string>::fwd const & pendingData, std::string & validationField /*OUT*/) const;
float getMaximumFloatValue(stdmap<std::string, std::string>::fwd const & pendingData, std::string & validationField /*OUT*/) const;
bool isValidValue(std::string const & value, std::map<std::string, std::string> const & pendingData, std::string & errorString /*OUT*/) const;
bool isValidValue(int value, std::map<std::string, std::string> const & pendingData, std::string & errorString /*OUT*/) const;
bool isValidValue(float value, std::map<std::string, std::string> const & pendingData, std::string & errorString /*OUT*/) const;
int getMinimumIntValue(std::map<std::string, std::string> const & pendingData, std::string & validationField /*OUT*/) const;
int getMaximumIntValue(std::map<std::string, std::string> const & pendingData, std::string & validationField /*OUT*/) const;
float getMinimumFloatValue(std::map<std::string, std::string> const & pendingData, std::string & validationField /*OUT*/) const;
float getMaximumFloatValue(std::map<std::string, std::string> const & pendingData, std::string & validationField /*OUT*/) const;
std::string const & getName() const;
std::string const & getExternalName() const;
stdvector<OtherValidationRules>::fwd const & getOtherValidationRules() const;
std::vector<OtherValidationRules> const & getOtherValidationRules() const;
std::string const & getDefaultValue() const;
std::string const & getObjvarBinding() const;
@@ -93,11 +93,11 @@ public:
std::string m_maximumValue;
bool m_minimumValueSet;
bool m_maximumValueSet;
stdvector<std::string>::fwd * m_choices;
std::vector<std::string> * m_choices;
bool m_mustUseList;
std::string m_validationFilename;
int m_validationFilenameColumn;
stdvector<OtherValidationRules>::fwd * m_otherValidationRules;
std::vector<OtherValidationRules> * m_otherValidationRules;
Form const * m_parentForm;
std::string m_objvarBinding;
};
@@ -113,7 +113,7 @@ public:
bool isNameOfField(std::string const & fieldName) const;
Field const * getField(std::string const & fieldName) const;
std::string const & getName() const;
stdvector<Field const *>::fwd const & getOrderedFieldList() const;
std::vector<Field const *> const & getOrderedFieldList() const;
Form();
virtual ~Form();
@@ -124,8 +124,8 @@ public:
private:
std::string m_name;
stdmap<std::string, Field *>::fwd* m_fields;
stdvector<Field const *>::fwd* m_orderedFieldList;
std::map<std::string, Field *>* m_fields;
std::vector<Field const *>* m_orderedFieldList;
};
//This is an "abstract" static manager, which is instanciated by clientGame/FormManagerClient and serverGame/FormManagerServer
@@ -155,13 +155,13 @@ private:
private:
//this map OWNS the Form pointers
static stdmap<std::string, Form *>::fwd * ms_forms;
static std::map<std::string, Form *> * ms_forms;
//this map hold pointers to Forms, but does NOT own them
static stdmap<std::string, Form const *>::fwd * ms_serverObjectTemplateToForms;
static std::map<std::string, Form const *> * ms_serverObjectTemplateToForms;
//this map hold pointers to Forms, but does NOT own them
static stdmap<std::string, Form const *>::fwd * ms_sharedObjectTemplateToForms;
static std::map<std::string, Form const *> * ms_sharedObjectTemplateToForms;
//this map stores whether a particular server template was mapped for an "auto-object-creating" form in formmap.tab
static stdmap<std::string, bool>::fwd * ms_automaticallyCreateObjectForServerObjectTemplate;
static std::map<std::string, bool> * ms_automaticallyCreateObjectForServerObjectTemplate;
};
//======================================================================
engine/shared/library/sharedGame/src/shared/core/GameLanguageManager.h
+1 -1
View File
@@ -15,7 +15,7 @@ class GameLanguageManager
{
public:
typedef stdvector<std::string>::fwd StringVector;
typedef std::vector<std::string> StringVector;
static void install();
engine/shared/library/sharedGame/src/shared/core/GameObjectTypes.cpp
+2 -2
View File
@@ -473,8 +473,8 @@ bool GameObjectTypes::isSubType (int type)
bool GameObjectTypes::doesPowerupApply (int powerupType, int targetType)
{
//@todo: this should be data driven
typedef stdvector<int>::fwd IntVector;
typedef stdmap<int, IntVector>::fwd IntVectorMap;
typedef std::vector<int> IntVector;
typedef std::map<int, IntVector> IntVectorMap;
static IntVectorMap s_powerupGotMap;
static bool s_powerupGotMapInstalled = false;
if (!s_powerupGotMapInstalled)
engine/shared/library/sharedGame/src/shared/core/GameObjectTypes.h
+5 -5
View File
@@ -18,10 +18,10 @@ class GameObjectTypes
{
public:
typedef stdmap<int, StringId>::fwd TypeStringIdMap;
typedef stdmap<int, std::string>::fwd TypeStringMap;
typedef stdmap<std::string, int>::fwd StringTypeMap;
typedef stdmap<int, Unicode::String>::fwd TypeUnicodeStringMap;
typedef std::map<int, StringId> TypeStringIdMap;
typedef std::map<int, std::string> TypeStringMap;
typedef std::map<std::string, int> StringTypeMap;
typedef std::map<int, Unicode::String> TypeUnicodeStringMap;
static const TypeStringMap & getTypeStringMap ();
@@ -41,7 +41,7 @@ public:
static bool doesPowerupApply (int powerupType, int targetType);
static bool isExcludedFromCommodities(int type);
static stdmap<int, std::string>::fwd const & getTypesExcludedFromCommodities();
static std::map<int, std::string> const & getTypesExcludedFromCommodities();
static const int ms_type_mask;
};
engine/shared/library/sharedGame/src/shared/core/HyperspaceManager.h
+1 -1
View File
@@ -33,7 +33,7 @@ public:
static Vector getDirectionToHyperspacePoint_w(std::string const & fromSceneName, Vector const & fromLocation_w, std::string const & toSceneName, Vector const & toLocation_w);
static bool isValidHyperspacePoint(std::string const & hyperspacePointName);
static bool getHyperspacePoint(std::string const & hyperspacePointName, HyperspaceLocation & /*OUT*/ location);
static bool getHyperspacePoints(std::string const & sceneName, stdvector<HyperspaceLocation>::fwd & /*OUT*/ locations);
static bool getHyperspacePoints(std::string const & sceneName, std::vector<HyperspaceLocation> & /*OUT*/ locations);
static std::string getHomeLocationHyperspacePointName();
static bool isValidSceneForHomeLocationHyperspace(std::string const & sceneName);
engine/shared/library/sharedGame/src/shared/core/LfgCharacterData.h
+1 -1
View File
@@ -53,7 +53,7 @@ public:
static LfgCharacterData::Profession convertSkillTemplateToProfession(const std::string & skillTemplate);
static std::string getProfessionDebugString(LfgCharacterData::Profession profession);
static Unicode::String const & getProfessionDisplayString(LfgCharacterData::Profession profession);
static stdmap<std::string, int>::fwd const & calculateStatistics(stdmap<NetworkId, LfgCharacterData>::fwd const & connectedCharacterLfgData);
static std::map<std::string, int> const & calculateStatistics(std::map<NetworkId, LfgCharacterData> const & connectedCharacterLfgData);
std::string getDebugString() const;
engine/shared/library/sharedGame/src/shared/core/LfgDataTable.h
+1 -1
View File
@@ -86,7 +86,7 @@ public:
};
static std::vector<LfgNode const *> const & getTopLevelLfgNodes();
static stdmap<std::string, LfgDataTable::LfgNode const *>::fwd const & getAllLfgLeafNodes();
static std::map<std::string, LfgDataTable::LfgNode const *> const & getAllLfgLeafNodes();
static LfgNode const * getLfgNodeByName(std::string const & lfgNodeName);
static LfgNode const * getLfgLeafNodeByName(std::string const & lfgNodeName);
engine/shared/library/sharedGame/src/shared/core/MoodManager.cpp
+2 -2
View File
@@ -20,8 +20,8 @@
namespace
{
typedef stdmap<uint32,std::string>::fwd IntStringMap;
typedef stdmap<std::string,uint32>::fwd StringIntMap;
typedef std::map<uint32,std::string> IntStringMap;
typedef std::map<std::string,uint32> StringIntMap;
IntStringMap s_idToNameMap;
StringIntMap s_nameToIdMap;
engine/shared/library/sharedGame/src/shared/core/MoodManager.h
+1 -1
View File
@@ -18,7 +18,7 @@ class MoodManager
{
public:
typedef stdmap<std::string, uint32>::fwd StringIntMap;
typedef std::map<std::string, uint32> StringIntMap;
static void install ();
static void remove ();
engine/shared/library/sharedGame/src/shared/core/OutOfBandPackager.h
+2 -2
View File
@@ -25,8 +25,8 @@ class OutOfBandPackager
{
public:
typedef stdvector<OutOfBandBase *>::fwd OutOfBandBaseVector;
typedef stdvector<std::pair<std::string, Unicode::String> >::fwd AttributeVector;
typedef std::vector<OutOfBandBase *> OutOfBandBaseVector;
typedef std::vector<std::pair<std::string, Unicode::String> > AttributeVector;
enum OobTypes
{
engine/shared/library/sharedGame/src/shared/core/PlanetMapManager.cpp
+4 -4
View File
@@ -21,12 +21,12 @@
namespace PlanetMapManagerNamespace
{
typedef stdmap<uint8, std::string>::fwd TypeNameMap;
typedef stdmap<std::string, uint8>::fwd NameTypeMap;
typedef stdmap<uint8, StringId>::fwd TypeStringIdMap;
typedef std::map<uint8, std::string> TypeNameMap;
typedef std::map<std::string, uint8> NameTypeMap;
typedef std::map<uint8, StringId> TypeStringIdMap;
typedef std::pair<uint32, bool> FactionAndVisibility;
typedef stdmap<uint8, FactionAndVisibility>::fwd TypeFactionMap;
typedef std::map<uint8, FactionAndVisibility> TypeFactionMap;
TypeNameMap s_typeNameMap;
NameTypeMap s_nameTypeMap;
engine/shared/library/sharedGame/src/shared/core/PlayerCreationManager.cpp
+1 -1
View File
@@ -600,7 +600,7 @@ bool PlayerCreationManager::getRacialTotal(const std::string & sharedTemplateNam
//----------------------------------------------------------------------
bool PlayerCreationManager::test (std::string & result, const stdvector<std::string>::fwd & templateNames)
bool PlayerCreationManager::test (std::string & result, const std::vector<std::string> & templateNames)
{
DEBUG_FATAL (!s_installed, ("not installed.\n"));
UNREF (result);
engine/shared/library/sharedGame/src/shared/core/PlayerCreationManager.h
+13 -13
View File
@@ -26,22 +26,22 @@ public:
EqInfo (int32 i, const std::string & a, const std::string & b);
};
typedef stdvector<std::string>::fwd SkillVector;
typedef stdvector<EqInfo>::fwd EqVector;
typedef stdvector<std::string>::fwd StringVector;
typedef stdvector<int>::fwd AttribVector;
typedef stdmap<std::string, AttribVector>::fwd ProfessionAttribMap;
typedef std::vector<std::string> SkillVector;
typedef std::vector<EqInfo> EqVector;
typedef std::vector<std::string> StringVector;
typedef std::vector<int> AttribVector;
typedef std::map<std::string, AttribVector> ProfessionAttribMap;
static void clear ();
static void init ();
static bool test (std::string & result, const stdvector<std::string>::fwd & templateNames);
static bool test (std::string & result, const std::vector<std::string> & templateNames);
static void getProfessionVector (StringVector & sv, const std::string & categoryName);
static bool getRacialModifiers (const std::string& sharedTemplateName, stdvector<int>::fwd & /*OUT*/ modifiers);
static bool getProfessionModifiers (const std::string& profession, stdvector<int>::fwd & /*OUT*/modifiers);
static bool getRacialMinMaxes (const std::string& sharedTemplateName, stdvector<std::pair<int, int> >::fwd & /*OUT*/ minMaxes);
static bool getRacialModifiers (const std::string& sharedTemplateName, std::vector<int> & /*OUT*/ modifiers);
static bool getProfessionModifiers (const std::string& profession, std::vector<int> & /*OUT*/modifiers);
static bool getRacialMinMaxes (const std::string& sharedTemplateName, std::vector<std::pair<int, int> > & /*OUT*/ minMaxes);
static bool getRacialTotal (const std::string& sharedTemplateName, int & /*OUT*/ total);
protected:
@@ -60,10 +60,10 @@ private:
static void buildRacialMinsMaxes ();
private:
static stdmap<std::string, stdvector<int>::fwd >::fwd m_racialModifiers;
static stdmap<std::string, stdvector<int>::fwd >::fwd m_professionModifiers;
static stdmap<std::string, stdvector<std::pair<int, int> >::fwd >::fwd m_racialMinMaxes;
static stdmap<std::string, int>::fwd m_racialTotals;
static std::map<std::string, std::vector<int> > m_racialModifiers;
static std::map<std::string, std::vector<int> > m_professionModifiers;
static std::map<std::string, std::vector<std::pair<int, int> > > m_racialMinMaxes;
static std::map<std::string, int> m_racialTotals;
};
//======================================================================
engine/shared/library/sharedGame/src/shared/core/RadialMenuManager.cpp
+2 -2
View File
@@ -26,10 +26,10 @@ namespace
bool useRadialTarget;
};
typedef stdmap<int, RadialMenuInfo>::fwd RangeMap;
typedef std::map<int, RadialMenuInfo> RangeMap;
RangeMap s_ranges;
typedef stdmap<std::string, int>::fwd NameMap;
typedef std::map<std::string, int> NameMap;
NameMap s_names;
bool s_installed = false;
engine/shared/library/sharedGame/src/shared/core/RadialMenuManager.h
+1 -1
View File
@@ -18,7 +18,7 @@ class RadialMenuManager
{
public:
typedef stdvector<ObjectMenuRequestData>::fwd DataVector;
typedef std::vector<ObjectMenuRequestData> DataVector;
static int getMenuTypeByName (const std::string & name);
static bool getRangeForMenuType (int menuType, float &range);
engine/shared/library/sharedGame/src/shared/core/SharedBuffBuilderManager.h
+1 -1
View File
@@ -58,7 +58,7 @@ public:
std::string m_requiredExpertise;
};
typedef stdmap<std::string, BuffBuilderDataTypeRecord>::fwd BuffBuilderDataType;
typedef std::map<std::string, BuffBuilderDataTypeRecord> BuffBuilderDataType;
static BuffBuilderDataType* ms_buffBuilderData;
public:
engine/shared/library/sharedGame/src/shared/core/SharedBuildoutAreaManager.h
+1 -1
View File
@@ -100,7 +100,7 @@ class SharedBuildoutAreaManager
{
public:
typedef stdvector<BuildoutArea>::fwd BuildoutAreaVector;
typedef std::vector<BuildoutArea> BuildoutAreaVector;
typedef std::pair<std::string, std::string> StringPair;
static bool isBuildoutScene(std::string const & sceneName);
engine/shared/library/sharedGame/src/shared/core/SocialsManager.cpp
+2 -2
View File
@@ -21,8 +21,8 @@
namespace
{
typedef stdmap<uint32,std::string>::fwd IntStringMap;
typedef stdmap<std::string,uint32>::fwd StringIntMap;
typedef std::map<uint32,std::string> IntStringMap;
typedef std::map<std::string,uint32> StringIntMap;
IntStringMap s_idToNameMap;
StringIntMap s_nameToIdMap;
engine/shared/library/sharedGame/src/shared/core/SocialsManager.h
+1 -1
View File
@@ -14,7 +14,7 @@ class SocialsManager
{
public:
typedef stdmap<std::string, uint32>::fwd StringIntMap;
typedef std::map<std::string, uint32> StringIntMap;
static void install ();
static void remove ();
engine/shared/library/sharedGame/src/shared/core/SpatialChatManager.cpp
+6 -6
View File
@@ -21,11 +21,11 @@
namespace SpatialChatManagerNamespace
{
typedef stdmap<uint32,std::string>::fwd IntStringMap;
typedef stdmap<std::string,uint32>::fwd StringIntMap;
typedef stdmap<uint32,uint16>::fwd IntShortMap;
typedef stdset<uint32>::fwd IntSet;
typedef stdmap<uint32,std::vector<std::string> >::fwd IntStringVectorMap;
typedef std::map<uint32,std::string> IntStringMap;
typedef std::map<std::string,uint32> StringIntMap;
typedef std::map<uint32,uint16> IntShortMap;
typedef std::set<uint32> IntSet;
typedef std::map<uint32,std::vector<std::string> > IntStringVectorMap;
IntStringMap s_idToNameMap;
StringIntMap s_nameToIdMap;
@@ -150,7 +150,7 @@ uint16 SpatialChatManager::getVolume (uint32 type)
//----------------------------------------------------------------------
const stdvector<std::string>::fwd &SpatialChatManager::getSkillsProviding(uint32 type)
const std::vector<std::string> &SpatialChatManager::getSkillsProviding(uint32 type)
{
const IntStringVectorMap::const_iterator it = s_skillsProviding.find(type);
if (it != s_skillsProviding.end())
engine/shared/library/sharedGame/src/shared/core/SpatialChatManager.h
+1 -1
View File
@@ -19,7 +19,7 @@ public:
static uint32 getChatTypeByName (const std::string & name);
static uint32 getDefaultChatType ();
static bool getChatNameByType (uint32 type, std::string & name);
static const stdvector<std::string>::fwd & getSkillsProviding (uint32 type);
static const std::vector<std::string> & getSkillsProviding (uint32 type);
static bool isPrivate (uint32 type);
static uint16 getVolume (uint32 type);
engine/shared/library/sharedGame/src/shared/core/Universe.h
+3 -3
View File
@@ -28,7 +28,7 @@ class Universe
ResourceClassObject * getResourceClassByName (const std::string &name) const;
ResourceClassObject * getResourceClassByNameCrc (uint32 nameCrc) const;
void registerResourceClassObject (ResourceClassObject &newClass);
virtual void resourceClassTreeLoaded (stdmap<int, ResourceClassObject*>::fwd &resourceClasses) = 0;
virtual void resourceClassTreeLoaded (std::map<int, ResourceClassObject*> &resourceClasses) = 0;
virtual ResourceClassObject * makeResourceClassObject () = 0;
bool derivesFromResource (const std::string & base, const std::string & leaf) const;
@@ -37,8 +37,8 @@ class Universe
//
// Resource Class Objects
//
typedef stdmap<std::string, ResourceClassObject*>::fwd ResourceClassNameMap;
typedef stdmap<uint32, ResourceClassObject*>::fwd ResourceClassNameCrcMap;
typedef std::map<std::string, ResourceClassObject*> ResourceClassNameMap;
typedef std::map<uint32, ResourceClassObject*> ResourceClassNameCrcMap;
ResourceClassNameMap * m_resourceClassNameMap;
ResourceClassNameCrcMap * m_resourceClassNameCrcMap;
ResourceClassObject * m_resourceTreeRoot;
engine/shared/library/sharedGame/src/shared/object/MatchMakingId.h
+1 -1
View File
@@ -40,7 +40,7 @@ public:
B_anonymous = 127
};
typedef stdvector<int>::fwd IntVector;
typedef std::vector<int> IntVector;
MatchMakingId();
engine/shared/library/sharedGame/src/shared/object/ResourceClassObject.h
+5 -5
View File
@@ -23,7 +23,7 @@ class StringId;
class ResourceClassObject
{
public:
typedef stdmap<std::string, std::pair<int, int> >::fwd ResourceAttributeRangesType;
typedef std::map<std::string, std::pair<int, int> > ResourceAttributeRangesType;
public:
ResourceClassObject();
@@ -32,7 +32,7 @@ public:
static void install();
static void remove();
static bool isClassExcludedFromCommodities(std::string const & className);
static stdset<std::string>::fwd const & getClassesExcludedFromCommodities();
static std::set<std::string> const & getClassesExcludedFromCommodities();
public:
// getter functions
@@ -49,8 +49,8 @@ public:
void getCrateTemplate (std::string &buffer) const;
int getMinTypes () const;
int getMaxTypes () const;
void getChildren (stdvector<const ResourceClassObject *>::fwd & children, bool recurse) const;
void getLeafChildren (stdvector<const ResourceClassObject *>::fwd & children) const;
void getChildren (std::vector<const ResourceClassObject *> & children, bool recurse) const;
void getLeafChildren (std::vector<const ResourceClassObject *> & children) const;
int getMinPools () const;
int getMaxPools () const;
bool isRecycled () const;
@@ -82,7 +82,7 @@ protected:
ResourceAttributeRangesType * m_resourceAttributeRanges;
protected:
typedef stdvector<ResourceClassObject*>::fwd ClassList;
typedef std::vector<ResourceClassObject*> ClassList;
ClassList * m_children;
private:
engine/shared/library/sharedGame/src/shared/object/SlopeEffectProperty.h
+1 -1
View File
@@ -46,7 +46,7 @@ private:
// ======================================================================
inline const stdvector<Vector>::fwd & SlopeEffectProperty::getNormals() const
inline const std::vector<Vector> & SlopeEffectProperty::getNormals() const
{
return m_normals;
}
engine/shared/library/sharedGame/src/shared/objectTemplate/SharedDraftSchematicObjectTemplate.h
+2 -2
View File
@@ -199,10 +199,10 @@ protected:
private:
// this enum is also defined in the server object_template.tdf file
// this enum is also defined in the server object_template.tdf file
stdvector<StructParamOT *>::fwd m_slots; // ingredient slots
std::vector<StructParamOT *> m_slots; // ingredient slots
bool m_slotsLoaded;
bool m_slotsAppend;
stdvector<StructParamOT *>::fwd m_attributes; // what attributes the schematic can affect
std::vector<StructParamOT *> m_attributes; // what attributes the schematic can affect
bool m_attributesLoaded;
bool m_attributesAppend;
StringParam m_craftedSharedTemplate;
engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTangibleObjectTemplate.h
+6 -6
View File
@@ -291,25 +291,25 @@ protected:
virtual void load(Iff &file);
private:
stdvector<StructParamOT *>::fwd m_paletteColorCustomizationVariables; // // all palette color customization variables exposed by an Object created with this template
std::vector<StructParamOT *> m_paletteColorCustomizationVariables; // // all palette color customization variables exposed by an Object created with this template
bool m_paletteColorCustomizationVariablesLoaded;
bool m_paletteColorCustomizationVariablesAppend;
stdvector<StructParamOT *>::fwd m_rangedIntCustomizationVariables; // // all ranged-int style customization variables exposed by an Object created with this template
std::vector<StructParamOT *> m_rangedIntCustomizationVariables; // // all ranged-int style customization variables exposed by an Object created with this template
bool m_rangedIntCustomizationVariablesLoaded;
bool m_rangedIntCustomizationVariablesAppend;
stdvector<StructParamOT *>::fwd m_constStringCustomizationVariables; // // constant string values added to the Object's customization data, not persisted in the DB
std::vector<StructParamOT *> m_constStringCustomizationVariables; // // constant string values added to the Object's customization data, not persisted in the DB
bool m_constStringCustomizationVariablesLoaded;
bool m_constStringCustomizationVariablesAppend;
stdvector<IntegerParam *>::fwd m_socketDestinations; // // GOTs that this object can be socketed into
std::vector<IntegerParam *> m_socketDestinations; // // GOTs that this object can be socketed into
bool m_socketDestinationsLoaded;
bool m_socketDestinationsAppend;
StringParam m_structureFootprintFileName;
BoolParam m_useStructureFootprintOutline;
BoolParam m_targetable; // // can the object be targetted by the client
stdvector<StringParam *>::fwd m_certificationsRequired; // // List of the certifications required to use this item (used in x1 only)
std::vector<StringParam *> m_certificationsRequired; // // List of the certifications required to use this item (used in x1 only)
bool m_certificationsRequiredLoaded;
bool m_certificationsRequiredAppend;
stdvector<StructParamOT *>::fwd m_customizationVariableMapping; // // Allows remapping of variables when needed
std::vector<StructParamOT *> m_customizationVariableMapping; // // Allows remapping of variables when needed
bool m_customizationVariableMappingLoaded;
bool m_customizationVariableMappingAppend;
IntegerParam m_clientVisabilityFlag; // // can the object be viewed on the client
engine/shared/library/sharedGame/src/shared/quest/Quest.h
+5 -5
View File
@@ -33,8 +33,8 @@ public:
public:
bool isRepeatable() const;
bool isVisible() const;
stdvector<uint32>::fwd const & getPrerequisiteQuests() const;
stdvector<uint32>::fwd const & getExclusionQuests() const;
std::vector<uint32> const & getPrerequisiteQuests() const;
std::vector<uint32> const & getExclusionQuests() const;
int getNumberOfTasks() const;
QuestTask const * getTask(int taskId) const;
CrcString const & getName() const;
@@ -64,9 +64,9 @@ private:
StringId m_journalEntryTitle;
StringId m_journalEntryDescription;
StringId m_journalEntryCompetionSummary;
stdvector<uint32>::fwd * const m_prerequisiteQuests;
stdvector<uint32>::fwd * const m_exclusionQuests;
stdvector<QuestTask *>::fwd * const m_tasks;
std::vector<uint32> * const m_prerequisiteQuests;
std::vector<uint32> * const m_exclusionQuests;
std::vector<QuestTask *> * const m_tasks;
bool m_allowRepeats;
bool m_visible;
StringId m_category;
engine/shared/library/sharedGame/src/shared/quest/QuestTask.h
+1 -1
View File
@@ -24,7 +24,7 @@ class Quest;
class QuestTask
{
public:
typedef stdvector<int>::fwd TaskIdList;
typedef std::vector<int> TaskIdList;
enum QuestControl
{
engine/shared/library/sharedGame/src/shared/space/AsteroidGenerationManager.cpp
+1 -1
View File
@@ -340,7 +340,7 @@ bool AsteroidGenerationManager::hasDataForScene(std::string const & sceneName)
The same seed data will always generate the same asteroid field.
The field will have randomly even distribution of position, orientation, rotation range, scale range, and template selection based on the ratios given in the fields style table
*/
bool AsteroidGenerationManager::generateField(AsteroidFieldData const & fieldData, stdvector<AsteroidData>::fwd & result)
bool AsteroidGenerationManager::generateField(AsteroidFieldData const & fieldData, std::vector<AsteroidData> & result)
{
if(!s_installed)
{
engine/shared/library/sharedGame/src/shared/space/AsteroidGenerationManager.h
+4 -4
View File
@@ -76,13 +76,13 @@ public:
public:
static void install();
static bool generateField(AsteroidFieldData const & fieldData, stdvector<AsteroidData>::fwd & result);
static bool generateField(Vector const & centerPosition, float radius, int count, uint32 seed, float scaleMin, float scaleMax, float rotationMin, float rotationMax, stdvector<std::pair<uint32, float> >::fwd const & templateCrcsAndLikelihood, stdvector<AsteroidData>::fwd & asteroidDatas);
static bool generateField(AsteroidFieldData const & fieldData, std::vector<AsteroidData> & result);
static bool generateField(Vector const & centerPosition, float radius, int count, uint32 seed, float scaleMin, float scaleMax, float rotationMin, float rotationMax, std::vector<std::pair<uint32, float> > const & templateCrcsAndLikelihood, std::vector<AsteroidData> & asteroidDatas);
static void loadStaticFieldDataForScene(std::string const & sceneName, bool server);
static void clearStaticFieldData();
static void clearInstantiatedData();
static bool hasDataForScene(std::string const & sceneName);
static stdvector<AsteroidFieldData>::fwd const & getDataForScene(std::string const & sceneName);
static std::vector<AsteroidFieldData> const & getDataForScene(std::string const & sceneName);
static void registerGetExtentRadiusFunction(GetExtentRadiusFunction);
private:
@@ -99,7 +99,7 @@ private:
private:
typedef std::string SceneNameKey;
static stdmap<SceneNameKey, stdvector<AsteroidFieldData>::fwd>::fwd ms_staticFieldData;
static std::map<SceneNameKey, std::vector<AsteroidFieldData>> ms_staticFieldData;
static SphereTree<Sphere*, AsteroidDataSphereExtentAccessor> ms_collisionSphereTree;
static std::vector<SpatialSubdivisionHandle*> ms_objectsInSphereTree;
static GetExtentRadiusFunction ms_getRadiusFunction;
engine/shared/library/sharedGame/src/shared/space/NebulaManager.cpp
+1 -1
View File
@@ -25,7 +25,7 @@
namespace NebulaManagerNamespace
{
typedef NebulaManager::NebulaVector NebulaVector;
typedef stdmap<int, Nebula const *>::fwd NebulaMap;
typedef std::map<int, Nebula const *> NebulaMap;
typedef std::map<std::string, NebulaVector> NebulasByScene;
//-- nebula vector OWNS the nebulas
engine/shared/library/sharedGame/src/shared/space/NebulaManager.h
+1 -1
View File
@@ -21,7 +21,7 @@ public:
typedef void (*ImplementationClearFunction) (void);
typedef stdvector<Nebula const *>::fwd NebulaVector;
typedef std::vector<Nebula const *> NebulaVector;
static void install();
static void remove();
engine/shared/library/sharedGame/src/shared/space/PlayerFormationManager.h
+1 -1
View File
@@ -19,7 +19,7 @@ class PlayerFormationManager
{
public:
typedef stdvector<std::string>::fwd FormationNameList;
typedef std::vector<std::string> FormationNameList;
struct FormationLocation;
public:
engine/shared/library/sharedGame/src/shared/space/ShipChassis.cpp
+2 -2
View File
@@ -28,8 +28,8 @@
namespace ShipChassisNamespace
{
typedef stdmap<PersistentCrcString, ShipChassis *>::fwd NameChassisMap;
typedef stdmap<uint32, ShipChassis const *>::fwd CrcChassisMap;
typedef std::map<PersistentCrcString, ShipChassis *> NameChassisMap;
typedef std::map<uint32, ShipChassis const *> CrcChassisMap;
typedef ShipChassis::PersistentCrcStringVector PersistentCrcStringVector;
PersistentCrcStringVector * s_shipChassisNameVector;
engine/shared/library/sharedGame/src/shared/space/ShipChassis.h
+5 -5
View File
@@ -21,10 +21,10 @@ class ShipChassis
{
public:
typedef stdvector<ShipChassisSlot>::fwd SlotVector;
typedef stdset<ShipChassisSlot>::fwd SlotSet;
typedef stdvector<int>::fwd IntVector;
typedef stdvector<std::string>::fwd StringVector;
typedef std::vector<ShipChassisSlot> SlotVector;
typedef std::set<ShipChassisSlot> SlotSet;
typedef std::vector<int> IntVector;
typedef std::vector<std::string> StringVector;
static void install ();
static void remove ();
@@ -34,7 +34,7 @@ public:
static void setUseWritableChassis(bool onlyUseThisForTools);
typedef stdvector<PersistentCrcString *>::fwd PersistentCrcStringVector;
typedef std::vector<PersistentCrcString *> PersistentCrcStringVector;
static PersistentCrcStringVector const & getShipChassisCrcVector ();
engine/shared/library/sharedGame/src/shared/space/ShipChassisSlot.cpp
+1 -1
View File
@@ -31,7 +31,7 @@ namespace ShipChassisSlotNamespace
//----------------------------------------------------------------------
typedef stdvector<CrcString *>::fwd CompatibilityVector;
typedef std::vector<CrcString *> CompatibilityVector;
//----------------------------------------------------------------------
engine/shared/library/sharedGame/src/shared/space/ShipChassisSlot.h
+1 -1
View File
@@ -20,7 +20,7 @@ class ShipComponentDescriptor;
class ShipChassisSlot
{
public:
typedef stdvector<CrcString *>::fwd CompatibilityVector;
typedef std::vector<CrcString *> CompatibilityVector;
ShipChassisSlot (ShipChassisSlotType::Type slotType, std::string const & compatibilities, int hitWeight, bool targetable);
ShipChassisSlot ();
engine/shared/library/sharedGame/src/shared/space/ShipChassisSlotType.cpp
+1 -1
View File
@@ -273,7 +273,7 @@ namespace ShipChassisSlotTypeNamespace
static_cast<int>(ShipComponentType::SCT_weapon), // SCST_weapon_99
};
typedef stdunordered_map<std::string, ShipChassisSlotType::Type>::fwd SlotNameTypeMap;
typedef std::unordered_map<std::string, ShipChassisSlotType::Type> SlotNameTypeMap;
SlotNameTypeMap s_slotNameTypeMap;
bool s_installed = false;
engine/shared/library/sharedGame/src/shared/space/ShipComponentAttachmentManager.cpp
+1 -1
View File
@@ -79,7 +79,7 @@ namespace ShipComponentAttachmentManagerNamespace
}
};
typedef stdmap<AttachmentKey, TemplateHardpointPairVector>::fwd AttachmentMap;
typedef std::map<AttachmentKey, TemplateHardpointPairVector> AttachmentMap;
AttachmentMap * s_attachmentMap;
typedef std::map<AttachmentKey, float> ComponentHitRangeMap;
engine/shared/library/sharedGame/src/shared/space/ShipComponentAttachmentManager.h
+2 -2
View File
@@ -34,8 +34,8 @@ public:
static bool saveChassisInfo(std::string const & chassisName, std::string const & chassisFilenameTab, std::string const & chassisFilenameIff);
typedef std::pair<uint32, PersistentCrcString> TemplateHardpointPair;
typedef stdvector<TemplateHardpointPair>::fwd TemplateHardpointPairVector;
typedef stdvector<PersistentCrcString>::fwd HardpointVector;
typedef std::vector<TemplateHardpointPair> TemplateHardpointPairVector;
typedef std::vector<PersistentCrcString> HardpointVector;
static TemplateHardpointPairVector const & getAttachmentsForShip (uint32 chassisCrc, uint32 componentCrc, int chassisSlotType);
static bool getAttachmentsForShip(uint32 chassisCrc, uint32 componentCrc, TemplateHardpointPairVector const ** thpVectors);
engine/shared/library/sharedGame/src/shared/space/ShipComponentData.h
+1 -1
View File
@@ -25,7 +25,7 @@ class ShipComponentData
public:
typedef std::pair<std::string, Unicode::String> AttributePair;
typedef stdvector<AttributePair>::fwd AttributeVector;
typedef std::vector<AttributePair> AttributeVector;
explicit ShipComponentData (ShipComponentDescriptor const & shipComponentDescriptor);
virtual ~ShipComponentData () = 0;
engine/shared/library/sharedGame/src/shared/space/ShipComponentDescriptor.cpp
+3 -3
View File
@@ -29,9 +29,9 @@
namespace ShipComponentDescriptorNamespace
{
typedef stdmap<PersistentCrcString, ShipComponentDescriptor *>::fwd NameComponentMap;
typedef stdmap<uint32, ShipComponentDescriptor const *>::fwd CrcComponentMap;
typedef stdmap<uint32, ShipComponentDescriptor const *>::fwd ObjectTemplateCrcComponentMap;
typedef std::map<PersistentCrcString, ShipComponentDescriptor *> NameComponentMap;
typedef std::map<uint32, ShipComponentDescriptor const *> CrcComponentMap;
typedef std::map<uint32, ShipComponentDescriptor const *> ObjectTemplateCrcComponentMap;
//-- the s_nameComponentMap owns the ShipComponentDescriptor objects
NameComponentMap * s_nameComponentMap;
engine/shared/library/sharedGame/src/shared/space/ShipComponentDescriptor.h
+2 -2
View File
@@ -21,8 +21,8 @@ class ShipComponentDescriptor
{
public:
typedef stdvector<std::string>::fwd StringVector;
typedef stdmap<PersistentCrcString, ShipComponentDescriptor *>::fwd NameComponentMap;
typedef std::vector<std::string> StringVector;
typedef std::map<PersistentCrcString, ShipComponentDescriptor *> NameComponentMap;
static void install ();
static void fetchSharedObjectTemplates();
engine/shared/library/sharedGame/src/shared/space/ShipComponentType.cpp
+1 -1
View File
@@ -48,7 +48,7 @@ namespace ShipComponentTypeNamespace
"mod_"
};
typedef stdunordered_map<std::string, ShipComponentType::Type>::fwd ComponentNameTypeMap;
typedef std::unordered_map<std::string, ShipComponentType::Type> ComponentNameTypeMap;
ComponentNameTypeMap s_componentNameTypeMap;
bool s_installed = false;
engine/shared/library/sharedGame/src/shared/space/ShipComponentWeaponManager.cpp
+1 -1
View File
@@ -55,7 +55,7 @@ namespace ShipComponentWeaponManagerNamespace
}
};
typedef stdmap<uint32, Data>::fwd CrcIntMap;
typedef std::map<uint32, Data> CrcIntMap;
CrcIntMap s_dataMap;
bool s_installed = false;
engine/shared/library/sharedGame/src/shared/space/ShipTargeting.h
+1 -1
View File
@@ -19,7 +19,7 @@ class ShipTargeting
{
public:
typedef stdvector<Object *>::fwd ObjectVector;
typedef std::vector<Object *> ObjectVector;
typedef bool (*ActorAndTargetHaveReletionship)(Object const * actor, Object const * target);
engine/shared/library/sharedGame/src/shared/sui/SuiCommand.h
+3 -3
View File
@@ -38,9 +38,9 @@ public:
SCT_addDataSource,
};
typedef stdvector<Unicode::String>::fwd UnicodeStringVector;
typedef stdvector<std::string>::fwd StringVector;
typedef stdvector<SuiWidgetProperty>::fwd WidgetPropertyVector;
typedef std::vector<Unicode::String> UnicodeStringVector;
typedef std::vector<std::string> StringVector;
typedef std::vector<SuiWidgetProperty> WidgetPropertyVector;
public:
engine/shared/library/sharedGame/src/shared/sui/SuiPageData.h
+1 -1
View File
@@ -29,7 +29,7 @@ class SuiPageData
{
public:
typedef stdvector<SuiCommand>::fwd SuiCommandVector;
typedef std::vector<SuiCommand> SuiCommandVector;
public:
engine/shared/library/sharedGame/src/shared/travel/TravelManager.h
+1 -1
View File
@@ -22,7 +22,7 @@ public:
static bool getPlanetName (int planetIndex, std::string& planetName);
static bool getPlanetSingleHopCost (const std::string& planetName1, const std::string& planetName2, int& planetCost);
static bool getPlanetAnyHopLeastCost (const std::string& planetName1, const std::string& planetName2, int& planetCost);
static bool getAdjacentPlanets (const std::string& planetName, stdset<std::string>::fwd& planetSet);
static bool getAdjacentPlanets (const std::string& planetName, std::set<std::string>& planetSet);
};
// ======================================================================