diff --git a/engine/server/library/serverGame/src/CMakeLists.txt b/engine/server/library/serverGame/src/CMakeLists.txt index 804d16db..98fb2c19 100644 --- a/engine/server/library/serverGame/src/CMakeLists.txt +++ b/engine/server/library/serverGame/src/CMakeLists.txt @@ -543,16 +543,22 @@ set(SHARED_SOURCES shared/objectTemplate/ServerManufactureInstallationObjectTemplate.h shared/objectTemplate/ServerManufactureSchematicObjectTemplate.cpp shared/objectTemplate/ServerManufactureSchematicObjectTemplate.h + shared/objectTemplate/ServerMissionBoardObjectTemplate.cpp + shared/objectTemplate/ServerMissionBoardObjectTemplate.h + shared/objectTemplate/ServerMissionDataObjectTemplate.cpp + shared/objectTemplate/ServerMissionDataObjectTemplate.h + shared/objectTemplate/ServerMissionListEntryObjectTemplate.cpp + shared/objectTemplate/ServerMissionListEntryObjectTemplate.h shared/objectTemplate/ServerMissionObjectTemplate.cpp shared/objectTemplate/ServerMissionObjectTemplate.h shared/objectTemplate/ServerObjectTemplate.cpp shared/objectTemplate/ServerObjectTemplate.h shared/objectTemplate/ServerPlanetObjectTemplate.cpp shared/objectTemplate/ServerPlanetObjectTemplate.h - shared/objectTemplate/ServerPlayerQuestObjectTemplate.h - shared/objectTemplate/ServerPlayerQuestObjectTemplate.cpp shared/objectTemplate/ServerPlayerObjectTemplate.cpp shared/objectTemplate/ServerPlayerObjectTemplate.h + shared/objectTemplate/ServerPlayerQuestObjectTemplate.cpp + shared/objectTemplate/ServerPlayerQuestObjectTemplate.h shared/objectTemplate/ServerResourceContainerObjectTemplate.cpp shared/objectTemplate/ServerResourceContainerObjectTemplate.h shared/objectTemplate/ServerSharedObjectTemplateInterface.cpp @@ -563,6 +569,8 @@ set(SHARED_SOURCES shared/objectTemplate/ServerStaticObjectTemplate.h shared/objectTemplate/ServerTangibleObjectTemplate.cpp shared/objectTemplate/ServerTangibleObjectTemplate.h + shared/objectTemplate/ServerTokenObjectTemplate.cpp + shared/objectTemplate/ServerTokenObjectTemplate.h shared/objectTemplate/ServerUniverseObjectTemplate.cpp shared/objectTemplate/ServerUniverseObjectTemplate.h shared/objectTemplate/ServerVehicleObjectTemplate.cpp @@ -570,7 +578,7 @@ set(SHARED_SOURCES shared/objectTemplate/ServerWeaponObjectTemplate.cpp shared/objectTemplate/ServerWeaponObjectTemplate.h shared/objectTemplate/ServerXpManagerObjectTemplate.cpp - shared/objectTemplate/ServerXpManagerObjectTemplate.h + shared/objectTemplate/ServerXpManagerObjectTemplate.h shared/pvp/Pvp.cpp shared/pvp/PvpFactions.cpp diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerArmorTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerArmorTemplate.cpp old mode 100755 new mode 100644 index 2e644ad9..c154863d --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerArmorTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerArmorTemplate.cpp @@ -18,27 +18,26 @@ #include "sharedObject/ObjectTemplateList.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS -#include -#include +#include const std::string DefaultString(""); const StringId DefaultStringId("", 0); -const Vector DefaultVector(0, 0, 0); +const Vector DefaultVector(0,0,0); const TriggerVolumeData DefaultTriggerVolumeData; bool ServerArmorTemplate::ms_allowDefaultTemplateParams = true; + /** * Class constructor. */ ServerArmorTemplate::ServerArmorTemplate(const std::string & filename) //@BEGIN TFD INIT : ObjectTemplate(filename) - , m_specialProtectionLoaded(false) - , m_specialProtectionAppend(false) - , m_versionOk(true) - , m_templateVersion(0) - //@END TFD INIT + ,m_specialProtectionLoaded(false) + ,m_specialProtectionAppend(false) + ,m_versionOk(true) +//@END TFD INIT { } // ServerArmorTemplate::ServerArmorTemplate @@ -47,7 +46,7 @@ ServerArmorTemplate::ServerArmorTemplate(const std::string & filename) */ ServerArmorTemplate::~ServerArmorTemplate() { - //@BEGIN TFD CLEANUP +//@BEGIN TFD CLEANUP { std::vector::iterator iter; for (iter = m_specialProtection.begin(); iter != m_specialProtection.end(); ++iter) @@ -57,7 +56,7 @@ ServerArmorTemplate::~ServerArmorTemplate() } m_specialProtection.clear(); } - //@END TFD CLEANUP +//@END TFD CLEANUP } // ServerArmorTemplate::~ServerArmorTemplate /** @@ -105,21 +104,31 @@ Tag ServerArmorTemplate::getTemplateVersion(void) const */ Tag ServerArmorTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerArmorTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerArmorTemplate::getHighestTemplateVersion //@BEGIN TFD -ServerArmorTemplate::ArmorRating ServerArmorTemplate::getRating() const +ServerArmorTemplate::ArmorRating ServerArmorTemplate::getRating(bool testData) const { +#ifdef _DEBUG +ServerArmorTemplate::ArmorRating testDataValue = static_cast(0); +#else +UNREF(testData); +#endif + const ServerArmorTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getRating(true); +#endif } if (!m_rating.isLoaded()) @@ -137,16 +146,31 @@ ServerArmorTemplate::ArmorRating ServerArmorTemplate::getRating() const } ArmorRating value = static_cast(m_rating.getValue()); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerArmorTemplate::getRating -int ServerArmorTemplate::getIntegrity() const +int ServerArmorTemplate::getIntegrity(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerArmorTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getIntegrity(true); +#endif } if (!m_integrity.isLoaded()) @@ -186,16 +210,31 @@ int ServerArmorTemplate::getIntegrity() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerArmorTemplate::getIntegrity -int ServerArmorTemplate::getIntegrityMin() const +int ServerArmorTemplate::getIntegrityMin(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerArmorTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getIntegrityMin(true); +#endif } if (!m_integrity.isLoaded()) @@ -235,16 +274,31 @@ int ServerArmorTemplate::getIntegrityMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerArmorTemplate::getIntegrityMin -int ServerArmorTemplate::getIntegrityMax() const +int ServerArmorTemplate::getIntegrityMax(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerArmorTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getIntegrityMax(true); +#endif } if (!m_integrity.isLoaded()) @@ -284,16 +338,31 @@ int ServerArmorTemplate::getIntegrityMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerArmorTemplate::getIntegrityMax -int ServerArmorTemplate::getEffectiveness() const +int ServerArmorTemplate::getEffectiveness(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerArmorTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getEffectiveness(true); +#endif } if (!m_effectiveness.isLoaded()) @@ -333,16 +402,31 @@ int ServerArmorTemplate::getEffectiveness() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerArmorTemplate::getEffectiveness -int ServerArmorTemplate::getEffectivenessMin() const +int ServerArmorTemplate::getEffectivenessMin(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerArmorTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getEffectivenessMin(true); +#endif } if (!m_effectiveness.isLoaded()) @@ -382,16 +466,31 @@ int ServerArmorTemplate::getEffectivenessMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerArmorTemplate::getEffectivenessMin -int ServerArmorTemplate::getEffectivenessMax() const +int ServerArmorTemplate::getEffectivenessMax(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerArmorTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getEffectivenessMax(true); +#endif } if (!m_effectiveness.isLoaded()) @@ -431,6 +530,11 @@ int ServerArmorTemplate::getEffectivenessMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerArmorTemplate::getEffectivenessMax @@ -448,7 +552,7 @@ void ServerArmorTemplate::getSpecialProtection(SpecialProtection &data, int inde if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter specialProtection in template %s", DataResource::getName())); - return; + return ; } else { @@ -462,10 +566,10 @@ void ServerArmorTemplate::getSpecialProtection(SpecialProtection &data, int inde { int baseCount = base->getSpecialProtectionCount(); if (index < baseCount) - { - base->getSpecialProtection(data, index); - return; - } + { + base->getSpecialProtection(data, index); + return; + } index -= baseCount; } @@ -491,7 +595,7 @@ void ServerArmorTemplate::getSpecialProtectionMin(SpecialProtection &data, int i if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter specialProtection in template %s", DataResource::getName())); - return; + return ; } else { @@ -505,10 +609,10 @@ void ServerArmorTemplate::getSpecialProtectionMin(SpecialProtection &data, int i { int baseCount = base->getSpecialProtectionCount(); if (index < baseCount) - { - base->getSpecialProtectionMin(data, index); - return; - } + { + base->getSpecialProtectionMin(data, index); + return; + } index -= baseCount; } @@ -534,7 +638,7 @@ void ServerArmorTemplate::getSpecialProtectionMax(SpecialProtection &data, int i if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter specialProtection in template %s", DataResource::getName())); - return; + return ; } else { @@ -548,10 +652,10 @@ void ServerArmorTemplate::getSpecialProtectionMax(SpecialProtection &data, int i { int baseCount = base->getSpecialProtectionCount(); if (index < baseCount) - { - base->getSpecialProtectionMax(data, index); - return; - } + { + base->getSpecialProtectionMax(data, index); + return; + } index -= baseCount; } @@ -588,12 +692,22 @@ size_t ServerArmorTemplate::getSpecialProtectionCount(void) const return count; } // ServerArmorTemplate::getSpecialProtectionCount -int ServerArmorTemplate::getVulnerability() const +int ServerArmorTemplate::getVulnerability(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerArmorTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getVulnerability(true); +#endif } if (!m_vulnerability.isLoaded()) @@ -633,16 +747,31 @@ int ServerArmorTemplate::getVulnerability() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerArmorTemplate::getVulnerability -int ServerArmorTemplate::getVulnerabilityMin() const +int ServerArmorTemplate::getVulnerabilityMin(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerArmorTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getVulnerabilityMin(true); +#endif } if (!m_vulnerability.isLoaded()) @@ -682,16 +811,31 @@ int ServerArmorTemplate::getVulnerabilityMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerArmorTemplate::getVulnerabilityMin -int ServerArmorTemplate::getVulnerabilityMax() const +int ServerArmorTemplate::getVulnerabilityMax(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerArmorTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getVulnerabilityMax(true); +#endif } if (!m_vulnerability.isLoaded()) @@ -731,6 +875,11 @@ int ServerArmorTemplate::getVulnerabilityMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerArmorTemplate::getVulnerabilityMax @@ -882,6 +1031,22 @@ int ServerArmorTemplate::getEncumbranceMax(int index) const return value; } // ServerArmorTemplate::getEncumbranceMax +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void ServerArmorTemplate::testValues(void) const +{ + IGNORE_RETURN(getRating(true)); + IGNORE_RETURN(getIntegrityMin(true)); + IGNORE_RETURN(getIntegrityMax(true)); + IGNORE_RETURN(getEffectivenessMin(true)); + IGNORE_RETURN(getEffectivenessMax(true)); + IGNORE_RETURN(getVulnerabilityMin(true)); + IGNORE_RETURN(getVulnerabilityMax(true)); +} // ServerArmorTemplate::testValues +#endif + /** * Loads the template data from an iff file. We should already be in the form * for this template. @@ -890,8 +1055,8 @@ int ServerArmorTemplate::getEncumbranceMax(int index) const */ void ServerArmorTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != ServerArmorTemplate_tag) { @@ -900,7 +1065,7 @@ void ServerArmorTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -920,8 +1085,10 @@ void ServerArmorTemplate::load(Iff &file) file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 0, 1)) + if (getHighestTemplateVersion() != TAG(0,0,0,1)) { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); m_versionOk = false; } @@ -982,6 +1149,7 @@ void ServerArmorTemplate::load(Iff &file) return; } // ServerArmorTemplate::load + //============================================================================= // class ServerArmorTemplate::_SpecialProtection @@ -1028,12 +1196,22 @@ Tag ServerArmorTemplate::_SpecialProtection::getId(void) const return _SpecialProtection_tag; } // ServerArmorTemplate::_SpecialProtection::getId -ServerArmorTemplate::DamageType ServerArmorTemplate::_SpecialProtection::getType(bool versionOk) const +ServerArmorTemplate::DamageType ServerArmorTemplate::_SpecialProtection::getType(bool versionOk, bool testData) const { +#ifdef _DEBUG +ServerArmorTemplate::DamageType testDataValue = static_cast(0); +#else +UNREF(testData); +#endif + const ServerArmorTemplate::_SpecialProtection * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getType(true); +#endif } if (!m_type.isLoaded()) @@ -1051,16 +1229,31 @@ ServerArmorTemplate::DamageType ServerArmorTemplate::_SpecialProtection::getType } DamageType value = static_cast(m_type.getValue()); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerArmorTemplate::_SpecialProtection::getType -int ServerArmorTemplate::_SpecialProtection::getEffectiveness(bool versionOk) const +int ServerArmorTemplate::_SpecialProtection::getEffectiveness(bool versionOk, bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerArmorTemplate::_SpecialProtection * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getEffectiveness(true); +#endif } if (!m_effectiveness.isLoaded()) @@ -1100,16 +1293,31 @@ int ServerArmorTemplate::_SpecialProtection::getEffectiveness(bool versionOk) co else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerArmorTemplate::_SpecialProtection::getEffectiveness -int ServerArmorTemplate::_SpecialProtection::getEffectivenessMin(bool versionOk) const +int ServerArmorTemplate::_SpecialProtection::getEffectivenessMin(bool versionOk, bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerArmorTemplate::_SpecialProtection * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getEffectivenessMin(true); +#endif } if (!m_effectiveness.isLoaded()) @@ -1149,16 +1357,31 @@ int ServerArmorTemplate::_SpecialProtection::getEffectivenessMin(bool versionOk) else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerArmorTemplate::_SpecialProtection::getEffectivenessMin -int ServerArmorTemplate::_SpecialProtection::getEffectivenessMax(bool versionOk) const +int ServerArmorTemplate::_SpecialProtection::getEffectivenessMax(bool versionOk, bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerArmorTemplate::_SpecialProtection * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getEffectivenessMax(true); +#endif } if (!m_effectiveness.isLoaded()) @@ -1198,10 +1421,27 @@ int ServerArmorTemplate::_SpecialProtection::getEffectivenessMax(bool versionOk) else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerArmorTemplate::_SpecialProtection::getEffectivenessMax +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void ServerArmorTemplate::_SpecialProtection::testValues(void) const +{ + IGNORE_RETURN(getType(true)); + IGNORE_RETURN(getEffectivenessMin(true)); + IGNORE_RETURN(getEffectivenessMax(true)); +} // ServerArmorTemplate::_SpecialProtection::testValues +#endif + /** * Loads the template data from an iff file. We should already be in the form * for this template. @@ -1210,8 +1450,8 @@ int ServerArmorTemplate::_SpecialProtection::getEffectivenessMax(bool versionOk) */ void ServerArmorTemplate::_SpecialProtection::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; file.enterForm(); @@ -1233,4 +1473,4 @@ void ServerArmorTemplate::_SpecialProtection::load(Iff &file) UNREF(file); } // ServerArmorTemplate::_SpecialProtection::load -//@END TFD \ No newline at end of file +//@END TFD diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerArmorTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerArmorTemplate.h old mode 100755 new mode 100644 index e52eb69d..75523bdb --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerArmorTemplate.h +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerArmorTemplate.h @@ -57,7 +57,6 @@ public: enum DamageType { - DT_none = 0x00000000, DT_kinetic = 0x00000001, DT_energy = 0x00000002, DT_blast = 0x00000004, @@ -98,11 +97,16 @@ protected: virtual Tag getId(void) const; public: - DamageType getType(bool versionOk) const; - int getEffectiveness(bool versionOk) const; - int getEffectivenessMin(bool versionOk) const; - int getEffectivenessMax(bool versionOk) const; + DamageType getType(bool versionOk, bool testData = false) const; + int getEffectiveness(bool versionOk, bool testData = false) const; + int getEffectivenessMin(bool versionOk, bool testData = false) const; + int getEffectivenessMax(bool versionOk, bool testData = false) const; +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); @@ -120,24 +124,29 @@ private: friend class ServerArmorTemplate::_SpecialProtection; public: - ArmorRating getRating() const; - int getIntegrity() const; - int getIntegrityMin() const; - int getIntegrityMax() const; - int getEffectiveness() const; - int getEffectivenessMin() const; - int getEffectivenessMax() const; + ArmorRating getRating(bool testData = false) const; + int getIntegrity(bool testData = false) const; + int getIntegrityMin(bool testData = false) const; + int getIntegrityMax(bool testData = false) const; + int getEffectiveness(bool testData = false) const; + int getEffectivenessMin(bool testData = false) const; + int getEffectivenessMax(bool testData = false) const; void getSpecialProtection(SpecialProtection &data, int index) const; void getSpecialProtectionMin(SpecialProtection &data, int index) const; void getSpecialProtectionMax(SpecialProtection &data, int index) const; size_t getSpecialProtectionCount(void) const; - int getVulnerability() const; - int getVulnerabilityMin() const; - int getVulnerabilityMax() const; + int getVulnerability(bool testData = false) const; + int getVulnerabilityMin(bool testData = false) const; + int getVulnerabilityMax(bool testData = false) const; int getEncumbrance(int index) const; int getEncumbranceMin(int index) const; int getEncumbranceMax(int index) const; +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerBattlefieldMarkerObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerBattlefieldMarkerObjectTemplate.cpp old mode 100755 new mode 100644 index 6560b6de..807e7836 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerBattlefieldMarkerObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerBattlefieldMarkerObjectTemplate.cpp @@ -13,7 +13,7 @@ #include "serverGame/FirstServerGame.h" #include "ServerBattlefieldMarkerObjectTemplate.h" #include "serverGame/BattlefieldMarkerObject.h" - +#include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedObject/ObjectTemplate.h" #include "sharedObject/ObjectTemplateList.h" @@ -23,20 +23,20 @@ const std::string DefaultString(""); const StringId DefaultStringId("", 0); -const Vector DefaultVector(0, 0, 0); +const Vector DefaultVector(0,0,0); const TriggerVolumeData DefaultTriggerVolumeData; bool ServerBattlefieldMarkerObjectTemplate::ms_allowDefaultTemplateParams = true; + /** * Class constructor. */ ServerBattlefieldMarkerObjectTemplate::ServerBattlefieldMarkerObjectTemplate(const std::string & filename) //@BEGIN TFD INIT : ServerTangibleObjectTemplate(filename) - , m_versionOk(true) - , m_templateVersion(0) - //@END TFD INIT + ,m_versionOk(true) +//@END TFD INIT { } // ServerBattlefieldMarkerObjectTemplate::ServerBattlefieldMarkerObjectTemplate @@ -45,8 +45,8 @@ ServerBattlefieldMarkerObjectTemplate::ServerBattlefieldMarkerObjectTemplate(con */ ServerBattlefieldMarkerObjectTemplate::~ServerBattlefieldMarkerObjectTemplate() { - //@BEGIN TFD CLEANUP - //@END TFD CLEANUP +//@BEGIN TFD CLEANUP +//@END TFD CLEANUP } // ServerBattlefieldMarkerObjectTemplate::~ServerBattlefieldMarkerObjectTemplate /** @@ -94,10 +94,10 @@ Tag ServerBattlefieldMarkerObjectTemplate::getTemplateVersion(void) const */ Tag ServerBattlefieldMarkerObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerBattlefieldMarkerObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerBattlefieldMarkerObjectTemplate::getHighestTemplateVersion @@ -113,6 +113,15 @@ Object * ServerBattlefieldMarkerObjectTemplate::createObject(void) const } // ServerBattlefieldMarkerObjectTemplate::createObject //@BEGIN TFD +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void ServerBattlefieldMarkerObjectTemplate::testValues(void) const +{ + ServerTangibleObjectTemplate::testValues(); +} // ServerBattlefieldMarkerObjectTemplate::testValues +#endif /** * Loads the template data from an iff file. We should already be in the form @@ -122,8 +131,8 @@ Object * ServerBattlefieldMarkerObjectTemplate::createObject(void) const */ void ServerBattlefieldMarkerObjectTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != ServerBattlefieldMarkerObjectTemplate_tag) { @@ -133,7 +142,7 @@ void ServerBattlefieldMarkerObjectTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -153,8 +162,10 @@ void ServerBattlefieldMarkerObjectTemplate::load(Iff &file) file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 0, 0)) + if (getHighestTemplateVersion() != TAG(0,0,0,0)) { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); m_versionOk = false; } @@ -172,4 +183,4 @@ void ServerBattlefieldMarkerObjectTemplate::load(Iff &file) return; } // ServerBattlefieldMarkerObjectTemplate::load -//@END TFD \ No newline at end of file +//@END TFD diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerBattlefieldMarkerObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerBattlefieldMarkerObjectTemplate.h old mode 100755 new mode 100644 index 85c16d13..935ba00c --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerBattlefieldMarkerObjectTemplate.h +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerBattlefieldMarkerObjectTemplate.h @@ -45,6 +45,11 @@ public: //@BEGIN TFD public: +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerBuildingObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerBuildingObjectTemplate.cpp old mode 100755 new mode 100644 index df2091ee..81490168 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerBuildingObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerBuildingObjectTemplate.cpp @@ -22,20 +22,20 @@ const std::string DefaultString(""); const StringId DefaultStringId("", 0); -const Vector DefaultVector(0, 0, 0); +const Vector DefaultVector(0,0,0); const TriggerVolumeData DefaultTriggerVolumeData; bool ServerBuildingObjectTemplate::ms_allowDefaultTemplateParams = true; + /** * Class constructor. */ ServerBuildingObjectTemplate::ServerBuildingObjectTemplate(const std::string & filename) //@BEGIN TFD INIT : ServerTangibleObjectTemplate(filename) - , m_versionOk(true) - , m_templateVersion(0) - //@END TFD INIT + ,m_versionOk(true) +//@END TFD INIT { } // ServerBuildingObjectTemplate::ServerBuildingObjectTemplate @@ -44,8 +44,8 @@ ServerBuildingObjectTemplate::ServerBuildingObjectTemplate(const std::string & f */ ServerBuildingObjectTemplate::~ServerBuildingObjectTemplate() { - //@BEGIN TFD CLEANUP - //@END TFD CLEANUP +//@BEGIN TFD CLEANUP +//@END TFD CLEANUP } // ServerBuildingObjectTemplate::~ServerBuildingObjectTemplate /** @@ -93,10 +93,10 @@ Tag ServerBuildingObjectTemplate::getTemplateVersion(void) const */ Tag ServerBuildingObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerBuildingObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerBuildingObjectTemplate::getHighestTemplateVersion @@ -112,12 +112,22 @@ Object * ServerBuildingObjectTemplate::createObject(void) const } // ServerBuildingObjectTemplate::createObject //@BEGIN TFD -int ServerBuildingObjectTemplate::getMaintenanceCost() const +int ServerBuildingObjectTemplate::getMaintenanceCost(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerBuildingObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getMaintenanceCost(true); +#endif } if (!m_maintenanceCost.isLoaded()) @@ -157,16 +167,31 @@ int ServerBuildingObjectTemplate::getMaintenanceCost() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerBuildingObjectTemplate::getMaintenanceCost -int ServerBuildingObjectTemplate::getMaintenanceCostMin() const +int ServerBuildingObjectTemplate::getMaintenanceCostMin(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerBuildingObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getMaintenanceCostMin(true); +#endif } if (!m_maintenanceCost.isLoaded()) @@ -206,16 +231,31 @@ int ServerBuildingObjectTemplate::getMaintenanceCostMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerBuildingObjectTemplate::getMaintenanceCostMin -int ServerBuildingObjectTemplate::getMaintenanceCostMax() const +int ServerBuildingObjectTemplate::getMaintenanceCostMax(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerBuildingObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getMaintenanceCostMax(true); +#endif } if (!m_maintenanceCost.isLoaded()) @@ -255,16 +295,31 @@ int ServerBuildingObjectTemplate::getMaintenanceCostMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerBuildingObjectTemplate::getMaintenanceCostMax -bool ServerBuildingObjectTemplate::getIsPublic() const +bool ServerBuildingObjectTemplate::getIsPublic(bool testData) const { +#ifdef _DEBUG +bool testDataValue = false; +#else +UNREF(testData); +#endif + const ServerBuildingObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getIsPublic(true); +#endif } if (!m_isPublic.isLoaded()) @@ -282,10 +337,28 @@ bool ServerBuildingObjectTemplate::getIsPublic() const } bool value = m_isPublic.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerBuildingObjectTemplate::getIsPublic +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void ServerBuildingObjectTemplate::testValues(void) const +{ + IGNORE_RETURN(getMaintenanceCostMin(true)); + IGNORE_RETURN(getMaintenanceCostMax(true)); + IGNORE_RETURN(getIsPublic(true)); + ServerTangibleObjectTemplate::testValues(); +} // ServerBuildingObjectTemplate::testValues +#endif + /** * Loads the template data from an iff file. We should already be in the form * for this template. @@ -294,8 +367,8 @@ bool ServerBuildingObjectTemplate::getIsPublic() const */ void ServerBuildingObjectTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != ServerBuildingObjectTemplate_tag) { @@ -305,7 +378,7 @@ void ServerBuildingObjectTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -325,8 +398,10 @@ void ServerBuildingObjectTemplate::load(Iff &file) file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 0, 1)) + if (getHighestTemplateVersion() != TAG(0,0,0,1)) { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); m_versionOk = false; } @@ -352,4 +427,4 @@ void ServerBuildingObjectTemplate::load(Iff &file) return; } // ServerBuildingObjectTemplate::load -//@END TFD \ No newline at end of file +//@END TFD diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerBuildingObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerBuildingObjectTemplate.h old mode 100755 new mode 100644 index 6e07d836..7ae6150d --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerBuildingObjectTemplate.h +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerBuildingObjectTemplate.h @@ -44,11 +44,16 @@ public: //@BEGIN TFD public: - int getMaintenanceCost() const; - int getMaintenanceCostMin() const; - int getMaintenanceCostMax() const; - bool getIsPublic() const; + int getMaintenanceCost(bool testData = false) const; + int getMaintenanceCostMin(bool testData = false) const; + int getMaintenanceCostMax(bool testData = false) const; + bool getIsPublic(bool testData = false) const; +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerCellObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerCellObjectTemplate.cpp old mode 100755 new mode 100644 index 3690c159..4375717f --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerCellObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerCellObjectTemplate.cpp @@ -22,20 +22,20 @@ const std::string DefaultString(""); const StringId DefaultStringId("", 0); -const Vector DefaultVector(0, 0, 0); +const Vector DefaultVector(0,0,0); const TriggerVolumeData DefaultTriggerVolumeData; bool ServerCellObjectTemplate::ms_allowDefaultTemplateParams = true; + /** * Class constructor. */ ServerCellObjectTemplate::ServerCellObjectTemplate(const std::string & filename) //@BEGIN TFD INIT : ServerObjectTemplate(filename) - , m_versionOk(true) - , m_templateVersion(0) - //@END TFD INIT + ,m_versionOk(true) +//@END TFD INIT { } // ServerCellObjectTemplate::ServerCellObjectTemplate @@ -46,12 +46,12 @@ ServerCellObjectTemplate::~ServerCellObjectTemplate() { if (m_baseData) { - DEBUG_REPORT_LOG(true, ("Released m_baseData.\n")); + DEBUG_REPORT_LOG(true,("Released m_baseData.\n")); m_baseData->releaseReference(); - m_baseData = 0; + m_baseData=0; } - //@BEGIN TFD CLEANUP - //@END TFD CLEANUP +//@BEGIN TFD CLEANUP +//@END TFD CLEANUP } // ServerCellObjectTemplate::~ServerCellObjectTemplate /** @@ -99,10 +99,10 @@ Tag ServerCellObjectTemplate::getTemplateVersion(void) const */ Tag ServerCellObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerCellObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerCellObjectTemplate::getHighestTemplateVersion @@ -118,6 +118,15 @@ Object * ServerCellObjectTemplate::createObject(void) const } // ServerCellObjectTemplate::createObject //@BEGIN TFD +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void ServerCellObjectTemplate::testValues(void) const +{ + ServerObjectTemplate::testValues(); +} // ServerCellObjectTemplate::testValues +#endif /** * Loads the template data from an iff file. We should already be in the form @@ -127,8 +136,8 @@ Object * ServerCellObjectTemplate::createObject(void) const */ void ServerCellObjectTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != ServerCellObjectTemplate_tag) { @@ -138,7 +147,7 @@ void ServerCellObjectTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -158,8 +167,10 @@ void ServerCellObjectTemplate::load(Iff &file) file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 0, 0)) + if (getHighestTemplateVersion() != TAG(0,0,0,0)) { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); m_versionOk = false; } @@ -177,4 +188,4 @@ void ServerCellObjectTemplate::load(Iff &file) return; } // ServerCellObjectTemplate::load -//@END TFD \ No newline at end of file +//@END TFD diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerCellObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerCellObjectTemplate.h old mode 100755 new mode 100644 index 8e52800f..4af0214f --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerCellObjectTemplate.h +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerCellObjectTemplate.h @@ -45,6 +45,11 @@ public: //@BEGIN TFD public: +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerCityObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerCityObjectTemplate.cpp old mode 100755 new mode 100644 index 6cf2743f..56a81fd8 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerCityObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerCityObjectTemplate.cpp @@ -24,20 +24,20 @@ const std::string DefaultString(""); const StringId DefaultStringId("", 0); -const Vector DefaultVector(0, 0, 0); +const Vector DefaultVector(0,0,0); const TriggerVolumeData DefaultTriggerVolumeData; bool ServerCityObjectTemplate::ms_allowDefaultTemplateParams = true; + /** * Class constructor. */ ServerCityObjectTemplate::ServerCityObjectTemplate(const std::string & filename) //@BEGIN TFD INIT : ServerUniverseObjectTemplate(filename) - , m_versionOk(true) - , m_templateVersion(0) - //@END TFD INIT + ,m_versionOk(true) +//@END TFD INIT { } // ServerCityObjectTemplate::ServerCityObjectTemplate @@ -46,8 +46,8 @@ ServerCityObjectTemplate::ServerCityObjectTemplate(const std::string & filename) */ ServerCityObjectTemplate::~ServerCityObjectTemplate() { - //@BEGIN TFD CLEANUP - //@END TFD CLEANUP +//@BEGIN TFD CLEANUP +//@END TFD CLEANUP } // ServerCityObjectTemplate::~ServerCityObjectTemplate /** @@ -95,10 +95,10 @@ Tag ServerCityObjectTemplate::getTemplateVersion(void) const */ Tag ServerCityObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerCityObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerCityObjectTemplate::getHighestTemplateVersion @@ -114,6 +114,15 @@ Object * ServerCityObjectTemplate::createObject(void) const } // ServerCityObjectTemplate::createObject //@BEGIN TFD +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void ServerCityObjectTemplate::testValues(void) const +{ + ServerUniverseObjectTemplate::testValues(); +} // ServerCityObjectTemplate::testValues +#endif /** * Loads the template data from an iff file. We should already be in the form @@ -123,8 +132,8 @@ Object * ServerCityObjectTemplate::createObject(void) const */ void ServerCityObjectTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != ServerCityObjectTemplate_tag) { @@ -134,7 +143,7 @@ void ServerCityObjectTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -154,8 +163,10 @@ void ServerCityObjectTemplate::load(Iff &file) file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 0, 0)) + if (getHighestTemplateVersion() != TAG(0,0,0,0)) { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); m_versionOk = false; } @@ -173,4 +184,4 @@ void ServerCityObjectTemplate::load(Iff &file) return; } // ServerCityObjectTemplate::load -//@END TFD \ No newline at end of file +//@END TFD diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerCityObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerCityObjectTemplate.h old mode 100755 new mode 100644 index e656014c..3056b960 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerCityObjectTemplate.h +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerCityObjectTemplate.h @@ -45,6 +45,11 @@ public: //@BEGIN TFD public: +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerConstructionContractObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerConstructionContractObjectTemplate.cpp old mode 100755 new mode 100644 index 40fccb9d..e11b6ce7 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerConstructionContractObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerConstructionContractObjectTemplate.cpp @@ -18,25 +18,24 @@ #include "sharedObject/ObjectTemplateList.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS -#include -#include +#include const std::string DefaultString(""); const StringId DefaultStringId("", 0); -const Vector DefaultVector(0, 0, 0); +const Vector DefaultVector(0,0,0); const TriggerVolumeData DefaultTriggerVolumeData; bool ServerConstructionContractObjectTemplate::ms_allowDefaultTemplateParams = true; + /** * Class constructor. */ ServerConstructionContractObjectTemplate::ServerConstructionContractObjectTemplate(const std::string & filename) //@BEGIN TFD INIT : ServerIntangibleObjectTemplate(filename) - , m_versionOk(true) - , m_templateVersion(0) - //@END TFD INIT + ,m_versionOk(true) +//@END TFD INIT { } // ServerConstructionContractObjectTemplate::ServerConstructionContractObjectTemplate @@ -45,8 +44,8 @@ ServerConstructionContractObjectTemplate::ServerConstructionContractObjectTempla */ ServerConstructionContractObjectTemplate::~ServerConstructionContractObjectTemplate() { - //@BEGIN TFD CLEANUP - //@END TFD CLEANUP +//@BEGIN TFD CLEANUP +//@END TFD CLEANUP } // ServerConstructionContractObjectTemplate::~ServerConstructionContractObjectTemplate /** @@ -84,10 +83,10 @@ Tag ServerConstructionContractObjectTemplate::getTemplateVersion(void) const */ Tag ServerConstructionContractObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerConstructionContractObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerConstructionContractObjectTemplate::getHighestTemplateVersion @@ -103,6 +102,15 @@ Tag ServerConstructionContractObjectTemplate::getId(void) const } // ServerConstructionContractObjectTemplate::getId //@BEGIN TFD +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void ServerConstructionContractObjectTemplate::testValues(void) const +{ + ServerIntangibleObjectTemplate::testValues(); +} // ServerConstructionContractObjectTemplate::testValues +#endif /** * Loads the template data from an iff file. We should already be in the form @@ -112,8 +120,8 @@ Tag ServerConstructionContractObjectTemplate::getId(void) const */ void ServerConstructionContractObjectTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != ServerConstructionContractObjectTemplate_tag) { @@ -123,7 +131,7 @@ void ServerConstructionContractObjectTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -143,8 +151,10 @@ void ServerConstructionContractObjectTemplate::load(Iff &file) file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 0, 0)) + if (getHighestTemplateVersion() != TAG(0,0,0,0)) { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); m_versionOk = false; } @@ -162,4 +172,4 @@ void ServerConstructionContractObjectTemplate::load(Iff &file) return; } // ServerConstructionContractObjectTemplate::load -//@END TFD \ No newline at end of file +//@END TFD diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerConstructionContractObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerConstructionContractObjectTemplate.h old mode 100755 new mode 100644 index 3efa0d06..b14da90b --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerConstructionContractObjectTemplate.h +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerConstructionContractObjectTemplate.h @@ -45,6 +45,11 @@ public: //@BEGIN TFD public: +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerCreatureObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerCreatureObjectTemplate.cpp old mode 100755 new mode 100644 index 37e95c27..afc3dcdc --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerCreatureObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerCreatureObjectTemplate.cpp @@ -26,22 +26,22 @@ const std::string DefaultString(""); const StringId DefaultStringId("", 0); -const Vector DefaultVector(0, 0, 0); +const Vector DefaultVector(0,0,0); const TriggerVolumeData DefaultTriggerVolumeData; bool ServerCreatureObjectTemplate::ms_allowDefaultTemplateParams = true; + /** * Class constructor. */ ServerCreatureObjectTemplate::ServerCreatureObjectTemplate(const std::string & filename) //@BEGIN TFD INIT : ServerTangibleObjectTemplate(filename) - , m_attribModsLoaded(false) - , m_attribModsAppend(false) - , m_versionOk(true) - , m_templateVersion(0) - //@END TFD INIT + ,m_attribModsLoaded(false) + ,m_attribModsAppend(false) + ,m_versionOk(true) +//@END TFD INIT { } // ServerCreatureObjectTemplate::ServerCreatureObjectTemplate @@ -50,7 +50,7 @@ ServerCreatureObjectTemplate::ServerCreatureObjectTemplate(const std::string & f */ ServerCreatureObjectTemplate::~ServerCreatureObjectTemplate() { - //@BEGIN TFD CLEANUP +//@BEGIN TFD CLEANUP { std::vector::iterator iter; for (iter = m_attribMods.begin(); iter != m_attribMods.end(); ++iter) @@ -60,7 +60,7 @@ ServerCreatureObjectTemplate::~ServerCreatureObjectTemplate() } m_attribMods.clear(); } - //@END TFD CLEANUP +//@END TFD CLEANUP } // ServerCreatureObjectTemplate::~ServerCreatureObjectTemplate /** @@ -108,10 +108,10 @@ Tag ServerCreatureObjectTemplate::getTemplateVersion(void) const */ Tag ServerCreatureObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerCreatureObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerCreatureObjectTemplate::getHighestTemplateVersion @@ -155,7 +155,7 @@ const ServerWeaponObjectTemplate * ServerCreatureObjectTemplate::getDefaultWeapo { returnValue = dynamic_cast(ObjectTemplateList::fetch(templateName)); if (returnValue == nullptr) - WARNING_STRICT_FATAL(true, ("Error loading template %s", templateName.c_str())); + WARNING_STRICT_FATAL(true, ("Error loading template %s",templateName.c_str())); } return returnValue; } // ServerCreatureObjectTemplate::getDefaultWeapon @@ -168,7 +168,7 @@ int ServerCreatureObjectTemplate::getAttributes(Attributes index) const base = dynamic_cast(m_baseData); } - DEBUG_FATAL(static_cast(index) < 0 || static_cast(index) >= 6, ("template param static_cast(index) = 6, ("template param index out of range")); if (!m_attributes[index].isLoaded()) { if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) @@ -217,7 +217,7 @@ int ServerCreatureObjectTemplate::getAttributesMin(Attributes index) const base = dynamic_cast(m_baseData); } - DEBUG_FATAL(static_cast(index) < 0 || static_cast(index) >= 6, ("template param static_cast(index) = 6, ("template param index out of range")); if (!m_attributes[index].isLoaded()) { if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) @@ -266,7 +266,7 @@ int ServerCreatureObjectTemplate::getAttributesMax(Attributes index) const base = dynamic_cast(m_baseData); } - DEBUG_FATAL(static_cast(index) < 0 || static_cast(index) >= 6, ("template param static_cast(index) = 6, ("template param index out of range")); if (!m_attributes[index].isLoaded()) { if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) @@ -315,7 +315,7 @@ int ServerCreatureObjectTemplate::getMinAttributes(Attributes index) const base = dynamic_cast(m_baseData); } - DEBUG_FATAL(static_cast(index) < 0 || static_cast(index) >= 6, ("template param static_cast(index) = 6, ("template param index out of range")); if (!m_minAttributes[index].isLoaded()) { if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) @@ -364,7 +364,7 @@ int ServerCreatureObjectTemplate::getMinAttributesMin(Attributes index) const base = dynamic_cast(m_baseData); } - DEBUG_FATAL(static_cast(index) < 0 || static_cast(index) >= 6, ("template param static_cast(index) = 6, ("template param index out of range")); if (!m_minAttributes[index].isLoaded()) { if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) @@ -413,7 +413,7 @@ int ServerCreatureObjectTemplate::getMinAttributesMax(Attributes index) const base = dynamic_cast(m_baseData); } - DEBUG_FATAL(static_cast(index) < 0 || static_cast(index) >= 6, ("template param static_cast(index) = 6, ("template param index out of range")); if (!m_minAttributes[index].isLoaded()) { if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) @@ -462,7 +462,7 @@ int ServerCreatureObjectTemplate::getMaxAttributes(Attributes index) const base = dynamic_cast(m_baseData); } - DEBUG_FATAL(static_cast(index) < 0 || static_cast(index) >= 6, ("template param static_cast(index) = 6, ("template param index out of range")); if (!m_maxAttributes[index].isLoaded()) { if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) @@ -511,7 +511,7 @@ int ServerCreatureObjectTemplate::getMaxAttributesMin(Attributes index) const base = dynamic_cast(m_baseData); } - DEBUG_FATAL(static_cast(index) < 0 || static_cast(index) >= 6, ("template param static_cast(index) = 6, ("template param index out of range")); if (!m_maxAttributes[index].isLoaded()) { if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) @@ -560,7 +560,7 @@ int ServerCreatureObjectTemplate::getMaxAttributesMax(Attributes index) const base = dynamic_cast(m_baseData); } - DEBUG_FATAL(static_cast(index) < 0 || static_cast(index) >= 6, ("template param static_cast(index) = 6, ("template param index out of range")); if (!m_maxAttributes[index].isLoaded()) { if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) @@ -601,12 +601,22 @@ int ServerCreatureObjectTemplate::getMaxAttributesMax(Attributes index) const return value; } // ServerCreatureObjectTemplate::getMaxAttributesMax -float ServerCreatureObjectTemplate::getMinDrainModifier() const +float ServerCreatureObjectTemplate::getMinDrainModifier(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerCreatureObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getMinDrainModifier(true); +#endif } if (!m_minDrainModifier.isLoaded()) @@ -646,16 +656,31 @@ float ServerCreatureObjectTemplate::getMinDrainModifier() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerCreatureObjectTemplate::getMinDrainModifier -float ServerCreatureObjectTemplate::getMinDrainModifierMin() const +float ServerCreatureObjectTemplate::getMinDrainModifierMin(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerCreatureObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getMinDrainModifierMin(true); +#endif } if (!m_minDrainModifier.isLoaded()) @@ -695,16 +720,31 @@ float ServerCreatureObjectTemplate::getMinDrainModifierMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerCreatureObjectTemplate::getMinDrainModifierMin -float ServerCreatureObjectTemplate::getMinDrainModifierMax() const +float ServerCreatureObjectTemplate::getMinDrainModifierMax(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerCreatureObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getMinDrainModifierMax(true); +#endif } if (!m_minDrainModifier.isLoaded()) @@ -744,16 +784,31 @@ float ServerCreatureObjectTemplate::getMinDrainModifierMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerCreatureObjectTemplate::getMinDrainModifierMax -float ServerCreatureObjectTemplate::getMaxDrainModifier() const +float ServerCreatureObjectTemplate::getMaxDrainModifier(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerCreatureObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getMaxDrainModifier(true); +#endif } if (!m_maxDrainModifier.isLoaded()) @@ -793,16 +848,31 @@ float ServerCreatureObjectTemplate::getMaxDrainModifier() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerCreatureObjectTemplate::getMaxDrainModifier -float ServerCreatureObjectTemplate::getMaxDrainModifierMin() const +float ServerCreatureObjectTemplate::getMaxDrainModifierMin(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerCreatureObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getMaxDrainModifierMin(true); +#endif } if (!m_maxDrainModifier.isLoaded()) @@ -842,16 +912,31 @@ float ServerCreatureObjectTemplate::getMaxDrainModifierMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerCreatureObjectTemplate::getMaxDrainModifierMin -float ServerCreatureObjectTemplate::getMaxDrainModifierMax() const +float ServerCreatureObjectTemplate::getMaxDrainModifierMax(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerCreatureObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getMaxDrainModifierMax(true); +#endif } if (!m_maxDrainModifier.isLoaded()) @@ -891,16 +976,31 @@ float ServerCreatureObjectTemplate::getMaxDrainModifierMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerCreatureObjectTemplate::getMaxDrainModifierMax -float ServerCreatureObjectTemplate::getMinFaucetModifier() const +float ServerCreatureObjectTemplate::getMinFaucetModifier(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerCreatureObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getMinFaucetModifier(true); +#endif } if (!m_minFaucetModifier.isLoaded()) @@ -940,16 +1040,31 @@ float ServerCreatureObjectTemplate::getMinFaucetModifier() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerCreatureObjectTemplate::getMinFaucetModifier -float ServerCreatureObjectTemplate::getMinFaucetModifierMin() const +float ServerCreatureObjectTemplate::getMinFaucetModifierMin(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerCreatureObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getMinFaucetModifierMin(true); +#endif } if (!m_minFaucetModifier.isLoaded()) @@ -989,16 +1104,31 @@ float ServerCreatureObjectTemplate::getMinFaucetModifierMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerCreatureObjectTemplate::getMinFaucetModifierMin -float ServerCreatureObjectTemplate::getMinFaucetModifierMax() const +float ServerCreatureObjectTemplate::getMinFaucetModifierMax(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerCreatureObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getMinFaucetModifierMax(true); +#endif } if (!m_minFaucetModifier.isLoaded()) @@ -1038,16 +1168,31 @@ float ServerCreatureObjectTemplate::getMinFaucetModifierMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerCreatureObjectTemplate::getMinFaucetModifierMax -float ServerCreatureObjectTemplate::getMaxFaucetModifier() const +float ServerCreatureObjectTemplate::getMaxFaucetModifier(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerCreatureObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getMaxFaucetModifier(true); +#endif } if (!m_maxFaucetModifier.isLoaded()) @@ -1087,16 +1232,31 @@ float ServerCreatureObjectTemplate::getMaxFaucetModifier() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerCreatureObjectTemplate::getMaxFaucetModifier -float ServerCreatureObjectTemplate::getMaxFaucetModifierMin() const +float ServerCreatureObjectTemplate::getMaxFaucetModifierMin(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerCreatureObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getMaxFaucetModifierMin(true); +#endif } if (!m_maxFaucetModifier.isLoaded()) @@ -1136,16 +1296,31 @@ float ServerCreatureObjectTemplate::getMaxFaucetModifierMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerCreatureObjectTemplate::getMaxFaucetModifierMin -float ServerCreatureObjectTemplate::getMaxFaucetModifierMax() const +float ServerCreatureObjectTemplate::getMaxFaucetModifierMax(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerCreatureObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getMaxFaucetModifierMax(true); +#endif } if (!m_maxFaucetModifier.isLoaded()) @@ -1185,6 +1360,11 @@ float ServerCreatureObjectTemplate::getMaxFaucetModifierMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerCreatureObjectTemplate::getMaxFaucetModifierMax @@ -1202,7 +1382,7 @@ void ServerCreatureObjectTemplate::getAttribMods(AttribMod &data, int index) con if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter attribMods in template %s", DataResource::getName())); - return; + return ; } else { @@ -1215,15 +1395,15 @@ void ServerCreatureObjectTemplate::getAttribMods(AttribMod &data, int index) con if (m_attribModsAppend && base != nullptr) { int baseCount = base->getAttribModsCount(); - if (static_cast(index) < baseCount) - { - base->getAttribMods(data, index); - return; - } + if (index < baseCount) + { + base->getAttribMods(data, index); + return; + } index -= baseCount; } - DEBUG_FATAL(static_cast(index) < 0 || static_cast(index) >= m_attribMods.size(), ("template param static_cast(index) (index) >= m_attribMods.size(), ("template param index out of range")); const ObjectTemplate * structTemplate = (*m_attribMods[index]).getValue(); NOT_NULL(structTemplate); const _AttribMod *param = dynamic_cast(structTemplate); @@ -1248,7 +1428,7 @@ void ServerCreatureObjectTemplate::getAttribModsMin(AttribMod &data, int index) if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter attribMods in template %s", DataResource::getName())); - return; + return ; } else { @@ -1261,15 +1441,15 @@ void ServerCreatureObjectTemplate::getAttribModsMin(AttribMod &data, int index) if (m_attribModsAppend && base != nullptr) { int baseCount = base->getAttribModsCount(); - if (static_cast(index) < baseCount) - { - base->getAttribModsMin(data, index); - return; - } + if (index < baseCount) + { + base->getAttribModsMin(data, index); + return; + } index -= baseCount; } - DEBUG_FATAL(static_cast(index) < 0 || static_cast(index) >= m_attribMods.size(), ("template param static_cast(index) (index) >= m_attribMods.size(), ("template param index out of range")); const ObjectTemplate * structTemplate = (*m_attribMods[index]).getValue(); NOT_NULL(structTemplate); const _AttribMod *param = dynamic_cast(structTemplate); @@ -1294,7 +1474,7 @@ void ServerCreatureObjectTemplate::getAttribModsMax(AttribMod &data, int index) if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter attribMods in template %s", DataResource::getName())); - return; + return ; } else { @@ -1307,15 +1487,15 @@ void ServerCreatureObjectTemplate::getAttribModsMax(AttribMod &data, int index) if (m_attribModsAppend && base != nullptr) { int baseCount = base->getAttribModsCount(); - if (static_cast(index) < baseCount) - { - base->getAttribModsMax(data, index); - return; - } + if (index < baseCount) + { + base->getAttribModsMax(data, index); + return; + } index -= baseCount; } - DEBUG_FATAL(static_cast(index) < 0 || static_cast(index) >= m_attribMods.size(), ("template param static_cast(index) (index) >= m_attribMods.size(), ("template param index out of range")); const ObjectTemplate * structTemplate = (*m_attribMods[index]).getValue(); NOT_NULL(structTemplate); const _AttribMod *param = dynamic_cast(structTemplate); @@ -1351,12 +1531,22 @@ size_t ServerCreatureObjectTemplate::getAttribModsCount(void) const return count; } // ServerCreatureObjectTemplate::getAttribModsCount -int ServerCreatureObjectTemplate::getShockWounds() const +int ServerCreatureObjectTemplate::getShockWounds(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerCreatureObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getShockWounds(true); +#endif } if (!m_shockWounds.isLoaded()) @@ -1396,16 +1586,31 @@ int ServerCreatureObjectTemplate::getShockWounds() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerCreatureObjectTemplate::getShockWounds -int ServerCreatureObjectTemplate::getShockWoundsMin() const +int ServerCreatureObjectTemplate::getShockWoundsMin(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerCreatureObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getShockWoundsMin(true); +#endif } if (!m_shockWounds.isLoaded()) @@ -1445,16 +1650,31 @@ int ServerCreatureObjectTemplate::getShockWoundsMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerCreatureObjectTemplate::getShockWoundsMin -int ServerCreatureObjectTemplate::getShockWoundsMax() const +int ServerCreatureObjectTemplate::getShockWoundsMax(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerCreatureObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getShockWoundsMax(true); +#endif } if (!m_shockWounds.isLoaded()) @@ -1494,16 +1714,31 @@ int ServerCreatureObjectTemplate::getShockWoundsMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerCreatureObjectTemplate::getShockWoundsMax -bool ServerCreatureObjectTemplate::getCanCreateAvatar() const +bool ServerCreatureObjectTemplate::getCanCreateAvatar(bool testData) const { +#ifdef _DEBUG +bool testDataValue = false; +#else +UNREF(testData); +#endif + const ServerCreatureObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getCanCreateAvatar(true); +#endif } if (!m_canCreateAvatar.isLoaded()) @@ -1521,16 +1756,31 @@ bool ServerCreatureObjectTemplate::getCanCreateAvatar() const } bool value = m_canCreateAvatar.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerCreatureObjectTemplate::getCanCreateAvatar -const std::string & ServerCreatureObjectTemplate::getNameGeneratorType() const +const std::string & ServerCreatureObjectTemplate::getNameGeneratorType(bool testData) const { +#ifdef _DEBUG +std::string testDataValue = DefaultString; +#else +UNREF(testData); +#endif + const ServerCreatureObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getNameGeneratorType(true); +#endif } if (!m_nameGeneratorType.isLoaded()) @@ -1548,16 +1798,31 @@ const std::string & ServerCreatureObjectTemplate::getNameGeneratorType() const } const std::string & value = m_nameGeneratorType.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerCreatureObjectTemplate::getNameGeneratorType -float ServerCreatureObjectTemplate::getApproachTriggerRange() const +float ServerCreatureObjectTemplate::getApproachTriggerRange(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerCreatureObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getApproachTriggerRange(true); +#endif } if (!m_approachTriggerRange.isLoaded()) @@ -1597,16 +1862,31 @@ float ServerCreatureObjectTemplate::getApproachTriggerRange() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerCreatureObjectTemplate::getApproachTriggerRange -float ServerCreatureObjectTemplate::getApproachTriggerRangeMin() const +float ServerCreatureObjectTemplate::getApproachTriggerRangeMin(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerCreatureObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getApproachTriggerRangeMin(true); +#endif } if (!m_approachTriggerRange.isLoaded()) @@ -1646,16 +1926,31 @@ float ServerCreatureObjectTemplate::getApproachTriggerRangeMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerCreatureObjectTemplate::getApproachTriggerRangeMin -float ServerCreatureObjectTemplate::getApproachTriggerRangeMax() const +float ServerCreatureObjectTemplate::getApproachTriggerRangeMax(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerCreatureObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getApproachTriggerRangeMax(true); +#endif } if (!m_approachTriggerRange.isLoaded()) @@ -1695,6 +1990,11 @@ float ServerCreatureObjectTemplate::getApproachTriggerRangeMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerCreatureObjectTemplate::getApproachTriggerRangeMax @@ -1707,7 +2007,7 @@ float ServerCreatureObjectTemplate::getMaxMentalStates(MentalStates index) const base = dynamic_cast(m_baseData); } - DEBUG_FATAL(static_cast(index) < 0 || static_cast(index) >= 4, ("template param static_cast(index) = 4, ("template param index out of range")); if (!m_maxMentalStates[index].isLoaded()) { if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) @@ -1756,7 +2056,7 @@ float ServerCreatureObjectTemplate::getMaxMentalStatesMin(MentalStates index) co base = dynamic_cast(m_baseData); } - DEBUG_FATAL(static_cast(index) < 0 || static_cast(index) >= 4, ("template param static_cast(index) = 4, ("template param index out of range")); if (!m_maxMentalStates[index].isLoaded()) { if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) @@ -1805,7 +2105,7 @@ float ServerCreatureObjectTemplate::getMaxMentalStatesMax(MentalStates index) co base = dynamic_cast(m_baseData); } - DEBUG_FATAL(static_cast(index) < 0 || static_cast(index) >= 4, ("template param static_cast(index) = 4, ("template param index out of range")); if (!m_maxMentalStates[index].isLoaded()) { if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) @@ -1854,7 +2154,7 @@ float ServerCreatureObjectTemplate::getMentalStatesDecay(MentalStates index) con base = dynamic_cast(m_baseData); } - DEBUG_FATAL(static_cast(index) < 0 || static_cast(index) >= 4, ("template param static_cast(index) = 4, ("template param index out of range")); if (!m_mentalStatesDecay[index].isLoaded()) { if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) @@ -1903,7 +2203,7 @@ float ServerCreatureObjectTemplate::getMentalStatesDecayMin(MentalStates index) base = dynamic_cast(m_baseData); } - DEBUG_FATAL(static_cast(index) < 0 || static_cast(index) >= 4, ("template param static_cast(index) = 4, ("template param index out of range")); if (!m_mentalStatesDecay[index].isLoaded()) { if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) @@ -1952,7 +2252,7 @@ float ServerCreatureObjectTemplate::getMentalStatesDecayMax(MentalStates index) base = dynamic_cast(m_baseData); } - DEBUG_FATAL(static_cast(index) < 0 || static_cast(index) >= 4, ("template param static_cast(index) = 4, ("template param index out of range")); if (!m_mentalStatesDecay[index].isLoaded()) { if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) @@ -1993,6 +2293,30 @@ float ServerCreatureObjectTemplate::getMentalStatesDecayMax(MentalStates index) return value; } // ServerCreatureObjectTemplate::getMentalStatesDecayMax +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void ServerCreatureObjectTemplate::testValues(void) const +{ + IGNORE_RETURN(getMinDrainModifierMin(true)); + IGNORE_RETURN(getMinDrainModifierMax(true)); + IGNORE_RETURN(getMaxDrainModifierMin(true)); + IGNORE_RETURN(getMaxDrainModifierMax(true)); + IGNORE_RETURN(getMinFaucetModifierMin(true)); + IGNORE_RETURN(getMinFaucetModifierMax(true)); + IGNORE_RETURN(getMaxFaucetModifierMin(true)); + IGNORE_RETURN(getMaxFaucetModifierMax(true)); + IGNORE_RETURN(getShockWoundsMin(true)); + IGNORE_RETURN(getShockWoundsMax(true)); + IGNORE_RETURN(getCanCreateAvatar(true)); + IGNORE_RETURN(getNameGeneratorType(true)); + IGNORE_RETURN(getApproachTriggerRangeMin(true)); + IGNORE_RETURN(getApproachTriggerRangeMax(true)); + ServerTangibleObjectTemplate::testValues(); +} // ServerCreatureObjectTemplate::testValues +#endif + /** * Loads the template data from an iff file. We should already be in the form * for this template. @@ -2001,8 +2325,8 @@ float ServerCreatureObjectTemplate::getMentalStatesDecayMax(MentalStates index) */ void ServerCreatureObjectTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != ServerCreatureObjectTemplate_tag) { @@ -2012,7 +2336,7 @@ void ServerCreatureObjectTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -2032,8 +2356,10 @@ void ServerCreatureObjectTemplate::load(Iff &file) file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 0, 5)) + if (getHighestTemplateVersion() != TAG(0,0,0,5)) { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); m_versionOk = false; } @@ -2183,4 +2509,4 @@ const StringId &ServerCreatureObjectTemplate::verifyName(const Unicode::String & void ServerCreatureObjectTemplate::postLoad() { ServerTangibleObjectTemplate::postLoad(); -} \ No newline at end of file +} diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerCreatureObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerCreatureObjectTemplate.h old mode 100755 new mode 100644 index e45a6249..17478495 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerCreatureObjectTemplate.h +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerCreatureObjectTemplate.h @@ -70,30 +70,30 @@ public: int getMaxAttributes(Attributes index) const; int getMaxAttributesMin(Attributes index) const; int getMaxAttributesMax(Attributes index) const; - float getMinDrainModifier() const; - float getMinDrainModifierMin() const; - float getMinDrainModifierMax() const; - float getMaxDrainModifier() const; - float getMaxDrainModifierMin() const; - float getMaxDrainModifierMax() const; - float getMinFaucetModifier() const; - float getMinFaucetModifierMin() const; - float getMinFaucetModifierMax() const; - float getMaxFaucetModifier() const; - float getMaxFaucetModifierMin() const; - float getMaxFaucetModifierMax() const; + float getMinDrainModifier(bool testData = false) const; + float getMinDrainModifierMin(bool testData = false) const; + float getMinDrainModifierMax(bool testData = false) const; + float getMaxDrainModifier(bool testData = false) const; + float getMaxDrainModifierMin(bool testData = false) const; + float getMaxDrainModifierMax(bool testData = false) const; + float getMinFaucetModifier(bool testData = false) const; + float getMinFaucetModifierMin(bool testData = false) const; + float getMinFaucetModifierMax(bool testData = false) const; + float getMaxFaucetModifier(bool testData = false) const; + float getMaxFaucetModifierMin(bool testData = false) const; + float getMaxFaucetModifierMax(bool testData = false) const; void getAttribMods(AttribMod &data, int index) const; void getAttribModsMin(AttribMod &data, int index) const; void getAttribModsMax(AttribMod &data, int index) const; size_t getAttribModsCount(void) const; - int getShockWounds() const; - int getShockWoundsMin() const; - int getShockWoundsMax() const; - bool getCanCreateAvatar() const; - const std::string & getNameGeneratorType() const; - float getApproachTriggerRange() const; - float getApproachTriggerRangeMin() const; - float getApproachTriggerRangeMax() const; + int getShockWounds(bool testData = false) const; + int getShockWoundsMin(bool testData = false) const; + int getShockWoundsMax(bool testData = false) const; + bool getCanCreateAvatar(bool testData = false) const; + const std::string & getNameGeneratorType(bool testData = false) const; + float getApproachTriggerRange(bool testData = false) const; + float getApproachTriggerRangeMin(bool testData = false) const; + float getApproachTriggerRangeMax(bool testData = false) const; float getMaxMentalStates(MentalStates index) const; float getMaxMentalStatesMin(MentalStates index) const; float getMaxMentalStatesMax(MentalStates index) const; @@ -101,6 +101,11 @@ public: float getMentalStatesDecayMin(MentalStates index) const; float getMentalStatesDecayMax(MentalStates index) const; +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerDraftSchematicObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerDraftSchematicObjectTemplate.cpp old mode 100755 new mode 100644 index 5d8a2fc9..80d70837 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerDraftSchematicObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerDraftSchematicObjectTemplate.cpp @@ -24,26 +24,26 @@ const std::string DefaultString(""); const StringId DefaultStringId("", 0); -const Vector DefaultVector(0, 0, 0); +const Vector DefaultVector(0,0,0); const TriggerVolumeData DefaultTriggerVolumeData; bool ServerDraftSchematicObjectTemplate::ms_allowDefaultTemplateParams = true; + /** * Class constructor. */ ServerDraftSchematicObjectTemplate::ServerDraftSchematicObjectTemplate(const std::string & filename) //@BEGIN TFD INIT : ServerIntangibleObjectTemplate(filename) - , m_slotsLoaded(false) - , m_slotsAppend(false) - , m_skillCommandsLoaded(false) - , m_skillCommandsAppend(false) - , m_manufactureScriptsLoaded(false) - , m_manufactureScriptsAppend(false) - , m_versionOk(true) - , m_templateVersion(0) - //@END TFD INIT + ,m_slotsLoaded(false) + ,m_slotsAppend(false) + ,m_skillCommandsLoaded(false) + ,m_skillCommandsAppend(false) + ,m_manufactureScriptsLoaded(false) + ,m_manufactureScriptsAppend(false) + ,m_versionOk(true) +//@END TFD INIT { } // ServerDraftSchematicObjectTemplate::ServerDraftSchematicObjectTemplate @@ -52,7 +52,7 @@ ServerDraftSchematicObjectTemplate::ServerDraftSchematicObjectTemplate(const std */ ServerDraftSchematicObjectTemplate::~ServerDraftSchematicObjectTemplate() { - //@BEGIN TFD CLEANUP +//@BEGIN TFD CLEANUP { std::vector::iterator iter; for (iter = m_slots.begin(); iter != m_slots.end(); ++iter) @@ -80,7 +80,7 @@ ServerDraftSchematicObjectTemplate::~ServerDraftSchematicObjectTemplate() } m_manufactureScripts.clear(); } - //@END TFD CLEANUP +//@END TFD CLEANUP } // ServerDraftSchematicObjectTemplate::~ServerDraftSchematicObjectTemplate /** @@ -128,10 +128,10 @@ Tag ServerDraftSchematicObjectTemplate::getTemplateVersion(void) const */ Tag ServerDraftSchematicObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerDraftSchematicObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerDraftSchematicObjectTemplate::getHighestTemplateVersion @@ -143,26 +143,59 @@ Tag ServerDraftSchematicObjectTemplate::getHighestTemplateVersion(void) const */ Object * ServerDraftSchematicObjectTemplate::createObject(void) const { +#ifdef _DEBUG + if (DataLint::isEnabled()) + { + return new DraftSchematicObject(this); + } +#endif + WARNING(true, ("Trying to create a draft schematic %s outside the draft " "schematic factory!\n", getName())); - return nullptr; + return NULL; } // ServerDraftSchematicObjectTemplate::createObject /** - * Called after the template data has been loaded. Verifies that the schematic has + * Called after the template data has been loaded. Verifies that the schematic has * good data. */ void ServerDraftSchematicObjectTemplate::postLoad() { +#ifdef _DEBUG + // verify that all slot names are unique + std::set slotNames; + + IngredientSlot data; + int count = getSlotsCount(); + for (int i = 0; i < count; ++i) + { + getSlots(data, i); + if (slotNames.insert(data.name.getText()).second == false) + { + WARNING(true, ("Draft schematic %s has duplicate slot name %s", + getName(), data.name.getText().c_str())); + } + } +#endif } // ServerDraftSchematicObjectTemplate::postLoad //@BEGIN TFD -ServerDraftSchematicObjectTemplate::CraftingType ServerDraftSchematicObjectTemplate::getCategory() const +ServerDraftSchematicObjectTemplate::CraftingType ServerDraftSchematicObjectTemplate::getCategory(bool testData) const { +#ifdef _DEBUG +ServerDraftSchematicObjectTemplate::CraftingType testDataValue = static_cast(0); +#else +UNREF(testData); +#endif + const ServerDraftSchematicObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getCategory(true); +#endif } if (!m_category.isLoaded()) @@ -180,6 +213,11 @@ ServerDraftSchematicObjectTemplate::CraftingType ServerDraftSchematicObjectTempl } CraftingType value = static_cast(m_category.getValue()); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerDraftSchematicObjectTemplate::getCategory @@ -206,10 +244,14 @@ const ServerObjectTemplate * ServerDraftSchematicObjectTemplate::getCraftedObjec } } + const ServerObjectTemplate * returnValue = nullptr; const std::string & templateName = m_craftedObjectTemplate.getValue(); - const ServerObjectTemplate * returnValue = dynamic_cast(ObjectTemplateList::fetch(templateName)); - if (returnValue == nullptr) - WARNING_STRICT_FATAL(true, ("Error loading template %s", templateName.c_str())); + if (!templateName.empty()) + { + returnValue = dynamic_cast(ObjectTemplateList::fetch(templateName)); + if (returnValue == nullptr) + WARNING_STRICT_FATAL(true, ("Error loading template %s",templateName.c_str())); + } return returnValue; } // ServerDraftSchematicObjectTemplate::getCraftedObjectTemplate @@ -235,10 +277,14 @@ const ServerFactoryObjectTemplate * ServerDraftSchematicObjectTemplate::getCrate } } + const ServerFactoryObjectTemplate * returnValue = nullptr; const std::string & templateName = m_crateObjectTemplate.getValue(); - const ServerFactoryObjectTemplate * returnValue = dynamic_cast(ObjectTemplateList::fetch(templateName)); - if (returnValue == nullptr) - WARNING_STRICT_FATAL(true, ("Error loading template %s", templateName.c_str())); + if (!templateName.empty()) + { + returnValue = dynamic_cast(ObjectTemplateList::fetch(templateName)); + if (returnValue == nullptr) + WARNING_STRICT_FATAL(true, ("Error loading template %s",templateName.c_str())); + } return returnValue; } // ServerDraftSchematicObjectTemplate::getCrateObjectTemplate @@ -255,7 +301,7 @@ void ServerDraftSchematicObjectTemplate::getSlots(IngredientSlot &data, int inde if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter slots in template %s", DataResource::getName())); - return; + return ; } else { @@ -269,10 +315,10 @@ void ServerDraftSchematicObjectTemplate::getSlots(IngredientSlot &data, int inde { int baseCount = base->getSlotsCount(); if (index < baseCount) - { - base->getSlots(data, index); - return; - } + { + base->getSlots(data, index); + return; + } index -= baseCount; } @@ -308,7 +354,7 @@ void ServerDraftSchematicObjectTemplate::getSlotsMin(IngredientSlot &data, int i if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter slots in template %s", DataResource::getName())); - return; + return ; } else { @@ -322,10 +368,10 @@ void ServerDraftSchematicObjectTemplate::getSlotsMin(IngredientSlot &data, int i { int baseCount = base->getSlotsCount(); if (index < baseCount) - { - base->getSlotsMin(data, index); - return; - } + { + base->getSlotsMin(data, index); + return; + } index -= baseCount; } @@ -361,7 +407,7 @@ void ServerDraftSchematicObjectTemplate::getSlotsMax(IngredientSlot &data, int i if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter slots in template %s", DataResource::getName())); - return; + return ; } else { @@ -375,10 +421,10 @@ void ServerDraftSchematicObjectTemplate::getSlotsMax(IngredientSlot &data, int i { int baseCount = base->getSlotsCount(); if (index < baseCount) - { - base->getSlotsMax(data, index); - return; - } + { + base->getSlotsMax(data, index); + return; + } index -= baseCount; } @@ -484,12 +530,22 @@ size_t ServerDraftSchematicObjectTemplate::getSkillCommandsCount(void) const return count; } // ServerDraftSchematicObjectTemplate::getSkillCommandsCount -bool ServerDraftSchematicObjectTemplate::getDestroyIngredients() const +bool ServerDraftSchematicObjectTemplate::getDestroyIngredients(bool testData) const { +#ifdef _DEBUG +bool testDataValue = false; +#else +UNREF(testData); +#endif + const ServerDraftSchematicObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getDestroyIngredients(true); +#endif } if (!m_destroyIngredients.isLoaded()) @@ -507,6 +563,11 @@ bool ServerDraftSchematicObjectTemplate::getDestroyIngredients() const } bool value = m_destroyIngredients.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerDraftSchematicObjectTemplate::getDestroyIngredients @@ -570,12 +631,22 @@ size_t ServerDraftSchematicObjectTemplate::getManufactureScriptsCount(void) cons return count; } // ServerDraftSchematicObjectTemplate::getManufactureScriptsCount -int ServerDraftSchematicObjectTemplate::getItemsPerContainer() const +int ServerDraftSchematicObjectTemplate::getItemsPerContainer(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerDraftSchematicObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getItemsPerContainer(true); +#endif } if (!m_itemsPerContainer.isLoaded()) @@ -615,16 +686,31 @@ int ServerDraftSchematicObjectTemplate::getItemsPerContainer() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerDraftSchematicObjectTemplate::getItemsPerContainer -int ServerDraftSchematicObjectTemplate::getItemsPerContainerMin() const +int ServerDraftSchematicObjectTemplate::getItemsPerContainerMin(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerDraftSchematicObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getItemsPerContainerMin(true); +#endif } if (!m_itemsPerContainer.isLoaded()) @@ -664,16 +750,31 @@ int ServerDraftSchematicObjectTemplate::getItemsPerContainerMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerDraftSchematicObjectTemplate::getItemsPerContainerMin -int ServerDraftSchematicObjectTemplate::getItemsPerContainerMax() const +int ServerDraftSchematicObjectTemplate::getItemsPerContainerMax(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerDraftSchematicObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getItemsPerContainerMax(true); +#endif } if (!m_itemsPerContainer.isLoaded()) @@ -713,16 +814,31 @@ int ServerDraftSchematicObjectTemplate::getItemsPerContainerMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerDraftSchematicObjectTemplate::getItemsPerContainerMax -float ServerDraftSchematicObjectTemplate::getManufactureTime() const +float ServerDraftSchematicObjectTemplate::getManufactureTime(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerDraftSchematicObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getManufactureTime(true); +#endif } if (!m_manufactureTime.isLoaded()) @@ -762,16 +878,31 @@ float ServerDraftSchematicObjectTemplate::getManufactureTime() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerDraftSchematicObjectTemplate::getManufactureTime -float ServerDraftSchematicObjectTemplate::getManufactureTimeMin() const +float ServerDraftSchematicObjectTemplate::getManufactureTimeMin(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerDraftSchematicObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getManufactureTimeMin(true); +#endif } if (!m_manufactureTime.isLoaded()) @@ -811,16 +942,31 @@ float ServerDraftSchematicObjectTemplate::getManufactureTimeMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerDraftSchematicObjectTemplate::getManufactureTimeMin -float ServerDraftSchematicObjectTemplate::getManufactureTimeMax() const +float ServerDraftSchematicObjectTemplate::getManufactureTimeMax(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerDraftSchematicObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getManufactureTimeMax(true); +#endif } if (!m_manufactureTime.isLoaded()) @@ -860,16 +1006,31 @@ float ServerDraftSchematicObjectTemplate::getManufactureTimeMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerDraftSchematicObjectTemplate::getManufactureTimeMax -float ServerDraftSchematicObjectTemplate::getPrototypeTime() const +float ServerDraftSchematicObjectTemplate::getPrototypeTime(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerDraftSchematicObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getPrototypeTime(true); +#endif } if (!m_prototypeTime.isLoaded()) @@ -909,16 +1070,31 @@ float ServerDraftSchematicObjectTemplate::getPrototypeTime() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerDraftSchematicObjectTemplate::getPrototypeTime -float ServerDraftSchematicObjectTemplate::getPrototypeTimeMin() const +float ServerDraftSchematicObjectTemplate::getPrototypeTimeMin(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerDraftSchematicObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getPrototypeTimeMin(true); +#endif } if (!m_prototypeTime.isLoaded()) @@ -958,16 +1134,31 @@ float ServerDraftSchematicObjectTemplate::getPrototypeTimeMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerDraftSchematicObjectTemplate::getPrototypeTimeMin -float ServerDraftSchematicObjectTemplate::getPrototypeTimeMax() const +float ServerDraftSchematicObjectTemplate::getPrototypeTimeMax(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerDraftSchematicObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getPrototypeTimeMax(true); +#endif } if (!m_prototypeTime.isLoaded()) @@ -1007,10 +1198,33 @@ float ServerDraftSchematicObjectTemplate::getPrototypeTimeMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerDraftSchematicObjectTemplate::getPrototypeTimeMax +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void ServerDraftSchematicObjectTemplate::testValues(void) const +{ + IGNORE_RETURN(getCategory(true)); + IGNORE_RETURN(getDestroyIngredients(true)); + IGNORE_RETURN(getItemsPerContainerMin(true)); + IGNORE_RETURN(getItemsPerContainerMax(true)); + IGNORE_RETURN(getManufactureTimeMin(true)); + IGNORE_RETURN(getManufactureTimeMax(true)); + IGNORE_RETURN(getPrototypeTimeMin(true)); + IGNORE_RETURN(getPrototypeTimeMax(true)); + ServerIntangibleObjectTemplate::testValues(); +} // ServerDraftSchematicObjectTemplate::testValues +#endif + /** * Loads the template data from an iff file. We should already be in the form * for this template. @@ -1019,8 +1233,8 @@ float ServerDraftSchematicObjectTemplate::getPrototypeTimeMax() const */ void ServerDraftSchematicObjectTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != ServerDraftSchematicObjectTemplate_tag) { @@ -1030,7 +1244,7 @@ void ServerDraftSchematicObjectTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -1050,8 +1264,10 @@ void ServerDraftSchematicObjectTemplate::load(Iff &file) file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 0, 7)) + if (getHighestTemplateVersion() != TAG(0,0,0,7)) { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); m_versionOk = false; } @@ -1144,6 +1360,7 @@ void ServerDraftSchematicObjectTemplate::load(Iff &file) return; } // ServerDraftSchematicObjectTemplate::load + //============================================================================= // class ServerDraftSchematicObjectTemplate::_IngredientSlot @@ -1152,8 +1369,8 @@ void ServerDraftSchematicObjectTemplate::load(Iff &file) */ ServerDraftSchematicObjectTemplate::_IngredientSlot::_IngredientSlot(const std::string & filename) : ObjectTemplate(filename) - , m_optionsLoaded(false) - , m_optionsAppend(false) + ,m_optionsLoaded(false) + ,m_optionsAppend(false) { } // ServerDraftSchematicObjectTemplate::_IngredientSlot::_IngredientSlot @@ -1201,12 +1418,22 @@ Tag ServerDraftSchematicObjectTemplate::_IngredientSlot::getId(void) const return _IngredientSlot_tag; } // ServerDraftSchematicObjectTemplate::_IngredientSlot::getId -bool ServerDraftSchematicObjectTemplate::_IngredientSlot::getOptional(bool versionOk) const +bool ServerDraftSchematicObjectTemplate::_IngredientSlot::getOptional(bool versionOk, bool testData) const { +#ifdef _DEBUG +bool testDataValue = false; +#else +UNREF(testData); +#endif + const ServerDraftSchematicObjectTemplate::_IngredientSlot * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getOptional(true); +#endif } if (!m_optional.isLoaded()) @@ -1224,16 +1451,31 @@ bool ServerDraftSchematicObjectTemplate::_IngredientSlot::getOptional(bool versi } bool value = m_optional.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerDraftSchematicObjectTemplate::_IngredientSlot::getOptional -const StringId ServerDraftSchematicObjectTemplate::_IngredientSlot::getName(bool versionOk) const +const StringId ServerDraftSchematicObjectTemplate::_IngredientSlot::getName(bool versionOk, bool testData) const { +#ifdef _DEBUG +StringId testDataValue = DefaultStringId; +#else +UNREF(testData); +#endif + const ServerDraftSchematicObjectTemplate::_IngredientSlot * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getName(true); +#endif } if (!m_name.isLoaded()) @@ -1251,6 +1493,11 @@ const StringId ServerDraftSchematicObjectTemplate::_IngredientSlot::getName(bool } const StringId value = m_name.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerDraftSchematicObjectTemplate::_IngredientSlot::getName @@ -1268,7 +1515,7 @@ void ServerDraftSchematicObjectTemplate::_IngredientSlot::getOptions(Ingredient if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter options in template %s", DataResource::getName())); - return; + return ; } else { @@ -1282,10 +1529,10 @@ void ServerDraftSchematicObjectTemplate::_IngredientSlot::getOptions(Ingredient { int baseCount = base->getOptionsCount(); if (index < baseCount) - { - base->getOptions(data, index, versionOk); - return; - } + { + base->getOptions(data, index, versionOk); + return; + } index -= baseCount; } @@ -1319,7 +1566,7 @@ void ServerDraftSchematicObjectTemplate::_IngredientSlot::getOptionsMin(Ingredie if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter options in template %s", DataResource::getName())); - return; + return ; } else { @@ -1333,10 +1580,10 @@ void ServerDraftSchematicObjectTemplate::_IngredientSlot::getOptionsMin(Ingredie { int baseCount = base->getOptionsCount(); if (index < baseCount) - { - base->getOptionsMin(data, index, versionOk); - return; - } + { + base->getOptionsMin(data, index, versionOk); + return; + } index -= baseCount; } @@ -1370,7 +1617,7 @@ void ServerDraftSchematicObjectTemplate::_IngredientSlot::getOptionsMax(Ingredie if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter options in template %s", DataResource::getName())); - return; + return ; } else { @@ -1384,10 +1631,10 @@ void ServerDraftSchematicObjectTemplate::_IngredientSlot::getOptionsMax(Ingredie { int baseCount = base->getOptionsCount(); if (index < baseCount) - { - base->getOptionsMax(data, index, versionOk); - return; - } + { + base->getOptionsMax(data, index, versionOk); + return; + } index -= baseCount; } @@ -1432,12 +1679,22 @@ size_t ServerDraftSchematicObjectTemplate::_IngredientSlot::getOptionsCount(void return count; } // ServerDraftSchematicObjectTemplate::_IngredientSlot::getOptionsCount -const std::string & ServerDraftSchematicObjectTemplate::_IngredientSlot::getOptionalSkillCommand(bool versionOk) const +const std::string & ServerDraftSchematicObjectTemplate::_IngredientSlot::getOptionalSkillCommand(bool versionOk, bool testData) const { +#ifdef _DEBUG +std::string testDataValue = DefaultString; +#else +UNREF(testData); +#endif + const ServerDraftSchematicObjectTemplate::_IngredientSlot * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getOptionalSkillCommand(true); +#endif } if (!m_optionalSkillCommand.isLoaded()) @@ -1455,16 +1712,31 @@ const std::string & ServerDraftSchematicObjectTemplate::_IngredientSlot::getOpti } const std::string & value = m_optionalSkillCommand.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerDraftSchematicObjectTemplate::_IngredientSlot::getOptionalSkillCommand -float ServerDraftSchematicObjectTemplate::_IngredientSlot::getComplexity(bool versionOk) const +float ServerDraftSchematicObjectTemplate::_IngredientSlot::getComplexity(bool versionOk, bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerDraftSchematicObjectTemplate::_IngredientSlot * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getComplexity(true); +#endif } if (!m_complexity.isLoaded()) @@ -1504,16 +1776,31 @@ float ServerDraftSchematicObjectTemplate::_IngredientSlot::getComplexity(bool ve else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerDraftSchematicObjectTemplate::_IngredientSlot::getComplexity -float ServerDraftSchematicObjectTemplate::_IngredientSlot::getComplexityMin(bool versionOk) const +float ServerDraftSchematicObjectTemplate::_IngredientSlot::getComplexityMin(bool versionOk, bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerDraftSchematicObjectTemplate::_IngredientSlot * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getComplexityMin(true); +#endif } if (!m_complexity.isLoaded()) @@ -1553,16 +1840,31 @@ float ServerDraftSchematicObjectTemplate::_IngredientSlot::getComplexityMin(bool else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerDraftSchematicObjectTemplate::_IngredientSlot::getComplexityMin -float ServerDraftSchematicObjectTemplate::_IngredientSlot::getComplexityMax(bool versionOk) const +float ServerDraftSchematicObjectTemplate::_IngredientSlot::getComplexityMax(bool versionOk, bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerDraftSchematicObjectTemplate::_IngredientSlot * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getComplexityMax(true); +#endif } if (!m_complexity.isLoaded()) @@ -1602,16 +1904,31 @@ float ServerDraftSchematicObjectTemplate::_IngredientSlot::getComplexityMax(bool else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerDraftSchematicObjectTemplate::_IngredientSlot::getComplexityMax -const std::string & ServerDraftSchematicObjectTemplate::_IngredientSlot::getAppearance(bool versionOk) const +const std::string & ServerDraftSchematicObjectTemplate::_IngredientSlot::getAppearance(bool versionOk, bool testData) const { +#ifdef _DEBUG +std::string testDataValue = DefaultString; +#else +UNREF(testData); +#endif + const ServerDraftSchematicObjectTemplate::_IngredientSlot * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getAppearance(true); +#endif } if (!m_appearance.isLoaded()) @@ -1629,10 +1946,30 @@ const std::string & ServerDraftSchematicObjectTemplate::_IngredientSlot::getAppe } const std::string & value = m_appearance.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerDraftSchematicObjectTemplate::_IngredientSlot::getAppearance +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void ServerDraftSchematicObjectTemplate::_IngredientSlot::testValues(void) const +{ + IGNORE_RETURN(getOptional(true)); + IGNORE_RETURN(getName(true)); + IGNORE_RETURN(getOptionalSkillCommand(true)); + IGNORE_RETURN(getComplexityMin(true)); + IGNORE_RETURN(getComplexityMax(true)); + IGNORE_RETURN(getAppearance(true)); +} // ServerDraftSchematicObjectTemplate::_IngredientSlot::testValues +#endif + /** * Loads the template data from an iff file. We should already be in the form * for this template. @@ -1641,8 +1978,8 @@ const std::string & ServerDraftSchematicObjectTemplate::_IngredientSlot::getAppe */ void ServerDraftSchematicObjectTemplate::_IngredientSlot::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; file.enterForm(); @@ -1689,4 +2026,4 @@ void ServerDraftSchematicObjectTemplate::_IngredientSlot::load(Iff &file) UNREF(file); } // ServerDraftSchematicObjectTemplate::_IngredientSlot::load -//@END TFD \ No newline at end of file +//@END TFD diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerDraftSchematicObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerDraftSchematicObjectTemplate.h old mode 100755 new mode 100644 index 68a60122..a13fec2d --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerDraftSchematicObjectTemplate.h +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerDraftSchematicObjectTemplate.h @@ -73,18 +73,23 @@ protected: virtual Tag getId(void) const; public: - bool getOptional(bool versionOk) const; - const StringId getName(bool versionOk) const; + bool getOptional(bool versionOk, bool testData = false) const; + const StringId getName(bool versionOk, bool testData = false) const; void getOptions(Ingredient &data, int index, bool versionOk) const; void getOptionsMin(Ingredient &data, int index, bool versionOk) const; void getOptionsMax(Ingredient &data, int index, bool versionOk) const; size_t getOptionsCount(void) const; - const std::string & getOptionalSkillCommand(bool versionOk) const; - float getComplexity(bool versionOk) const; - float getComplexityMin(bool versionOk) const; - float getComplexityMax(bool versionOk) const; - const std::string & getAppearance(bool versionOk) const; + const std::string & getOptionalSkillCommand(bool versionOk, bool testData = false) const; + float getComplexity(bool versionOk, bool testData = false) const; + float getComplexityMin(bool versionOk, bool testData = false) const; + float getComplexityMax(bool versionOk, bool testData = false) const; + const std::string & getAppearance(bool versionOk, bool testData = false) const; +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); @@ -108,7 +113,7 @@ private: friend class ServerDraftSchematicObjectTemplate::_IngredientSlot; public: - CraftingType getCategory() const; + CraftingType getCategory(bool testData = false) const; const ServerObjectTemplate * getCraftedObjectTemplate() const; const ServerFactoryObjectTemplate * getCrateObjectTemplate() const; void getSlots(IngredientSlot &data, int index) const; @@ -117,19 +122,24 @@ public: size_t getSlotsCount(void) const; const std::string & getSkillCommands(int index) const; size_t getSkillCommandsCount(void) const; - bool getDestroyIngredients() const; + bool getDestroyIngredients(bool testData = false) const; const std::string & getManufactureScripts(int index) const; size_t getManufactureScriptsCount(void) const; - int getItemsPerContainer() const; - int getItemsPerContainerMin() const; - int getItemsPerContainerMax() const; - float getManufactureTime() const; - float getManufactureTimeMin() const; - float getManufactureTimeMax() const; - float getPrototypeTime() const; - float getPrototypeTimeMin() const; - float getPrototypeTimeMax() const; + int getItemsPerContainer(bool testData = false) const; + int getItemsPerContainerMin(bool testData = false) const; + int getItemsPerContainerMax(bool testData = false) const; + float getManufactureTime(bool testData = false) const; + float getManufactureTimeMin(bool testData = false) const; + float getManufactureTimeMax(bool testData = false) const; + float getPrototypeTime(bool testData = false) const; + float getPrototypeTimeMin(bool testData = false) const; + float getPrototypeTimeMax(bool testData = false) const; +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerFactoryObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerFactoryObjectTemplate.cpp old mode 100755 new mode 100644 index fe0c4e5f..44c422ec --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerFactoryObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerFactoryObjectTemplate.cpp @@ -22,20 +22,20 @@ const std::string DefaultString(""); const StringId DefaultStringId("", 0); -const Vector DefaultVector(0, 0, 0); +const Vector DefaultVector(0,0,0); const TriggerVolumeData DefaultTriggerVolumeData; bool ServerFactoryObjectTemplate::ms_allowDefaultTemplateParams = true; + /** * Class constructor. */ ServerFactoryObjectTemplate::ServerFactoryObjectTemplate(const std::string & filename) //@BEGIN TFD INIT : ServerTangibleObjectTemplate(filename) - , m_versionOk(true) - , m_templateVersion(0) - //@END TFD INIT + ,m_versionOk(true) +//@END TFD INIT { } // ServerFactoryObjectTemplate::ServerFactoryObjectTemplate @@ -44,8 +44,8 @@ ServerFactoryObjectTemplate::ServerFactoryObjectTemplate(const std::string & fil */ ServerFactoryObjectTemplate::~ServerFactoryObjectTemplate() { - //@BEGIN TFD CLEANUP - //@END TFD CLEANUP +//@BEGIN TFD CLEANUP +//@END TFD CLEANUP } // ServerFactoryObjectTemplate::~ServerFactoryObjectTemplate /** @@ -93,10 +93,10 @@ Tag ServerFactoryObjectTemplate::getTemplateVersion(void) const */ Tag ServerFactoryObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerFactoryObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerFactoryObjectTemplate::getHighestTemplateVersion @@ -112,6 +112,15 @@ Object * ServerFactoryObjectTemplate::createObject(void) const } // ServerFactoryObjectTemplate::createObject //@BEGIN TFD +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void ServerFactoryObjectTemplate::testValues(void) const +{ + ServerTangibleObjectTemplate::testValues(); +} // ServerFactoryObjectTemplate::testValues +#endif /** * Loads the template data from an iff file. We should already be in the form @@ -121,8 +130,8 @@ Object * ServerFactoryObjectTemplate::createObject(void) const */ void ServerFactoryObjectTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != ServerFactoryObjectTemplate_tag) { @@ -132,7 +141,7 @@ void ServerFactoryObjectTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -152,8 +161,10 @@ void ServerFactoryObjectTemplate::load(Iff &file) file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 0, 0)) + if (getHighestTemplateVersion() != TAG(0,0,0,0)) { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); m_versionOk = false; } @@ -171,4 +182,4 @@ void ServerFactoryObjectTemplate::load(Iff &file) return; } // ServerFactoryObjectTemplate::load -//@END TFD \ No newline at end of file +//@END TFD diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerFactoryObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerFactoryObjectTemplate.h old mode 100755 new mode 100644 index 44d034c7..91736fac --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerFactoryObjectTemplate.h +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerFactoryObjectTemplate.h @@ -45,6 +45,11 @@ public: //@BEGIN TFD public: +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerGroupObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerGroupObjectTemplate.cpp old mode 100755 new mode 100644 index 4e1add97..a59afe29 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerGroupObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerGroupObjectTemplate.cpp @@ -24,20 +24,20 @@ const std::string DefaultString(""); const StringId DefaultStringId("", 0); -const Vector DefaultVector(0, 0, 0); +const Vector DefaultVector(0,0,0); const TriggerVolumeData DefaultTriggerVolumeData; bool ServerGroupObjectTemplate::ms_allowDefaultTemplateParams = true; + /** * Class constructor. */ ServerGroupObjectTemplate::ServerGroupObjectTemplate(const std::string & filename) //@BEGIN TFD INIT : ServerUniverseObjectTemplate(filename) - , m_versionOk(true) - , m_templateVersion(0) - //@END TFD INIT + ,m_versionOk(true) +//@END TFD INIT { } // ServerGroupObjectTemplate::ServerGroupObjectTemplate @@ -46,8 +46,8 @@ ServerGroupObjectTemplate::ServerGroupObjectTemplate(const std::string & filenam */ ServerGroupObjectTemplate::~ServerGroupObjectTemplate() { - //@BEGIN TFD CLEANUP - //@END TFD CLEANUP +//@BEGIN TFD CLEANUP +//@END TFD CLEANUP } // ServerGroupObjectTemplate::~ServerGroupObjectTemplate /** @@ -95,10 +95,10 @@ Tag ServerGroupObjectTemplate::getTemplateVersion(void) const */ Tag ServerGroupObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerGroupObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerGroupObjectTemplate::getHighestTemplateVersion @@ -114,6 +114,15 @@ Object * ServerGroupObjectTemplate::createObject(void) const } // ServerGroupObjectTemplate::createObject //@BEGIN TFD +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void ServerGroupObjectTemplate::testValues(void) const +{ + ServerUniverseObjectTemplate::testValues(); +} // ServerGroupObjectTemplate::testValues +#endif /** * Loads the template data from an iff file. We should already be in the form @@ -123,8 +132,8 @@ Object * ServerGroupObjectTemplate::createObject(void) const */ void ServerGroupObjectTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != ServerGroupObjectTemplate_tag) { @@ -134,7 +143,7 @@ void ServerGroupObjectTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -154,8 +163,10 @@ void ServerGroupObjectTemplate::load(Iff &file) file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 0, 0)) + if (getHighestTemplateVersion() != TAG(0,0,0,0)) { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); m_versionOk = false; } @@ -173,4 +184,4 @@ void ServerGroupObjectTemplate::load(Iff &file) return; } // ServerGroupObjectTemplate::load -//@END TFD \ No newline at end of file +//@END TFD diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerGroupObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerGroupObjectTemplate.h old mode 100755 new mode 100644 index 79748283..e847ca95 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerGroupObjectTemplate.h +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerGroupObjectTemplate.h @@ -45,6 +45,11 @@ public: //@BEGIN TFD public: +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerGuildObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerGuildObjectTemplate.cpp old mode 100755 new mode 100644 index 7af51fce..a0014074 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerGuildObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerGuildObjectTemplate.cpp @@ -24,20 +24,20 @@ const std::string DefaultString(""); const StringId DefaultStringId("", 0); -const Vector DefaultVector(0, 0, 0); +const Vector DefaultVector(0,0,0); const TriggerVolumeData DefaultTriggerVolumeData; bool ServerGuildObjectTemplate::ms_allowDefaultTemplateParams = true; + /** * Class constructor. */ ServerGuildObjectTemplate::ServerGuildObjectTemplate(const std::string & filename) //@BEGIN TFD INIT : ServerUniverseObjectTemplate(filename) - , m_versionOk(true) - , m_templateVersion(0) - //@END TFD INIT + ,m_versionOk(true) +//@END TFD INIT { } // ServerGuildObjectTemplate::ServerGuildObjectTemplate @@ -46,8 +46,8 @@ ServerGuildObjectTemplate::ServerGuildObjectTemplate(const std::string & filenam */ ServerGuildObjectTemplate::~ServerGuildObjectTemplate() { - //@BEGIN TFD CLEANUP - //@END TFD CLEANUP +//@BEGIN TFD CLEANUP +//@END TFD CLEANUP } // ServerGuildObjectTemplate::~ServerGuildObjectTemplate /** @@ -95,10 +95,10 @@ Tag ServerGuildObjectTemplate::getTemplateVersion(void) const */ Tag ServerGuildObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerGuildObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerGuildObjectTemplate::getHighestTemplateVersion @@ -114,6 +114,15 @@ Object * ServerGuildObjectTemplate::createObject(void) const } // ServerGuildObjectTemplate::createObject //@BEGIN TFD +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void ServerGuildObjectTemplate::testValues(void) const +{ + ServerUniverseObjectTemplate::testValues(); +} // ServerGuildObjectTemplate::testValues +#endif /** * Loads the template data from an iff file. We should already be in the form @@ -123,8 +132,8 @@ Object * ServerGuildObjectTemplate::createObject(void) const */ void ServerGuildObjectTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != ServerGuildObjectTemplate_tag) { @@ -134,7 +143,7 @@ void ServerGuildObjectTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -154,8 +163,10 @@ void ServerGuildObjectTemplate::load(Iff &file) file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 0, 0)) + if (getHighestTemplateVersion() != TAG(0,0,0,0)) { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); m_versionOk = false; } @@ -173,4 +184,4 @@ void ServerGuildObjectTemplate::load(Iff &file) return; } // ServerGuildObjectTemplate::load -//@END TFD \ No newline at end of file +//@END TFD diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerGuildObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerGuildObjectTemplate.h old mode 100755 new mode 100644 index 18222a05..5aed85aa --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerGuildObjectTemplate.h +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerGuildObjectTemplate.h @@ -45,6 +45,11 @@ public: //@BEGIN TFD public: +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerHarvesterInstallationObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerHarvesterInstallationObjectTemplate.cpp old mode 100755 new mode 100644 index 566f6a37..01f1d037 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerHarvesterInstallationObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerHarvesterInstallationObjectTemplate.cpp @@ -22,20 +22,20 @@ const std::string DefaultString(""); const StringId DefaultStringId("", 0); -const Vector DefaultVector(0, 0, 0); +const Vector DefaultVector(0,0,0); const TriggerVolumeData DefaultTriggerVolumeData; bool ServerHarvesterInstallationObjectTemplate::ms_allowDefaultTemplateParams = true; + /** * Class constructor. */ ServerHarvesterInstallationObjectTemplate::ServerHarvesterInstallationObjectTemplate(const std::string & filename) //@BEGIN TFD INIT : ServerInstallationObjectTemplate(filename) - , m_versionOk(true) - , m_templateVersion(0) - //@END TFD INIT + ,m_versionOk(true) +//@END TFD INIT { } // ServerHarvesterInstallationObjectTemplate::ServerHarvesterInstallationObjectTemplate @@ -44,8 +44,8 @@ ServerHarvesterInstallationObjectTemplate::ServerHarvesterInstallationObjectTemp */ ServerHarvesterInstallationObjectTemplate::~ServerHarvesterInstallationObjectTemplate() { - //@BEGIN TFD CLEANUP - //@END TFD CLEANUP +//@BEGIN TFD CLEANUP +//@END TFD CLEANUP } // ServerHarvesterInstallationObjectTemplate::~ServerHarvesterInstallationObjectTemplate /** @@ -93,10 +93,10 @@ Tag ServerHarvesterInstallationObjectTemplate::getTemplateVersion(void) const */ Tag ServerHarvesterInstallationObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerHarvesterInstallationObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerHarvesterInstallationObjectTemplate::getHighestTemplateVersion @@ -112,12 +112,22 @@ Object * ServerHarvesterInstallationObjectTemplate::createObject(void) const } // ServerHarvesterInstallationObjectTemplate::createObject //@BEGIN TFD -int ServerHarvesterInstallationObjectTemplate::getMaxExtractionRate() const +int ServerHarvesterInstallationObjectTemplate::getMaxExtractionRate(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerHarvesterInstallationObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getMaxExtractionRate(true); +#endif } if (!m_maxExtractionRate.isLoaded()) @@ -157,16 +167,31 @@ int ServerHarvesterInstallationObjectTemplate::getMaxExtractionRate() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerHarvesterInstallationObjectTemplate::getMaxExtractionRate -int ServerHarvesterInstallationObjectTemplate::getMaxExtractionRateMin() const +int ServerHarvesterInstallationObjectTemplate::getMaxExtractionRateMin(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerHarvesterInstallationObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getMaxExtractionRateMin(true); +#endif } if (!m_maxExtractionRate.isLoaded()) @@ -206,16 +231,31 @@ int ServerHarvesterInstallationObjectTemplate::getMaxExtractionRateMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerHarvesterInstallationObjectTemplate::getMaxExtractionRateMin -int ServerHarvesterInstallationObjectTemplate::getMaxExtractionRateMax() const +int ServerHarvesterInstallationObjectTemplate::getMaxExtractionRateMax(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerHarvesterInstallationObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getMaxExtractionRateMax(true); +#endif } if (!m_maxExtractionRate.isLoaded()) @@ -255,16 +295,31 @@ int ServerHarvesterInstallationObjectTemplate::getMaxExtractionRateMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerHarvesterInstallationObjectTemplate::getMaxExtractionRateMax -int ServerHarvesterInstallationObjectTemplate::getCurrentExtractionRate() const +int ServerHarvesterInstallationObjectTemplate::getCurrentExtractionRate(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerHarvesterInstallationObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getCurrentExtractionRate(true); +#endif } if (!m_currentExtractionRate.isLoaded()) @@ -304,16 +359,31 @@ int ServerHarvesterInstallationObjectTemplate::getCurrentExtractionRate() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerHarvesterInstallationObjectTemplate::getCurrentExtractionRate -int ServerHarvesterInstallationObjectTemplate::getCurrentExtractionRateMin() const +int ServerHarvesterInstallationObjectTemplate::getCurrentExtractionRateMin(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerHarvesterInstallationObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getCurrentExtractionRateMin(true); +#endif } if (!m_currentExtractionRate.isLoaded()) @@ -353,16 +423,31 @@ int ServerHarvesterInstallationObjectTemplate::getCurrentExtractionRateMin() con else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerHarvesterInstallationObjectTemplate::getCurrentExtractionRateMin -int ServerHarvesterInstallationObjectTemplate::getCurrentExtractionRateMax() const +int ServerHarvesterInstallationObjectTemplate::getCurrentExtractionRateMax(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerHarvesterInstallationObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getCurrentExtractionRateMax(true); +#endif } if (!m_currentExtractionRate.isLoaded()) @@ -402,16 +487,31 @@ int ServerHarvesterInstallationObjectTemplate::getCurrentExtractionRateMax() con else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerHarvesterInstallationObjectTemplate::getCurrentExtractionRateMax -int ServerHarvesterInstallationObjectTemplate::getMaxHopperSize() const +int ServerHarvesterInstallationObjectTemplate::getMaxHopperSize(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerHarvesterInstallationObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getMaxHopperSize(true); +#endif } if (!m_maxHopperSize.isLoaded()) @@ -451,16 +551,31 @@ int ServerHarvesterInstallationObjectTemplate::getMaxHopperSize() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerHarvesterInstallationObjectTemplate::getMaxHopperSize -int ServerHarvesterInstallationObjectTemplate::getMaxHopperSizeMin() const +int ServerHarvesterInstallationObjectTemplate::getMaxHopperSizeMin(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerHarvesterInstallationObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getMaxHopperSizeMin(true); +#endif } if (!m_maxHopperSize.isLoaded()) @@ -500,16 +615,31 @@ int ServerHarvesterInstallationObjectTemplate::getMaxHopperSizeMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerHarvesterInstallationObjectTemplate::getMaxHopperSizeMin -int ServerHarvesterInstallationObjectTemplate::getMaxHopperSizeMax() const +int ServerHarvesterInstallationObjectTemplate::getMaxHopperSizeMax(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerHarvesterInstallationObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getMaxHopperSizeMax(true); +#endif } if (!m_maxHopperSize.isLoaded()) @@ -549,16 +679,31 @@ int ServerHarvesterInstallationObjectTemplate::getMaxHopperSizeMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerHarvesterInstallationObjectTemplate::getMaxHopperSizeMax -const std::string & ServerHarvesterInstallationObjectTemplate::getMasterClassName() const +const std::string & ServerHarvesterInstallationObjectTemplate::getMasterClassName(bool testData) const { +#ifdef _DEBUG +std::string testDataValue = DefaultString; +#else +UNREF(testData); +#endif + const ServerHarvesterInstallationObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getMasterClassName(true); +#endif } if (!m_masterClassName.isLoaded()) @@ -576,10 +721,32 @@ const std::string & ServerHarvesterInstallationObjectTemplate::getMasterClassNam } const std::string & value = m_masterClassName.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerHarvesterInstallationObjectTemplate::getMasterClassName +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void ServerHarvesterInstallationObjectTemplate::testValues(void) const +{ + IGNORE_RETURN(getMaxExtractionRateMin(true)); + IGNORE_RETURN(getMaxExtractionRateMax(true)); + IGNORE_RETURN(getCurrentExtractionRateMin(true)); + IGNORE_RETURN(getCurrentExtractionRateMax(true)); + IGNORE_RETURN(getMaxHopperSizeMin(true)); + IGNORE_RETURN(getMaxHopperSizeMax(true)); + IGNORE_RETURN(getMasterClassName(true)); + ServerInstallationObjectTemplate::testValues(); +} // ServerHarvesterInstallationObjectTemplate::testValues +#endif + /** * Loads the template data from an iff file. We should already be in the form * for this template. @@ -588,8 +755,8 @@ const std::string & ServerHarvesterInstallationObjectTemplate::getMasterClassNam */ void ServerHarvesterInstallationObjectTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != ServerHarvesterInstallationObjectTemplate_tag) { @@ -599,7 +766,7 @@ void ServerHarvesterInstallationObjectTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -619,8 +786,10 @@ void ServerHarvesterInstallationObjectTemplate::load(Iff &file) file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 0, 0)) + if (getHighestTemplateVersion() != TAG(0,0,0,0)) { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); m_versionOk = false; } @@ -650,4 +819,4 @@ void ServerHarvesterInstallationObjectTemplate::load(Iff &file) return; } // ServerHarvesterInstallationObjectTemplate::load -//@END TFD \ No newline at end of file +//@END TFD diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerHarvesterInstallationObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerHarvesterInstallationObjectTemplate.h old mode 100755 new mode 100644 index 3ac85c82..a1e72bd8 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerHarvesterInstallationObjectTemplate.h +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerHarvesterInstallationObjectTemplate.h @@ -44,17 +44,22 @@ public: //@BEGIN TFD public: - int getMaxExtractionRate() const; - int getMaxExtractionRateMin() const; - int getMaxExtractionRateMax() const; - int getCurrentExtractionRate() const; - int getCurrentExtractionRateMin() const; - int getCurrentExtractionRateMax() const; - int getMaxHopperSize() const; - int getMaxHopperSizeMin() const; - int getMaxHopperSizeMax() const; - const std::string & getMasterClassName() const; + int getMaxExtractionRate(bool testData = false) const; + int getMaxExtractionRateMin(bool testData = false) const; + int getMaxExtractionRateMax(bool testData = false) const; + int getCurrentExtractionRate(bool testData = false) const; + int getCurrentExtractionRateMin(bool testData = false) const; + int getCurrentExtractionRateMax(bool testData = false) const; + int getMaxHopperSize(bool testData = false) const; + int getMaxHopperSizeMin(bool testData = false) const; + int getMaxHopperSizeMax(bool testData = false) const; + const std::string & getMasterClassName(bool testData = false) const; +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerInstallationObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerInstallationObjectTemplate.cpp old mode 100755 new mode 100644 index 17832c22..f94cbd5b --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerInstallationObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerInstallationObjectTemplate.cpp @@ -23,20 +23,20 @@ const std::string DefaultString(""); const StringId DefaultStringId("", 0); -const Vector DefaultVector(0, 0, 0); +const Vector DefaultVector(0,0,0); const TriggerVolumeData DefaultTriggerVolumeData; bool ServerInstallationObjectTemplate::ms_allowDefaultTemplateParams = true; + /** * Class constructor. */ ServerInstallationObjectTemplate::ServerInstallationObjectTemplate(const std::string & filename) //@BEGIN TFD INIT : ServerTangibleObjectTemplate(filename) - , m_versionOk(true) - , m_templateVersion(0) - //@END TFD INIT + ,m_versionOk(true) +//@END TFD INIT { } // ServerInstallationObjectTemplate::ServerInstallationObjectTemplate @@ -45,8 +45,8 @@ ServerInstallationObjectTemplate::ServerInstallationObjectTemplate(const std::st */ ServerInstallationObjectTemplate::~ServerInstallationObjectTemplate() { - //@BEGIN TFD CLEANUP - //@END TFD CLEANUP +//@BEGIN TFD CLEANUP +//@END TFD CLEANUP } // ServerInstallationObjectTemplate::~ServerInstallationObjectTemplate /** @@ -94,10 +94,10 @@ Tag ServerInstallationObjectTemplate::getTemplateVersion(void) const */ Tag ServerInstallationObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerInstallationObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerInstallationObjectTemplate::getHighestTemplateVersion @@ -113,6 +113,15 @@ Object * ServerInstallationObjectTemplate::createObject(void) const } // ServerInstallationObjectTemplate::createObject //@BEGIN TFD +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void ServerInstallationObjectTemplate::testValues(void) const +{ + ServerTangibleObjectTemplate::testValues(); +} // ServerInstallationObjectTemplate::testValues +#endif /** * Loads the template data from an iff file. We should already be in the form @@ -122,8 +131,8 @@ Object * ServerInstallationObjectTemplate::createObject(void) const */ void ServerInstallationObjectTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != ServerInstallationObjectTemplate_tag) { @@ -133,7 +142,7 @@ void ServerInstallationObjectTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -153,8 +162,10 @@ void ServerInstallationObjectTemplate::load(Iff &file) file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 0, 1)) + if (getHighestTemplateVersion() != TAG(0,0,0,1)) { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); m_versionOk = false; } @@ -172,4 +183,4 @@ void ServerInstallationObjectTemplate::load(Iff &file) return; } // ServerInstallationObjectTemplate::load -//@END TFD \ No newline at end of file +//@END TFD diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerInstallationObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerInstallationObjectTemplate.h old mode 100755 new mode 100644 index c505e5c5..85a1a18b --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerInstallationObjectTemplate.h +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerInstallationObjectTemplate.h @@ -45,6 +45,11 @@ public: //@BEGIN TFD public: +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerIntangibleObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerIntangibleObjectTemplate.cpp old mode 100755 new mode 100644 index 60bfb3c8..b5bba948 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerIntangibleObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerIntangibleObjectTemplate.cpp @@ -22,20 +22,20 @@ const std::string DefaultString(""); const StringId DefaultStringId("", 0); -const Vector DefaultVector(0, 0, 0); +const Vector DefaultVector(0,0,0); const TriggerVolumeData DefaultTriggerVolumeData; bool ServerIntangibleObjectTemplate::ms_allowDefaultTemplateParams = true; + /** * Class constructor. */ ServerIntangibleObjectTemplate::ServerIntangibleObjectTemplate(const std::string & filename) //@BEGIN TFD INIT : ServerObjectTemplate(filename) - , m_versionOk(true) - , m_templateVersion(0) - //@END TFD INIT + ,m_versionOk(true) +//@END TFD INIT { } // ServerIntangibleObjectTemplate::ServerIntangibleObjectTemplate @@ -44,8 +44,8 @@ ServerIntangibleObjectTemplate::ServerIntangibleObjectTemplate(const std::string */ ServerIntangibleObjectTemplate::~ServerIntangibleObjectTemplate() { - //@BEGIN TFD CLEANUP - //@END TFD CLEANUP +//@BEGIN TFD CLEANUP +//@END TFD CLEANUP } // ServerIntangibleObjectTemplate::~ServerIntangibleObjectTemplate /** @@ -93,10 +93,10 @@ Tag ServerIntangibleObjectTemplate::getTemplateVersion(void) const */ Tag ServerIntangibleObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerIntangibleObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerIntangibleObjectTemplate::getHighestTemplateVersion @@ -112,12 +112,22 @@ Object * ServerIntangibleObjectTemplate::createObject(void) const } // ServerIntangibleObjectTemplate::createObject //@BEGIN TFD -int ServerIntangibleObjectTemplate::getCount() const +int ServerIntangibleObjectTemplate::getCount(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerIntangibleObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getCount(true); +#endif } if (!m_count.isLoaded()) @@ -157,16 +167,31 @@ int ServerIntangibleObjectTemplate::getCount() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerIntangibleObjectTemplate::getCount -int ServerIntangibleObjectTemplate::getCountMin() const +int ServerIntangibleObjectTemplate::getCountMin(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerIntangibleObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getCountMin(true); +#endif } if (!m_count.isLoaded()) @@ -206,16 +231,31 @@ int ServerIntangibleObjectTemplate::getCountMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerIntangibleObjectTemplate::getCountMin -int ServerIntangibleObjectTemplate::getCountMax() const +int ServerIntangibleObjectTemplate::getCountMax(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerIntangibleObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getCountMax(true); +#endif } if (!m_count.isLoaded()) @@ -255,10 +295,27 @@ int ServerIntangibleObjectTemplate::getCountMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerIntangibleObjectTemplate::getCountMax +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void ServerIntangibleObjectTemplate::testValues(void) const +{ + IGNORE_RETURN(getCountMin(true)); + IGNORE_RETURN(getCountMax(true)); + ServerObjectTemplate::testValues(); +} // ServerIntangibleObjectTemplate::testValues +#endif + /** * Loads the template data from an iff file. We should already be in the form * for this template. @@ -267,8 +324,8 @@ int ServerIntangibleObjectTemplate::getCountMax() const */ void ServerIntangibleObjectTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != ServerIntangibleObjectTemplate_tag) { @@ -278,7 +335,7 @@ void ServerIntangibleObjectTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -298,8 +355,10 @@ void ServerIntangibleObjectTemplate::load(Iff &file) file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 0, 1)) + if (getHighestTemplateVersion() != TAG(0,0,0,1)) { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); m_versionOk = false; } @@ -323,6 +382,7 @@ void ServerIntangibleObjectTemplate::load(Iff &file) return; } // ServerIntangibleObjectTemplate::load + //============================================================================= // class ServerIntangibleObjectTemplate::_Ingredient @@ -331,8 +391,8 @@ void ServerIntangibleObjectTemplate::load(Iff &file) */ ServerIntangibleObjectTemplate::_Ingredient::_Ingredient(const std::string & filename) : ObjectTemplate(filename) - , m_ingredientsLoaded(false) - , m_ingredientsAppend(false) + ,m_ingredientsLoaded(false) + ,m_ingredientsAppend(false) { } // ServerIntangibleObjectTemplate::_Ingredient::_Ingredient @@ -380,12 +440,22 @@ Tag ServerIntangibleObjectTemplate::_Ingredient::getId(void) const return _Ingredient_tag; } // ServerIntangibleObjectTemplate::_Ingredient::getId -ServerIntangibleObjectTemplate::IngredientType ServerIntangibleObjectTemplate::_Ingredient::getIngredientType(bool versionOk) const +ServerIntangibleObjectTemplate::IngredientType ServerIntangibleObjectTemplate::_Ingredient::getIngredientType(bool versionOk, bool testData) const { +#ifdef _DEBUG +ServerIntangibleObjectTemplate::IngredientType testDataValue = static_cast(0); +#else +UNREF(testData); +#endif + const ServerIntangibleObjectTemplate::_Ingredient * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getIngredientType(true); +#endif } if (!m_ingredientType.isLoaded()) @@ -403,6 +473,11 @@ ServerIntangibleObjectTemplate::IngredientType ServerIntangibleObjectTemplate::_ } IngredientType value = static_cast(m_ingredientType.getValue()); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerIntangibleObjectTemplate::_Ingredient::getIngredientType @@ -420,7 +495,7 @@ void ServerIntangibleObjectTemplate::_Ingredient::getIngredients(SimpleIngredien if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter ingredients in template %s", DataResource::getName())); - return; + return ; } else { @@ -434,10 +509,10 @@ void ServerIntangibleObjectTemplate::_Ingredient::getIngredients(SimpleIngredien { int baseCount = base->getIngredientsCount(); if (index < baseCount) - { - base->getIngredients(data, index, versionOk); - return; - } + { + base->getIngredients(data, index, versionOk); + return; + } index -= baseCount; } @@ -464,7 +539,7 @@ void ServerIntangibleObjectTemplate::_Ingredient::getIngredientsMin(SimpleIngred if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter ingredients in template %s", DataResource::getName())); - return; + return ; } else { @@ -478,10 +553,10 @@ void ServerIntangibleObjectTemplate::_Ingredient::getIngredientsMin(SimpleIngred { int baseCount = base->getIngredientsCount(); if (index < baseCount) - { - base->getIngredientsMin(data, index, versionOk); - return; - } + { + base->getIngredientsMin(data, index, versionOk); + return; + } index -= baseCount; } @@ -508,7 +583,7 @@ void ServerIntangibleObjectTemplate::_Ingredient::getIngredientsMax(SimpleIngred if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter ingredients in template %s", DataResource::getName())); - return; + return ; } else { @@ -522,10 +597,10 @@ void ServerIntangibleObjectTemplate::_Ingredient::getIngredientsMax(SimpleIngred { int baseCount = base->getIngredientsCount(); if (index < baseCount) - { - base->getIngredientsMax(data, index, versionOk); - return; - } + { + base->getIngredientsMax(data, index, versionOk); + return; + } index -= baseCount; } @@ -563,12 +638,22 @@ size_t ServerIntangibleObjectTemplate::_Ingredient::getIngredientsCount(void) co return count; } // ServerIntangibleObjectTemplate::_Ingredient::getIngredientsCount -float ServerIntangibleObjectTemplate::_Ingredient::getComplexity(bool versionOk) const +float ServerIntangibleObjectTemplate::_Ingredient::getComplexity(bool versionOk, bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerIntangibleObjectTemplate::_Ingredient * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getComplexity(true); +#endif } if (!m_complexity.isLoaded()) @@ -608,16 +693,31 @@ float ServerIntangibleObjectTemplate::_Ingredient::getComplexity(bool versionOk) else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerIntangibleObjectTemplate::_Ingredient::getComplexity -float ServerIntangibleObjectTemplate::_Ingredient::getComplexityMin(bool versionOk) const +float ServerIntangibleObjectTemplate::_Ingredient::getComplexityMin(bool versionOk, bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerIntangibleObjectTemplate::_Ingredient * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getComplexityMin(true); +#endif } if (!m_complexity.isLoaded()) @@ -657,16 +757,31 @@ float ServerIntangibleObjectTemplate::_Ingredient::getComplexityMin(bool version else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerIntangibleObjectTemplate::_Ingredient::getComplexityMin -float ServerIntangibleObjectTemplate::_Ingredient::getComplexityMax(bool versionOk) const +float ServerIntangibleObjectTemplate::_Ingredient::getComplexityMax(bool versionOk, bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerIntangibleObjectTemplate::_Ingredient * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getComplexityMax(true); +#endif } if (!m_complexity.isLoaded()) @@ -706,16 +821,31 @@ float ServerIntangibleObjectTemplate::_Ingredient::getComplexityMax(bool version else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerIntangibleObjectTemplate::_Ingredient::getComplexityMax -const std::string & ServerIntangibleObjectTemplate::_Ingredient::getSkillCommand(bool versionOk) const +const std::string & ServerIntangibleObjectTemplate::_Ingredient::getSkillCommand(bool versionOk, bool testData) const { +#ifdef _DEBUG +std::string testDataValue = DefaultString; +#else +UNREF(testData); +#endif + const ServerIntangibleObjectTemplate::_Ingredient * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getSkillCommand(true); +#endif } if (!m_skillCommand.isLoaded()) @@ -733,10 +863,28 @@ const std::string & ServerIntangibleObjectTemplate::_Ingredient::getSkillCommand } const std::string & value = m_skillCommand.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerIntangibleObjectTemplate::_Ingredient::getSkillCommand +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void ServerIntangibleObjectTemplate::_Ingredient::testValues(void) const +{ + IGNORE_RETURN(getIngredientType(true)); + IGNORE_RETURN(getComplexityMin(true)); + IGNORE_RETURN(getComplexityMax(true)); + IGNORE_RETURN(getSkillCommand(true)); +} // ServerIntangibleObjectTemplate::_Ingredient::testValues +#endif + /** * Loads the template data from an iff file. We should already be in the form * for this template. @@ -745,8 +893,8 @@ const std::string & ServerIntangibleObjectTemplate::_Ingredient::getSkillCommand */ void ServerIntangibleObjectTemplate::_Ingredient::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; file.enterForm(); @@ -789,6 +937,7 @@ void ServerIntangibleObjectTemplate::_Ingredient::load(Iff &file) UNREF(file); } // ServerIntangibleObjectTemplate::_Ingredient::load + //============================================================================= // class ServerIntangibleObjectTemplate::_SchematicAttribute @@ -835,12 +984,22 @@ Tag ServerIntangibleObjectTemplate::_SchematicAttribute::getId(void) const return _SchematicAttribute_tag; } // ServerIntangibleObjectTemplate::_SchematicAttribute::getId -const StringId ServerIntangibleObjectTemplate::_SchematicAttribute::getName(bool versionOk) const +const StringId ServerIntangibleObjectTemplate::_SchematicAttribute::getName(bool versionOk, bool testData) const { +#ifdef _DEBUG +StringId testDataValue = DefaultStringId; +#else +UNREF(testData); +#endif + const ServerIntangibleObjectTemplate::_SchematicAttribute * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getName(true); +#endif } if (!m_name.isLoaded()) @@ -858,16 +1017,31 @@ const StringId ServerIntangibleObjectTemplate::_SchematicAttribute::getName(bool } const StringId value = m_name.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerIntangibleObjectTemplate::_SchematicAttribute::getName -int ServerIntangibleObjectTemplate::_SchematicAttribute::getValue(bool versionOk) const +int ServerIntangibleObjectTemplate::_SchematicAttribute::getValue(bool versionOk, bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerIntangibleObjectTemplate::_SchematicAttribute * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getValue(true); +#endif } if (!m_value.isLoaded()) @@ -907,16 +1081,31 @@ int ServerIntangibleObjectTemplate::_SchematicAttribute::getValue(bool versionOk else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerIntangibleObjectTemplate::_SchematicAttribute::getValue -int ServerIntangibleObjectTemplate::_SchematicAttribute::getValueMin(bool versionOk) const +int ServerIntangibleObjectTemplate::_SchematicAttribute::getValueMin(bool versionOk, bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerIntangibleObjectTemplate::_SchematicAttribute * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getValueMin(true); +#endif } if (!m_value.isLoaded()) @@ -956,16 +1145,31 @@ int ServerIntangibleObjectTemplate::_SchematicAttribute::getValueMin(bool versio else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerIntangibleObjectTemplate::_SchematicAttribute::getValueMin -int ServerIntangibleObjectTemplate::_SchematicAttribute::getValueMax(bool versionOk) const +int ServerIntangibleObjectTemplate::_SchematicAttribute::getValueMax(bool versionOk, bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerIntangibleObjectTemplate::_SchematicAttribute * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getValueMax(true); +#endif } if (!m_value.isLoaded()) @@ -1005,10 +1209,27 @@ int ServerIntangibleObjectTemplate::_SchematicAttribute::getValueMax(bool versio else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerIntangibleObjectTemplate::_SchematicAttribute::getValueMax +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void ServerIntangibleObjectTemplate::_SchematicAttribute::testValues(void) const +{ + IGNORE_RETURN(getName(true)); + IGNORE_RETURN(getValueMin(true)); + IGNORE_RETURN(getValueMax(true)); +} // ServerIntangibleObjectTemplate::_SchematicAttribute::testValues +#endif + /** * Loads the template data from an iff file. We should already be in the form * for this template. @@ -1017,8 +1238,8 @@ int ServerIntangibleObjectTemplate::_SchematicAttribute::getValueMax(bool versio */ void ServerIntangibleObjectTemplate::_SchematicAttribute::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; file.enterForm(); @@ -1040,6 +1261,7 @@ void ServerIntangibleObjectTemplate::_SchematicAttribute::load(Iff &file) UNREF(file); } // ServerIntangibleObjectTemplate::_SchematicAttribute::load + //============================================================================= // class ServerIntangibleObjectTemplate::_SimpleIngredient @@ -1086,12 +1308,22 @@ Tag ServerIntangibleObjectTemplate::_SimpleIngredient::getId(void) const return _SimpleIngredient_tag; } // ServerIntangibleObjectTemplate::_SimpleIngredient::getId -const StringId ServerIntangibleObjectTemplate::_SimpleIngredient::getName(bool versionOk) const +const StringId ServerIntangibleObjectTemplate::_SimpleIngredient::getName(bool versionOk, bool testData) const { +#ifdef _DEBUG +StringId testDataValue = DefaultStringId; +#else +UNREF(testData); +#endif + const ServerIntangibleObjectTemplate::_SimpleIngredient * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getName(true); +#endif } if (!m_name.isLoaded()) @@ -1109,16 +1341,31 @@ const StringId ServerIntangibleObjectTemplate::_SimpleIngredient::getName(bool v } const StringId value = m_name.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerIntangibleObjectTemplate::_SimpleIngredient::getName -const std::string & ServerIntangibleObjectTemplate::_SimpleIngredient::getIngredient(bool versionOk) const +const std::string & ServerIntangibleObjectTemplate::_SimpleIngredient::getIngredient(bool versionOk, bool testData) const { +#ifdef _DEBUG +std::string testDataValue = DefaultString; +#else +UNREF(testData); +#endif + const ServerIntangibleObjectTemplate::_SimpleIngredient * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getIngredient(true); +#endif } if (!m_ingredient.isLoaded()) @@ -1136,16 +1383,31 @@ const std::string & ServerIntangibleObjectTemplate::_SimpleIngredient::getIngred } const std::string & value = m_ingredient.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerIntangibleObjectTemplate::_SimpleIngredient::getIngredient -int ServerIntangibleObjectTemplate::_SimpleIngredient::getCount(bool versionOk) const +int ServerIntangibleObjectTemplate::_SimpleIngredient::getCount(bool versionOk, bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerIntangibleObjectTemplate::_SimpleIngredient * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getCount(true); +#endif } if (!m_count.isLoaded()) @@ -1185,16 +1447,31 @@ int ServerIntangibleObjectTemplate::_SimpleIngredient::getCount(bool versionOk) else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerIntangibleObjectTemplate::_SimpleIngredient::getCount -int ServerIntangibleObjectTemplate::_SimpleIngredient::getCountMin(bool versionOk) const +int ServerIntangibleObjectTemplate::_SimpleIngredient::getCountMin(bool versionOk, bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerIntangibleObjectTemplate::_SimpleIngredient * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getCountMin(true); +#endif } if (!m_count.isLoaded()) @@ -1234,16 +1511,31 @@ int ServerIntangibleObjectTemplate::_SimpleIngredient::getCountMin(bool versionO else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerIntangibleObjectTemplate::_SimpleIngredient::getCountMin -int ServerIntangibleObjectTemplate::_SimpleIngredient::getCountMax(bool versionOk) const +int ServerIntangibleObjectTemplate::_SimpleIngredient::getCountMax(bool versionOk, bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerIntangibleObjectTemplate::_SimpleIngredient * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getCountMax(true); +#endif } if (!m_count.isLoaded()) @@ -1283,10 +1575,28 @@ int ServerIntangibleObjectTemplate::_SimpleIngredient::getCountMax(bool versionO else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerIntangibleObjectTemplate::_SimpleIngredient::getCountMax +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void ServerIntangibleObjectTemplate::_SimpleIngredient::testValues(void) const +{ + IGNORE_RETURN(getName(true)); + IGNORE_RETURN(getIngredient(true)); + IGNORE_RETURN(getCountMin(true)); + IGNORE_RETURN(getCountMax(true)); +} // ServerIntangibleObjectTemplate::_SimpleIngredient::testValues +#endif + /** * Loads the template data from an iff file. We should already be in the form * for this template. @@ -1295,8 +1605,8 @@ int ServerIntangibleObjectTemplate::_SimpleIngredient::getCountMax(bool versionO */ void ServerIntangibleObjectTemplate::_SimpleIngredient::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; file.enterForm(); @@ -1320,4 +1630,4 @@ void ServerIntangibleObjectTemplate::_SimpleIngredient::load(Iff &file) UNREF(file); } // ServerIntangibleObjectTemplate::_SimpleIngredient::load -//@END TFD \ No newline at end of file +//@END TFD diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerIntangibleObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerIntangibleObjectTemplate.h old mode 100755 new mode 100644 index d0123ce1..6c9bf227 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerIntangibleObjectTemplate.h +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerIntangibleObjectTemplate.h @@ -96,12 +96,17 @@ protected: virtual Tag getId(void) const; public: - const StringId getName(bool versionOk) const; - const std::string & getIngredient(bool versionOk) const; - int getCount(bool versionOk) const; - int getCountMin(bool versionOk) const; - int getCountMax(bool versionOk) const; + const StringId getName(bool versionOk, bool testData = false) const; + const std::string & getIngredient(bool versionOk, bool testData = false) const; + int getCount(bool versionOk, bool testData = false) const; + int getCountMin(bool versionOk, bool testData = false) const; + int getCountMax(bool versionOk, bool testData = false) const; +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); @@ -135,16 +140,21 @@ private: virtual Tag getId(void) const; public: - IngredientType getIngredientType(bool versionOk) const; + IngredientType getIngredientType(bool versionOk, bool testData = false) const; void getIngredients(SimpleIngredient &data, int index, bool versionOk) const; void getIngredientsMin(SimpleIngredient &data, int index, bool versionOk) const; void getIngredientsMax(SimpleIngredient &data, int index, bool versionOk) const; size_t getIngredientsCount(void) const; - float getComplexity(bool versionOk) const; - float getComplexityMin(bool versionOk) const; - float getComplexityMax(bool versionOk) const; - const std::string & getSkillCommand(bool versionOk) const; + float getComplexity(bool versionOk, bool testData = false) const; + float getComplexityMin(bool versionOk, bool testData = false) const; + float getComplexityMax(bool versionOk, bool testData = false) const; + const std::string & getSkillCommand(bool versionOk, bool testData = false) const; +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); @@ -181,11 +191,16 @@ private: virtual Tag getId(void) const; public: - const StringId getName(bool versionOk) const; - int getValue(bool versionOk) const; - int getValueMin(bool versionOk) const; - int getValueMax(bool versionOk) const; + const StringId getName(bool versionOk, bool testData = false) const; + int getValue(bool versionOk, bool testData = false) const; + int getValueMin(bool versionOk, bool testData = false) const; + int getValueMax(bool versionOk, bool testData = false) const; +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); @@ -203,10 +218,15 @@ private: friend class ServerIntangibleObjectTemplate::_SchematicAttribute; public: - int getCount() const; - int getCountMin() const; - int getCountMax() const; + int getCount(bool testData = false) const; + int getCountMin(bool testData = false) const; + int getCountMax(bool testData = false) const; +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerManufactureInstallationObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerManufactureInstallationObjectTemplate.cpp old mode 100755 new mode 100644 index d58f2225..57b70459 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerManufactureInstallationObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerManufactureInstallationObjectTemplate.cpp @@ -22,20 +22,20 @@ const std::string DefaultString(""); const StringId DefaultStringId("", 0); -const Vector DefaultVector(0, 0, 0); +const Vector DefaultVector(0,0,0); const TriggerVolumeData DefaultTriggerVolumeData; bool ServerManufactureInstallationObjectTemplate::ms_allowDefaultTemplateParams = true; + /** * Class constructor. */ ServerManufactureInstallationObjectTemplate::ServerManufactureInstallationObjectTemplate(const std::string & filename) //@BEGIN TFD INIT : ServerInstallationObjectTemplate(filename) - , m_versionOk(true) - , m_templateVersion(0) - //@END TFD INIT + ,m_versionOk(true) +//@END TFD INIT { } // ServerManufactureInstallationObjectTemplate::ServerManufactureInstallationObjectTemplate @@ -44,8 +44,8 @@ ServerManufactureInstallationObjectTemplate::ServerManufactureInstallationObject */ ServerManufactureInstallationObjectTemplate::~ServerManufactureInstallationObjectTemplate() { - //@BEGIN TFD CLEANUP - //@END TFD CLEANUP +//@BEGIN TFD CLEANUP +//@END TFD CLEANUP } // ServerManufactureInstallationObjectTemplate::~ServerManufactureInstallationObjectTemplate /** @@ -93,10 +93,10 @@ Tag ServerManufactureInstallationObjectTemplate::getTemplateVersion(void) const */ Tag ServerManufactureInstallationObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerManufactureInstallationObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerManufactureInstallationObjectTemplate::getHighestTemplateVersion @@ -112,6 +112,15 @@ Object * ServerManufactureInstallationObjectTemplate::createObject(void) const } // ServerManufactureInstallationObjectTemplate::createObject //@BEGIN TFD +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void ServerManufactureInstallationObjectTemplate::testValues(void) const +{ + ServerInstallationObjectTemplate::testValues(); +} // ServerManufactureInstallationObjectTemplate::testValues +#endif /** * Loads the template data from an iff file. We should already be in the form @@ -121,8 +130,8 @@ Object * ServerManufactureInstallationObjectTemplate::createObject(void) const */ void ServerManufactureInstallationObjectTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != ServerManufactureInstallationObjectTemplate_tag) { @@ -132,7 +141,7 @@ void ServerManufactureInstallationObjectTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -152,8 +161,10 @@ void ServerManufactureInstallationObjectTemplate::load(Iff &file) file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 0, 0)) + if (getHighestTemplateVersion() != TAG(0,0,0,0)) { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); m_versionOk = false; } @@ -171,4 +182,4 @@ void ServerManufactureInstallationObjectTemplate::load(Iff &file) return; } // ServerManufactureInstallationObjectTemplate::load -//@END TFD \ No newline at end of file +//@END TFD diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerManufactureInstallationObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerManufactureInstallationObjectTemplate.h old mode 100755 new mode 100644 index 285b09f0..6829674e --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerManufactureInstallationObjectTemplate.h +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerManufactureInstallationObjectTemplate.h @@ -45,6 +45,11 @@ public: //@BEGIN TFD public: +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerManufactureSchematicObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerManufactureSchematicObjectTemplate.cpp old mode 100755 new mode 100644 index 177c7aa8..67025cdc --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerManufactureSchematicObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerManufactureSchematicObjectTemplate.cpp @@ -22,24 +22,24 @@ const std::string DefaultString(""); const StringId DefaultStringId("", 0); -const Vector DefaultVector(0, 0, 0); +const Vector DefaultVector(0,0,0); const TriggerVolumeData DefaultTriggerVolumeData; bool ServerManufactureSchematicObjectTemplate::ms_allowDefaultTemplateParams = true; + /** * Class constructor. */ ServerManufactureSchematicObjectTemplate::ServerManufactureSchematicObjectTemplate(const std::string & filename) //@BEGIN TFD INIT : ServerIntangibleObjectTemplate(filename) - , m_ingredientsLoaded(false) - , m_ingredientsAppend(false) - , m_attributesLoaded(false) - , m_attributesAppend(false) - , m_versionOk(true) - , m_templateVersion(0) - //@END TFD INIT + ,m_ingredientsLoaded(false) + ,m_ingredientsAppend(false) + ,m_attributesLoaded(false) + ,m_attributesAppend(false) + ,m_versionOk(true) +//@END TFD INIT { } // ServerManufactureSchematicObjectTemplate::ServerManufactureSchematicObjectTemplate @@ -48,7 +48,7 @@ ServerManufactureSchematicObjectTemplate::ServerManufactureSchematicObjectTempla */ ServerManufactureSchematicObjectTemplate::~ServerManufactureSchematicObjectTemplate() { - //@BEGIN TFD CLEANUP +//@BEGIN TFD CLEANUP { std::vector::iterator iter; for (iter = m_ingredients.begin(); iter != m_ingredients.end(); ++iter) @@ -67,7 +67,7 @@ ServerManufactureSchematicObjectTemplate::~ServerManufactureSchematicObjectTempl } m_attributes.clear(); } - //@END TFD CLEANUP +//@END TFD CLEANUP } // ServerManufactureSchematicObjectTemplate::~ServerManufactureSchematicObjectTemplate /** @@ -115,24 +115,24 @@ Tag ServerManufactureSchematicObjectTemplate::getTemplateVersion(void) const */ Tag ServerManufactureSchematicObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerManufactureSchematicObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerManufactureSchematicObjectTemplate::getHighestTemplateVersion /** * Called when the game tries to create a manf schematic via the default method. - * Manf must be created via a draft schematic, so we always return nullptr; + * Manf must be created via a draft schematic, so we always return NULL; * * @return the object */ Object * ServerManufactureSchematicObjectTemplate::createObject(void) const { - // WARNING(true, ("Someone is trying to create a manf schematic without a " - // "draft schematic source!")); +// WARNING(true, ("Someone is trying to create a manf schematic without a " +// "draft schematic source!")); return new ManufactureSchematicObject(this); } // ServerManufactureSchematicObjectTemplate::createObject @@ -146,17 +146,17 @@ Object * ServerManufactureSchematicObjectTemplate::createObject(const char *cons const ObjectTemplate *const objectTemplate = ObjectTemplateList::fetch(fileName); if (objectTemplate) { - Object * object = nullptr; - const ServerManufactureSchematicObjectTemplate * const manfTemplate = + Object * object = NULL; + const ServerManufactureSchematicObjectTemplate * const manfTemplate = dynamic_cast( - objectTemplate); - if (manfTemplate != nullptr) + objectTemplate); + if (manfTemplate != NULL) object = manfTemplate->createObject(schematic); - objectTemplate->releaseReference(); + objectTemplate->releaseReference (); return object; } - return nullptr; + return NULL; } // ServerManufactureSchematicObjectTemplate::createObject /** @@ -170,12 +170,22 @@ Object * ServerManufactureSchematicObjectTemplate::createObject(const DraftSchem } // ServerManufactureSchematicObjectTemplate::createObject //@BEGIN TFD -const std::string & ServerManufactureSchematicObjectTemplate::getDraftSchematic() const +const std::string & ServerManufactureSchematicObjectTemplate::getDraftSchematic(bool testData) const { +#ifdef _DEBUG +std::string testDataValue = DefaultString; +#else +UNREF(testData); +#endif + const ServerManufactureSchematicObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getDraftSchematic(true); +#endif } if (!m_draftSchematic.isLoaded()) @@ -193,16 +203,31 @@ const std::string & ServerManufactureSchematicObjectTemplate::getDraftSchematic( } const std::string & value = m_draftSchematic.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerManufactureSchematicObjectTemplate::getDraftSchematic -const std::string & ServerManufactureSchematicObjectTemplate::getCreator() const +const std::string & ServerManufactureSchematicObjectTemplate::getCreator(bool testData) const { +#ifdef _DEBUG +std::string testDataValue = DefaultString; +#else +UNREF(testData); +#endif + const ServerManufactureSchematicObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getCreator(true); +#endif } if (!m_creator.isLoaded()) @@ -220,6 +245,11 @@ const std::string & ServerManufactureSchematicObjectTemplate::getCreator() const } const std::string & value = m_creator.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerManufactureSchematicObjectTemplate::getCreator @@ -237,7 +267,7 @@ void ServerManufactureSchematicObjectTemplate::getIngredients(IngredientSlot &da if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter ingredients in template %s", DataResource::getName())); - return; + return ; } else { @@ -251,10 +281,10 @@ void ServerManufactureSchematicObjectTemplate::getIngredients(IngredientSlot &da { int baseCount = base->getIngredientsCount(); if (index < baseCount) - { - base->getIngredients(data, index); - return; - } + { + base->getIngredients(data, index); + return; + } index -= baseCount; } @@ -280,7 +310,7 @@ void ServerManufactureSchematicObjectTemplate::getIngredientsMin(IngredientSlot if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter ingredients in template %s", DataResource::getName())); - return; + return ; } else { @@ -294,10 +324,10 @@ void ServerManufactureSchematicObjectTemplate::getIngredientsMin(IngredientSlot { int baseCount = base->getIngredientsCount(); if (index < baseCount) - { - base->getIngredientsMin(data, index); - return; - } + { + base->getIngredientsMin(data, index); + return; + } index -= baseCount; } @@ -323,7 +353,7 @@ void ServerManufactureSchematicObjectTemplate::getIngredientsMax(IngredientSlot if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter ingredients in template %s", DataResource::getName())); - return; + return ; } else { @@ -337,10 +367,10 @@ void ServerManufactureSchematicObjectTemplate::getIngredientsMax(IngredientSlot { int baseCount = base->getIngredientsCount(); if (index < baseCount) - { - base->getIngredientsMax(data, index); - return; - } + { + base->getIngredientsMax(data, index); + return; + } index -= baseCount; } @@ -377,12 +407,22 @@ size_t ServerManufactureSchematicObjectTemplate::getIngredientsCount(void) const return count; } // ServerManufactureSchematicObjectTemplate::getIngredientsCount -int ServerManufactureSchematicObjectTemplate::getItemCount() const +int ServerManufactureSchematicObjectTemplate::getItemCount(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerManufactureSchematicObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getItemCount(true); +#endif } if (!m_itemCount.isLoaded()) @@ -422,16 +462,31 @@ int ServerManufactureSchematicObjectTemplate::getItemCount() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerManufactureSchematicObjectTemplate::getItemCount -int ServerManufactureSchematicObjectTemplate::getItemCountMin() const +int ServerManufactureSchematicObjectTemplate::getItemCountMin(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerManufactureSchematicObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getItemCountMin(true); +#endif } if (!m_itemCount.isLoaded()) @@ -471,16 +526,31 @@ int ServerManufactureSchematicObjectTemplate::getItemCountMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerManufactureSchematicObjectTemplate::getItemCountMin -int ServerManufactureSchematicObjectTemplate::getItemCountMax() const +int ServerManufactureSchematicObjectTemplate::getItemCountMax(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerManufactureSchematicObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getItemCountMax(true); +#endif } if (!m_itemCount.isLoaded()) @@ -520,6 +590,11 @@ int ServerManufactureSchematicObjectTemplate::getItemCountMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerManufactureSchematicObjectTemplate::getItemCountMax @@ -537,7 +612,7 @@ void ServerManufactureSchematicObjectTemplate::getAttributes(SchematicAttribute if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter attributes in template %s", DataResource::getName())); - return; + return ; } else { @@ -551,10 +626,10 @@ void ServerManufactureSchematicObjectTemplate::getAttributes(SchematicAttribute { int baseCount = base->getAttributesCount(); if (index < baseCount) - { - base->getAttributes(data, index); - return; - } + { + base->getAttributes(data, index); + return; + } index -= baseCount; } @@ -580,7 +655,7 @@ void ServerManufactureSchematicObjectTemplate::getAttributesMin(SchematicAttribu if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter attributes in template %s", DataResource::getName())); - return; + return ; } else { @@ -594,10 +669,10 @@ void ServerManufactureSchematicObjectTemplate::getAttributesMin(SchematicAttribu { int baseCount = base->getAttributesCount(); if (index < baseCount) - { - base->getAttributesMin(data, index); - return; - } + { + base->getAttributesMin(data, index); + return; + } index -= baseCount; } @@ -623,7 +698,7 @@ void ServerManufactureSchematicObjectTemplate::getAttributesMax(SchematicAttribu if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter attributes in template %s", DataResource::getName())); - return; + return ; } else { @@ -637,10 +712,10 @@ void ServerManufactureSchematicObjectTemplate::getAttributesMax(SchematicAttribu { int baseCount = base->getAttributesCount(); if (index < baseCount) - { - base->getAttributesMax(data, index); - return; - } + { + base->getAttributesMax(data, index); + return; + } index -= baseCount; } @@ -677,6 +752,20 @@ size_t ServerManufactureSchematicObjectTemplate::getAttributesCount(void) const return count; } // ServerManufactureSchematicObjectTemplate::getAttributesCount +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void ServerManufactureSchematicObjectTemplate::testValues(void) const +{ + IGNORE_RETURN(getDraftSchematic(true)); + IGNORE_RETURN(getCreator(true)); + IGNORE_RETURN(getItemCountMin(true)); + IGNORE_RETURN(getItemCountMax(true)); + ServerIntangibleObjectTemplate::testValues(); +} // ServerManufactureSchematicObjectTemplate::testValues +#endif + /** * Loads the template data from an iff file. We should already be in the form * for this template. @@ -685,8 +774,8 @@ size_t ServerManufactureSchematicObjectTemplate::getAttributesCount(void) const */ void ServerManufactureSchematicObjectTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != ServerManufactureSchematicObjectTemplate_tag) { @@ -696,7 +785,7 @@ void ServerManufactureSchematicObjectTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -716,8 +805,10 @@ void ServerManufactureSchematicObjectTemplate::load(Iff &file) file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 0, 0)) + if (getHighestTemplateVersion() != TAG(0,0,0,0)) { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); m_versionOk = false; } @@ -783,6 +874,7 @@ void ServerManufactureSchematicObjectTemplate::load(Iff &file) return; } // ServerManufactureSchematicObjectTemplate::load + //============================================================================= // class ServerManufactureSchematicObjectTemplate::_IngredientSlot @@ -829,12 +921,22 @@ Tag ServerManufactureSchematicObjectTemplate::_IngredientSlot::getId(void) const return _IngredientSlot_tag; } // ServerManufactureSchematicObjectTemplate::_IngredientSlot::getId -const StringId ServerManufactureSchematicObjectTemplate::_IngredientSlot::getName(bool versionOk) const +const StringId ServerManufactureSchematicObjectTemplate::_IngredientSlot::getName(bool versionOk, bool testData) const { +#ifdef _DEBUG +StringId testDataValue = DefaultStringId; +#else +UNREF(testData); +#endif + const ServerManufactureSchematicObjectTemplate::_IngredientSlot * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getName(true); +#endif } if (!m_name.isLoaded()) @@ -852,6 +954,11 @@ const StringId ServerManufactureSchematicObjectTemplate::_IngredientSlot::getNam } const StringId value = m_name.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerManufactureSchematicObjectTemplate::_IngredientSlot::getName @@ -869,7 +976,7 @@ void ServerManufactureSchematicObjectTemplate::_IngredientSlot::getIngredient(In if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter ingredient in template %s", DataResource::getName())); - return; + return ; } else { @@ -908,7 +1015,7 @@ void ServerManufactureSchematicObjectTemplate::_IngredientSlot::getIngredientMin if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter ingredient in template %s", DataResource::getName())); - return; + return ; } else { @@ -947,7 +1054,7 @@ void ServerManufactureSchematicObjectTemplate::_IngredientSlot::getIngredientMax if (ms_allowDefaultTemplateParams && /*!versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter ingredient in template %s", DataResource::getName())); - return; + return ; } else { @@ -973,6 +1080,16 @@ void ServerManufactureSchematicObjectTemplate::_IngredientSlot::getIngredientMax data.skillCommand = param->getSkillCommand(versionOk); } // ServerManufactureSchematicObjectTemplate::_IngredientSlot::getIngredientMax +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void ServerManufactureSchematicObjectTemplate::_IngredientSlot::testValues(void) const +{ + IGNORE_RETURN(getName(true)); +} // ServerManufactureSchematicObjectTemplate::_IngredientSlot::testValues +#endif + /** * Loads the template data from an iff file. We should already be in the form * for this template. @@ -981,8 +1098,8 @@ void ServerManufactureSchematicObjectTemplate::_IngredientSlot::getIngredientMax */ void ServerManufactureSchematicObjectTemplate::_IngredientSlot::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; file.enterForm(); @@ -1004,4 +1121,4 @@ void ServerManufactureSchematicObjectTemplate::_IngredientSlot::load(Iff &file) UNREF(file); } // ServerManufactureSchematicObjectTemplate::_IngredientSlot::load -//@END TFD \ No newline at end of file +//@END TFD diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerManufactureSchematicObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerManufactureSchematicObjectTemplate.h old mode 100755 new mode 100644 index 94adef16..d7853c72 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerManufactureSchematicObjectTemplate.h +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerManufactureSchematicObjectTemplate.h @@ -68,11 +68,16 @@ protected: virtual Tag getId(void) const; public: - const StringId getName(bool versionOk) const; + const StringId getName(bool versionOk, bool testData = false) const; void getIngredient(Ingredient &data, bool versionOk) const; void getIngredientMin(Ingredient &data, bool versionOk) const; void getIngredientMax(Ingredient &data, bool versionOk) const; +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); @@ -90,20 +95,25 @@ private: friend class ServerManufactureSchematicObjectTemplate::_IngredientSlot; public: - const std::string & getDraftSchematic() const; - const std::string & getCreator() const; + const std::string & getDraftSchematic(bool testData = false) const; + const std::string & getCreator(bool testData = false) const; void getIngredients(IngredientSlot &data, int index) const; void getIngredientsMin(IngredientSlot &data, int index) const; void getIngredientsMax(IngredientSlot &data, int index) const; size_t getIngredientsCount(void) const; - int getItemCount() const; - int getItemCountMin() const; - int getItemCountMax() const; + int getItemCount(bool testData = false) const; + int getItemCountMin(bool testData = false) const; + int getItemCountMax(bool testData = false) const; void getAttributes(SchematicAttribute &data, int index) const; void getAttributesMin(SchematicAttribute &data, int index) const; void getAttributesMax(SchematicAttribute &data, int index) const; size_t getAttributesCount(void) const; +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerMissionBoardObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerMissionBoardObjectTemplate.cpp new file mode 100644 index 00000000..f37c4bc1 --- /dev/null +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerMissionBoardObjectTemplate.cpp @@ -0,0 +1,176 @@ +//======================================================================== +// +// ServerMissionBoardObjectTemplate.cpp +// +//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be +//overwritten the next time the template definition is compiled. Do not +//make changes to code inside these blocks. +// +// copyright 2001 Sony Online Entertainment +// +//======================================================================== + +#include "serverGame/FirstServerGame.h" +#include "ServerMissionBoardObjectTemplate.h" +#include "sharedDebug/DataLint.h" +#include "sharedFile/Iff.h" +#include "sharedObject/ObjectTemplate.h" +#include "sharedObject/ObjectTemplateList.h" +#include "sharedMath/Vector.h" +//@BEGIN TFD TEMPLATE REFS +//@END TFD TEMPLATE REFS +#include + +const std::string DefaultString(""); +const StringId DefaultStringId("", 0); +const Vector DefaultVector(0,0,0); +const TriggerVolumeData DefaultTriggerVolumeData; + +bool ServerMissionBoardObjectTemplate::ms_allowDefaultTemplateParams = true; + + +/** + * Class constructor. + */ +ServerMissionBoardObjectTemplate::ServerMissionBoardObjectTemplate(const std::string & filename) +//@BEGIN TFD INIT + : ServerUniverseObjectTemplate(filename) + ,m_versionOk(true) +//@END TFD INIT +{ +} // ServerMissionBoardObjectTemplate::ServerMissionBoardObjectTemplate + +/** + * Class destructor. + */ +ServerMissionBoardObjectTemplate::~ServerMissionBoardObjectTemplate() +{ +//@BEGIN TFD CLEANUP +//@END TFD CLEANUP +} // ServerMissionBoardObjectTemplate::~ServerMissionBoardObjectTemplate + +/** + * Static function used to register this template. + */ +void ServerMissionBoardObjectTemplate::registerMe(void) +{ + ObjectTemplateList::registerTemplate(ServerMissionBoardObjectTemplate_tag, create); +} // ServerMissionBoardObjectTemplate::registerMe + +/** + * Creates a ServerMissionBoardObjectTemplate template. + * + * @return a new instance of the template + */ +ObjectTemplate * ServerMissionBoardObjectTemplate::create(const std::string & filename) +{ + return new ServerMissionBoardObjectTemplate(filename); +} // ServerMissionBoardObjectTemplate::create + +/** + * Returns the template id. + * + * @return the template id + */ +Tag ServerMissionBoardObjectTemplate::getId(void) const +{ + return ServerMissionBoardObjectTemplate_tag; +} // ServerMissionBoardObjectTemplate::getId + +/** + * Returns this template's version. + * + * @return the version + */ +Tag ServerMissionBoardObjectTemplate::getTemplateVersion(void) const +{ + return m_templateVersion; +} // ServerMissionBoardObjectTemplate::getTemplateVersion + +/** + * Returns the highest version of this template or it's base templates. + * + * @return the highest version + */ +Tag ServerMissionBoardObjectTemplate::getHighestTemplateVersion(void) const +{ + if (m_baseData == nullptr) + return m_templateVersion; + const ServerMissionBoardObjectTemplate * base = dynamic_cast(m_baseData); + if (base == nullptr) + return m_templateVersion; + return std::max(m_templateVersion, base->getHighestTemplateVersion()); +} // ServerMissionBoardObjectTemplate::getHighestTemplateVersion + +//@BEGIN TFD +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void ServerMissionBoardObjectTemplate::testValues(void) const +{ + ServerUniverseObjectTemplate::testValues(); +} // ServerMissionBoardObjectTemplate::testValues +#endif + +/** + * Loads the template data from an iff file. We should already be in the form + * for this template. + * + * @param file file to load from + */ +void ServerMissionBoardObjectTemplate::load(Iff &file) +{ +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; + + if (file.getCurrentName() != ServerMissionBoardObjectTemplate_tag) + { + ServerUniverseObjectTemplate::load(file); + return; + } + + file.enterForm(); + m_templateVersion = file.getCurrentName(); + if (m_templateVersion == TAG(D,E,R,V)) + { + file.enterForm(); + file.enterChunk(); + std::string baseFilename; + file.read_string(baseFilename); + file.exitChunk(); + const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) + base->releaseReference(); + else + { + if (m_baseData != nullptr) + m_baseData->releaseReference(); + m_baseData = base; + } + file.exitForm(); + m_templateVersion = file.getCurrentName(); + } + if (getHighestTemplateVersion() != TAG(0,0,0,0)) + { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); + m_versionOk = false; + } + + file.enterForm(); + + file.enterChunk(); + int paramCount = file.read_int32(); + file.exitChunk(); + UNREF(paramName); + UNREF(paramCount); + + file.exitForm(); + ServerUniverseObjectTemplate::load(file); + file.exitForm(); + return; +} // ServerMissionBoardObjectTemplate::load + +//@END TFD diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerMissionBoardObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerMissionBoardObjectTemplate.h new file mode 100644 index 00000000..3d8f434d --- /dev/null +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerMissionBoardObjectTemplate.h @@ -0,0 +1,83 @@ +//======================================================================== +// +// ServerMissionBoardObjectTemplate.h +// +//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be +//overwritten the next time the template definition is compiled. Do not +//make changes to code inside these blocks. +// +// copyright 2001 Sony Online Entertainment +// +//======================================================================== + +#ifndef _INCLUDED_ServerMissionBoardObjectTemplate_H +#define _INCLUDED_ServerMissionBoardObjectTemplate_H + +#include "ServerUniverseObjectTemplate.h" +#include "sharedFoundation/DynamicVariable.h" +#include "sharedUtility/TemplateParameter.h" + + +class Vector; +typedef StructParam StructParamOT; +//@BEGIN TFD TEMPLATE REFS +//@END TFD TEMPLATE REFS + + +class ServerMissionBoardObjectTemplate : public ServerUniverseObjectTemplate +{ +public: +//@BEGIN TFD ID + enum + { + ServerMissionBoardObjectTemplate_tag = TAG(M,I,S,B) + }; +//@END TFD ID +public: + ServerMissionBoardObjectTemplate(const std::string & filename); + virtual ~ServerMissionBoardObjectTemplate(); + + virtual Tag getId(void) const; + virtual Tag getTemplateVersion(void) const; + virtual Tag getHighestTemplateVersion(void) const; + static void install(bool allowDefaultTemplateParams = true); + +//@BEGIN TFD +public: + +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif + +protected: + virtual void load(Iff &file); + +private: +//@END TFD + +private: + Tag m_templateVersion; // the template version + bool m_versionOk; // flag that the template version loaded is the one we expect + static bool ms_allowDefaultTemplateParams; // flag to allow defaut params instead of fataling + + static void registerMe(void); + static ObjectTemplate * create(const std::string & filename); + + // no copying + ServerMissionBoardObjectTemplate(const ServerMissionBoardObjectTemplate &); + ServerMissionBoardObjectTemplate & operator =(const ServerMissionBoardObjectTemplate &); +}; + + +inline void ServerMissionBoardObjectTemplate::install(bool allowDefaultTemplateParams) +{ + ms_allowDefaultTemplateParams = allowDefaultTemplateParams; +//@BEGIN TFD INSTALL + ServerMissionBoardObjectTemplate::registerMe(); +//@END TFD INSTALL +} + + +#endif // _INCLUDED_ServerMissionBoardObjectTemplate_H diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerMissionDataObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerMissionDataObjectTemplate.cpp new file mode 100644 index 00000000..b594ed79 --- /dev/null +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerMissionDataObjectTemplate.cpp @@ -0,0 +1,176 @@ +//======================================================================== +// +// ServerMissionDataObjectTemplate.cpp +// +//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be +//overwritten the next time the template definition is compiled. Do not +//make changes to code inside these blocks. +// +// copyright 2001 Sony Online Entertainment +// +//======================================================================== + +#include "serverGame/FirstServerGame.h" +#include "ServerMissionDataObjectTemplate.h" +#include "sharedDebug/DataLint.h" +#include "sharedFile/Iff.h" +#include "sharedObject/ObjectTemplate.h" +#include "sharedObject/ObjectTemplateList.h" +#include "sharedMath/Vector.h" +//@BEGIN TFD TEMPLATE REFS +//@END TFD TEMPLATE REFS +#include + +const std::string DefaultString(""); +const StringId DefaultStringId("", 0); +const Vector DefaultVector(0,0,0); +const TriggerVolumeData DefaultTriggerVolumeData; + +bool ServerMissionDataObjectTemplate::ms_allowDefaultTemplateParams = true; + + +/** + * Class constructor. + */ +ServerMissionDataObjectTemplate::ServerMissionDataObjectTemplate(const std::string & filename) +//@BEGIN TFD INIT + : ServerIntangibleObjectTemplate(filename) + ,m_versionOk(true) +//@END TFD INIT +{ +} // ServerMissionDataObjectTemplate::ServerMissionDataObjectTemplate + +/** + * Class destructor. + */ +ServerMissionDataObjectTemplate::~ServerMissionDataObjectTemplate() +{ +//@BEGIN TFD CLEANUP +//@END TFD CLEANUP +} // ServerMissionDataObjectTemplate::~ServerMissionDataObjectTemplate + +/** + * Static function used to register this template. + */ +void ServerMissionDataObjectTemplate::registerMe(void) +{ + ObjectTemplateList::registerTemplate(ServerMissionDataObjectTemplate_tag, create); +} // ServerMissionDataObjectTemplate::registerMe + +/** + * Creates a ServerMissionDataObjectTemplate template. + * + * @return a new instance of the template + */ +ObjectTemplate * ServerMissionDataObjectTemplate::create(const std::string & filename) +{ + return new ServerMissionDataObjectTemplate(filename); +} // ServerMissionDataObjectTemplate::create + +/** + * Returns the template id. + * + * @return the template id + */ +Tag ServerMissionDataObjectTemplate::getId(void) const +{ + return ServerMissionDataObjectTemplate_tag; +} // ServerMissionDataObjectTemplate::getId + +/** + * Returns this template's version. + * + * @return the version + */ +Tag ServerMissionDataObjectTemplate::getTemplateVersion(void) const +{ + return m_templateVersion; +} // ServerMissionDataObjectTemplate::getTemplateVersion + +/** + * Returns the highest version of this template or it's base templates. + * + * @return the highest version + */ +Tag ServerMissionDataObjectTemplate::getHighestTemplateVersion(void) const +{ + if (m_baseData == nullptr) + return m_templateVersion; + const ServerMissionDataObjectTemplate * base = dynamic_cast(m_baseData); + if (base == nullptr) + return m_templateVersion; + return std::max(m_templateVersion, base->getHighestTemplateVersion()); +} // ServerMissionDataObjectTemplate::getHighestTemplateVersion + +//@BEGIN TFD +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void ServerMissionDataObjectTemplate::testValues(void) const +{ + ServerIntangibleObjectTemplate::testValues(); +} // ServerMissionDataObjectTemplate::testValues +#endif + +/** + * Loads the template data from an iff file. We should already be in the form + * for this template. + * + * @param file file to load from + */ +void ServerMissionDataObjectTemplate::load(Iff &file) +{ +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; + + if (file.getCurrentName() != ServerMissionDataObjectTemplate_tag) + { + ServerIntangibleObjectTemplate::load(file); + return; + } + + file.enterForm(); + m_templateVersion = file.getCurrentName(); + if (m_templateVersion == TAG(D,E,R,V)) + { + file.enterForm(); + file.enterChunk(); + std::string baseFilename; + file.read_string(baseFilename); + file.exitChunk(); + const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) + base->releaseReference(); + else + { + if (m_baseData != nullptr) + m_baseData->releaseReference(); + m_baseData = base; + } + file.exitForm(); + m_templateVersion = file.getCurrentName(); + } + if (getHighestTemplateVersion() != TAG(0,0,0,0)) + { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); + m_versionOk = false; + } + + file.enterForm(); + + file.enterChunk(); + int paramCount = file.read_int32(); + file.exitChunk(); + UNREF(paramName); + UNREF(paramCount); + + file.exitForm(); + ServerIntangibleObjectTemplate::load(file); + file.exitForm(); + return; +} // ServerMissionDataObjectTemplate::load + +//@END TFD diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerMissionDataObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerMissionDataObjectTemplate.h new file mode 100644 index 00000000..8f0cc305 --- /dev/null +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerMissionDataObjectTemplate.h @@ -0,0 +1,83 @@ +//======================================================================== +// +// ServerMissionDataObjectTemplate.h +// +//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be +//overwritten the next time the template definition is compiled. Do not +//make changes to code inside these blocks. +// +// copyright 2001 Sony Online Entertainment +// +//======================================================================== + +#ifndef _INCLUDED_ServerMissionDataObjectTemplate_H +#define _INCLUDED_ServerMissionDataObjectTemplate_H + +#include "ServerIntangibleObjectTemplate.h" +#include "sharedFoundation/DynamicVariable.h" +#include "sharedUtility/TemplateParameter.h" + + +class Vector; +typedef StructParam StructParamOT; +//@BEGIN TFD TEMPLATE REFS +//@END TFD TEMPLATE REFS + + +class ServerMissionDataObjectTemplate : public ServerIntangibleObjectTemplate +{ +public: +//@BEGIN TFD ID + enum + { + ServerMissionDataObjectTemplate_tag = TAG(M,I,S,D) + }; +//@END TFD ID +public: + ServerMissionDataObjectTemplate(const std::string & filename); + virtual ~ServerMissionDataObjectTemplate(); + + virtual Tag getId(void) const; + virtual Tag getTemplateVersion(void) const; + virtual Tag getHighestTemplateVersion(void) const; + static void install(bool allowDefaultTemplateParams = true); + +//@BEGIN TFD +public: + +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif + +protected: + virtual void load(Iff &file); + +private: +//@END TFD + +private: + Tag m_templateVersion; // the template version + bool m_versionOk; // flag that the template version loaded is the one we expect + static bool ms_allowDefaultTemplateParams; // flag to allow defaut params instead of fataling + + static void registerMe(void); + static ObjectTemplate * create(const std::string & filename); + + // no copying + ServerMissionDataObjectTemplate(const ServerMissionDataObjectTemplate &); + ServerMissionDataObjectTemplate & operator =(const ServerMissionDataObjectTemplate &); +}; + + +inline void ServerMissionDataObjectTemplate::install(bool allowDefaultTemplateParams) +{ + ms_allowDefaultTemplateParams = allowDefaultTemplateParams; +//@BEGIN TFD INSTALL + ServerMissionDataObjectTemplate::registerMe(); +//@END TFD INSTALL +} + + +#endif // _INCLUDED_ServerMissionDataObjectTemplate_H diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerMissionListEntryObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerMissionListEntryObjectTemplate.cpp new file mode 100644 index 00000000..1979ebb7 --- /dev/null +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerMissionListEntryObjectTemplate.cpp @@ -0,0 +1,176 @@ +//======================================================================== +// +// ServerMissionListEntryObjectTemplate.cpp +// +//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be +//overwritten the next time the template definition is compiled. Do not +//make changes to code inside these blocks. +// +// copyright 2001 Sony Online Entertainment +// +//======================================================================== + +#include "serverGame/FirstServerGame.h" +#include "ServerMissionListEntryObjectTemplate.h" +#include "sharedDebug/DataLint.h" +#include "sharedFile/Iff.h" +#include "sharedObject/ObjectTemplate.h" +#include "sharedObject/ObjectTemplateList.h" +#include "sharedMath/Vector.h" +//@BEGIN TFD TEMPLATE REFS +//@END TFD TEMPLATE REFS +#include + +const std::string DefaultString(""); +const StringId DefaultStringId("", 0); +const Vector DefaultVector(0,0,0); +const TriggerVolumeData DefaultTriggerVolumeData; + +bool ServerMissionListEntryObjectTemplate::ms_allowDefaultTemplateParams = true; + + +/** + * Class constructor. + */ +ServerMissionListEntryObjectTemplate::ServerMissionListEntryObjectTemplate(const std::string & filename) +//@BEGIN TFD INIT + : ServerIntangibleObjectTemplate(filename) + ,m_versionOk(true) +//@END TFD INIT +{ +} // ServerMissionListEntryObjectTemplate::ServerMissionListEntryObjectTemplate + +/** + * Class destructor. + */ +ServerMissionListEntryObjectTemplate::~ServerMissionListEntryObjectTemplate() +{ +//@BEGIN TFD CLEANUP +//@END TFD CLEANUP +} // ServerMissionListEntryObjectTemplate::~ServerMissionListEntryObjectTemplate + +/** + * Static function used to register this template. + */ +void ServerMissionListEntryObjectTemplate::registerMe(void) +{ + ObjectTemplateList::registerTemplate(ServerMissionListEntryObjectTemplate_tag, create); +} // ServerMissionListEntryObjectTemplate::registerMe + +/** + * Creates a ServerMissionListEntryObjectTemplate template. + * + * @return a new instance of the template + */ +ObjectTemplate * ServerMissionListEntryObjectTemplate::create(const std::string & filename) +{ + return new ServerMissionListEntryObjectTemplate(filename); +} // ServerMissionListEntryObjectTemplate::create + +/** + * Returns the template id. + * + * @return the template id + */ +Tag ServerMissionListEntryObjectTemplate::getId(void) const +{ + return ServerMissionListEntryObjectTemplate_tag; +} // ServerMissionListEntryObjectTemplate::getId + +/** + * Returns this template's version. + * + * @return the version + */ +Tag ServerMissionListEntryObjectTemplate::getTemplateVersion(void) const +{ + return m_templateVersion; +} // ServerMissionListEntryObjectTemplate::getTemplateVersion + +/** + * Returns the highest version of this template or it's base templates. + * + * @return the highest version + */ +Tag ServerMissionListEntryObjectTemplate::getHighestTemplateVersion(void) const +{ + if (m_baseData == nullptr) + return m_templateVersion; + const ServerMissionListEntryObjectTemplate * base = dynamic_cast(m_baseData); + if (base == nullptr) + return m_templateVersion; + return std::max(m_templateVersion, base->getHighestTemplateVersion()); +} // ServerMissionListEntryObjectTemplate::getHighestTemplateVersion + +//@BEGIN TFD +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void ServerMissionListEntryObjectTemplate::testValues(void) const +{ + ServerIntangibleObjectTemplate::testValues(); +} // ServerMissionListEntryObjectTemplate::testValues +#endif + +/** + * Loads the template data from an iff file. We should already be in the form + * for this template. + * + * @param file file to load from + */ +void ServerMissionListEntryObjectTemplate::load(Iff &file) +{ +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; + + if (file.getCurrentName() != ServerMissionListEntryObjectTemplate_tag) + { + ServerIntangibleObjectTemplate::load(file); + return; + } + + file.enterForm(); + m_templateVersion = file.getCurrentName(); + if (m_templateVersion == TAG(D,E,R,V)) + { + file.enterForm(); + file.enterChunk(); + std::string baseFilename; + file.read_string(baseFilename); + file.exitChunk(); + const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) + base->releaseReference(); + else + { + if (m_baseData != nullptr) + m_baseData->releaseReference(); + m_baseData = base; + } + file.exitForm(); + m_templateVersion = file.getCurrentName(); + } + if (getHighestTemplateVersion() != TAG(0,0,0,0)) + { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); + m_versionOk = false; + } + + file.enterForm(); + + file.enterChunk(); + int paramCount = file.read_int32(); + file.exitChunk(); + UNREF(paramName); + UNREF(paramCount); + + file.exitForm(); + ServerIntangibleObjectTemplate::load(file); + file.exitForm(); + return; +} // ServerMissionListEntryObjectTemplate::load + +//@END TFD diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerMissionListEntryObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerMissionListEntryObjectTemplate.h new file mode 100644 index 00000000..0b8bda12 --- /dev/null +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerMissionListEntryObjectTemplate.h @@ -0,0 +1,83 @@ +//======================================================================== +// +// ServerMissionListEntryObjectTemplate.h +// +//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be +//overwritten the next time the template definition is compiled. Do not +//make changes to code inside these blocks. +// +// copyright 2001 Sony Online Entertainment +// +//======================================================================== + +#ifndef _INCLUDED_ServerMissionListEntryObjectTemplate_H +#define _INCLUDED_ServerMissionListEntryObjectTemplate_H + +#include "ServerIntangibleObjectTemplate.h" +#include "sharedFoundation/DynamicVariable.h" +#include "sharedUtility/TemplateParameter.h" + + +class Vector; +typedef StructParam StructParamOT; +//@BEGIN TFD TEMPLATE REFS +//@END TFD TEMPLATE REFS + + +class ServerMissionListEntryObjectTemplate : public ServerIntangibleObjectTemplate +{ +public: +//@BEGIN TFD ID + enum + { + ServerMissionListEntryObjectTemplate_tag = TAG(M,L,E,O) + }; +//@END TFD ID +public: + ServerMissionListEntryObjectTemplate(const std::string & filename); + virtual ~ServerMissionListEntryObjectTemplate(); + + virtual Tag getId(void) const; + virtual Tag getTemplateVersion(void) const; + virtual Tag getHighestTemplateVersion(void) const; + static void install(bool allowDefaultTemplateParams = true); + +//@BEGIN TFD +public: + +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif + +protected: + virtual void load(Iff &file); + +private: +//@END TFD + +private: + Tag m_templateVersion; // the template version + bool m_versionOk; // flag that the template version loaded is the one we expect + static bool ms_allowDefaultTemplateParams; // flag to allow defaut params instead of fataling + + static void registerMe(void); + static ObjectTemplate * create(const std::string & filename); + + // no copying + ServerMissionListEntryObjectTemplate(const ServerMissionListEntryObjectTemplate &); + ServerMissionListEntryObjectTemplate & operator =(const ServerMissionListEntryObjectTemplate &); +}; + + +inline void ServerMissionListEntryObjectTemplate::install(bool allowDefaultTemplateParams) +{ + ms_allowDefaultTemplateParams = allowDefaultTemplateParams; +//@BEGIN TFD INSTALL + ServerMissionListEntryObjectTemplate::registerMe(); +//@END TFD INSTALL +} + + +#endif // _INCLUDED_ServerMissionListEntryObjectTemplate_H diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerMissionObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerMissionObjectTemplate.cpp old mode 100755 new mode 100644 index 5ee34097..ec20681c --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerMissionObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerMissionObjectTemplate.cpp @@ -22,20 +22,20 @@ const std::string DefaultString(""); const StringId DefaultStringId("", 0); -const Vector DefaultVector(0, 0, 0); +const Vector DefaultVector(0,0,0); const TriggerVolumeData DefaultTriggerVolumeData; bool ServerMissionObjectTemplate::ms_allowDefaultTemplateParams = true; + /** * Class constructor. */ ServerMissionObjectTemplate::ServerMissionObjectTemplate(const std::string & filename) //@BEGIN TFD INIT : ServerIntangibleObjectTemplate(filename) - , m_versionOk(true) - , m_templateVersion(0) - //@END TFD INIT + ,m_versionOk(true) +//@END TFD INIT { } // ServerMissionObjectTemplate::ServerMissionObjectTemplate @@ -44,8 +44,8 @@ ServerMissionObjectTemplate::ServerMissionObjectTemplate(const std::string & fil */ ServerMissionObjectTemplate::~ServerMissionObjectTemplate() { - //@BEGIN TFD CLEANUP - //@END TFD CLEANUP +//@BEGIN TFD CLEANUP +//@END TFD CLEANUP } // ServerMissionObjectTemplate::~ServerMissionObjectTemplate /** @@ -93,10 +93,10 @@ Tag ServerMissionObjectTemplate::getTemplateVersion(void) const */ Tag ServerMissionObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerMissionObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerMissionObjectTemplate::getHighestTemplateVersion @@ -112,6 +112,15 @@ Object * ServerMissionObjectTemplate::createObject(void) const } // ServerMissionObjectTemplate::createObject //@BEGIN TFD +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void ServerMissionObjectTemplate::testValues(void) const +{ + ServerIntangibleObjectTemplate::testValues(); +} // ServerMissionObjectTemplate::testValues +#endif /** * Loads the template data from an iff file. We should already be in the form @@ -121,8 +130,8 @@ Object * ServerMissionObjectTemplate::createObject(void) const */ void ServerMissionObjectTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != ServerMissionObjectTemplate_tag) { @@ -132,7 +141,7 @@ void ServerMissionObjectTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -152,8 +161,10 @@ void ServerMissionObjectTemplate::load(Iff &file) file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 0, 0)) + if (getHighestTemplateVersion() != TAG(0,0,0,0)) { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); m_versionOk = false; } @@ -171,4 +182,4 @@ void ServerMissionObjectTemplate::load(Iff &file) return; } // ServerMissionObjectTemplate::load -//@END TFD \ No newline at end of file +//@END TFD diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerMissionObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerMissionObjectTemplate.h old mode 100755 new mode 100644 index 5df89cb8..9ee9cdfb --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerMissionObjectTemplate.h +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerMissionObjectTemplate.h @@ -45,6 +45,11 @@ public: //@BEGIN TFD public: +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerObjectTemplate.cpp old mode 100755 new mode 100644 index 957562c3..7fa2c531 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerObjectTemplate.cpp @@ -19,20 +19,20 @@ //@BEGIN TFD TEMPLATE REFS #include "ServerObjectTemplate.h" //@END TFD TEMPLATE REFS -#include -#include +#include #include const std::string DefaultString(""); const StringId DefaultStringId("", 0); -const Vector DefaultVector(0, 0, 0); +const Vector DefaultVector(0,0,0); const TriggerVolumeData DefaultTriggerVolumeData; bool ServerObjectTemplate::ms_allowDefaultTemplateParams = true; -typedef std::unordered_map > XP_MAP; -static XP_MAP * XpMap = nullptr; +typedef std::unordered_map > XP_MAP; +static XP_MAP * XpMap = NULL; + /** * Class constructor. @@ -40,21 +40,20 @@ static XP_MAP * XpMap = nullptr; ServerObjectTemplate::ServerObjectTemplate(const std::string & filename) //@BEGIN TFD INIT : ObjectTemplate(filename) - , m_scriptsLoaded(false) - , m_scriptsAppend(false) - , m_visibleFlagsLoaded(false) - , m_visibleFlagsAppend(false) - , m_deleteFlagsLoaded(false) - , m_deleteFlagsAppend(false) - , m_moveFlagsLoaded(false) - , m_moveFlagsAppend(false) - , m_contentsLoaded(false) - , m_contentsAppend(false) - , m_xpPointsLoaded(false) - , m_xpPointsAppend(false) - , m_versionOk(true) - , m_templateVersion(0) - //@END TFD INIT + ,m_scriptsLoaded(false) + ,m_scriptsAppend(false) + ,m_visibleFlagsLoaded(false) + ,m_visibleFlagsAppend(false) + ,m_deleteFlagsLoaded(false) + ,m_deleteFlagsAppend(false) + ,m_moveFlagsLoaded(false) + ,m_moveFlagsAppend(false) + ,m_contentsLoaded(false) + ,m_contentsAppend(false) + ,m_xpPointsLoaded(false) + ,m_xpPointsAppend(false) + ,m_versionOk(true) +//@END TFD INIT { } // ServerObjectTemplate::ServerObjectTemplate @@ -66,9 +65,9 @@ ServerObjectTemplate::~ServerObjectTemplate() if (m_baseData) { m_baseData->releaseReference(); - m_baseData = 0; + m_baseData=0; } - //@BEGIN TFD CLEANUP +//@BEGIN TFD CLEANUP { std::vector::iterator iter; for (iter = m_scripts.begin(); iter != m_scripts.end(); ++iter) @@ -123,7 +122,7 @@ ServerObjectTemplate::~ServerObjectTemplate() } m_xpPoints.clear(); } - //@END TFD CLEANUP +//@END TFD CLEANUP } // ServerObjectTemplate::~ServerObjectTemplate /** @@ -133,50 +132,51 @@ void ServerObjectTemplate::registerMe(void) { ObjectTemplateList::registerTemplate(ServerObjectTemplate_tag, create); - if (XpMap == nullptr) + if (XpMap == NULL) { XpMap = new XP_MAP(); + NOT_NULL(XpMap); ExitChain::add(exit, "ServerObjectTemplate"); // @todo: fill in the rest of this map - (*XpMap)[XP_rangedCombat].clear(); - (*XpMap)[XP_meleeCombat].clear(); - (*XpMap)[XP_tamingNoTime].clear(); - (*XpMap)[XP_tamingShortTime].clear(); - (*XpMap)[XP_tamingMediumTime].clear(); - (*XpMap)[XP_tamingLargeTime].clear(); - (*XpMap)[XP_architect].clear(); - (*XpMap)[XP_botany].clear(); - (*XpMap)[XP_bountyHunter].clear(); - (*XpMap)[XP_chemist].clear(); - (*XpMap)[XP_dancing].clear(); - (*XpMap)[XP_facilityManagementSavings].clear(); - (*XpMap)[XP_facilityManagementWearAndTear].clear(); - (*XpMap)[XP_squadLeaderNoTime].clear(); - (*XpMap)[XP_squadLeaderSmallTime].clear(); - (*XpMap)[XP_squadLeaderMediumTime].clear(); - (*XpMap)[XP_squadLeaderLargeTime].clear(); - (*XpMap)[XP_hairdressing].clear(); - (*XpMap)[XP_holonetSlicingPopularity].clear(); - (*XpMap)[XP_holonetSlicingQuantity].clear(); - (*XpMap)[XP_investigation].clear(); - (*XpMap)[XP_medic].clear(); - (*XpMap)[XP_military].clear(); - (*XpMap)[XP_mining].clear(); - (*XpMap)[XP_miningSavings].clear(); + (*XpMap)[XP_rangedCombat] = ""; + (*XpMap)[XP_meleeCombat] = ""; + (*XpMap)[XP_tamingNoTime] = ""; + (*XpMap)[XP_tamingShortTime] = ""; + (*XpMap)[XP_tamingMediumTime] = ""; + (*XpMap)[XP_tamingLargeTime] = ""; + (*XpMap)[XP_architect] = ""; + (*XpMap)[XP_botany] = ""; + (*XpMap)[XP_bountyHunter] = ""; + (*XpMap)[XP_chemist] = ""; + (*XpMap)[XP_dancing] = ""; + (*XpMap)[XP_facilityManagementSavings] = ""; + (*XpMap)[XP_facilityManagementWearAndTear] = ""; + (*XpMap)[XP_squadLeaderNoTime] = ""; + (*XpMap)[XP_squadLeaderSmallTime] = ""; + (*XpMap)[XP_squadLeaderMediumTime] = ""; + (*XpMap)[XP_squadLeaderLargeTime] = ""; + (*XpMap)[XP_hairdressing] = ""; + (*XpMap)[XP_holonetSlicingPopularity] = ""; + (*XpMap)[XP_holonetSlicingQuantity] = ""; + (*XpMap)[XP_investigation] = ""; + (*XpMap)[XP_medic] = ""; + (*XpMap)[XP_military] = ""; + (*XpMap)[XP_mining] = ""; + (*XpMap)[XP_miningSavings] = ""; (*XpMap)[XP_musician] = "music"; - (*XpMap)[XP_musicanPopularity].clear(); - (*XpMap)[XP_politics].clear(); - (*XpMap)[XP_slicing].clear(); - (*XpMap)[XP_smuggling].clear(); - (*XpMap)[XP_surveyingNoMinimum].clear(); - (*XpMap)[XP_surveyingLowMinimum].clear(); - (*XpMap)[XP_surveyingMediumMinimum].clear(); - (*XpMap)[XP_surveyingHighMinimum].clear(); - (*XpMap)[XP_survivalHealing].clear(); - (*XpMap)[XP_survivalTracking].clear(); - (*XpMap)[XP_vehicularControl].clear(); - (*XpMap)[XP_vehicularWearAndTear].clear(); + (*XpMap)[XP_musicanPopularity] = ""; + (*XpMap)[XP_politics] = ""; + (*XpMap)[XP_slicing] = ""; + (*XpMap)[XP_smuggling] = ""; + (*XpMap)[XP_surveyingNoMinimum] = ""; + (*XpMap)[XP_surveyingLowMinimum] = ""; + (*XpMap)[XP_surveyingMediumMinimum] = ""; + (*XpMap)[XP_surveyingHighMinimum] = ""; + (*XpMap)[XP_survivalHealing] = ""; + (*XpMap)[XP_survivalTracking] = ""; + (*XpMap)[XP_vehicularControl] = ""; + (*XpMap)[XP_vehicularWearAndTear] = ""; (*XpMap)[XP_resourceHarvestingOrganic] = "resource_harvesting_organic"; (*XpMap)[XP_resourceHarvestingInorganic] = "resource_harvesting_inorganic"; (*XpMap)[XP_crafting] = "crafting_general"; @@ -208,10 +208,10 @@ void ServerObjectTemplate::registerMe(void) */ void ServerObjectTemplate::exit() { - if (XpMap != nullptr) + if (XpMap != NULL) { delete XpMap; - XpMap = nullptr; + XpMap = NULL; } } // ServerObjectTemplate::exit @@ -252,10 +252,10 @@ Tag ServerObjectTemplate::getTemplateVersion(void) const */ Tag ServerObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerObjectTemplate::getHighestTemplateVersion @@ -287,7 +287,7 @@ const std::string & ServerObjectTemplate::getXpString(XpTypes type) { static const std::string emptyString; - if (XpMap != nullptr) + if (XpMap != NULL) { XP_MAP::const_iterator result = XpMap->find(type); if (result != XpMap->end()) @@ -299,11 +299,11 @@ const std::string & ServerObjectTemplate::getXpString(XpTypes type) //---------------------------------------------------------------------- -const std::string & ServerObjectTemplate::getDamageTypeString(DamageType type) +const std::string & ServerObjectTemplate::getDamageTypeString (DamageType type) { static const std::string emptyString; - static const std::string DAMAGE_TYPE_NAMES[] = + static const std::string DAMAGE_TYPE_NAMES[] = { "kinetic", "energy", @@ -329,7 +329,7 @@ const std::string & ServerObjectTemplate::getDamageTypeString(DamageType type) for (int index = 0; index < DAMAGE_TYPE_NAMES_SIZE; ++index) { if ((i_damage & (1 << index)) != 0) - return DAMAGE_TYPE_NAMES[index]; + return DAMAGE_TYPE_NAMES [index]; } } @@ -338,11 +338,11 @@ const std::string & ServerObjectTemplate::getDamageTypeString(DamageType type) //---------------------------------------------------------------------- -const std::string & ServerObjectTemplate::getArmorRatingString(ArmorRating type) +const std::string & ServerObjectTemplate::getArmorRatingString (ArmorRating type) { static const std::string emptyString; - static const std::string ARMOR_RATING_NAMES[] = + static const std::string ARMOR_RATING_NAMES[] = { "none", "light", @@ -357,18 +357,28 @@ const std::string & ServerObjectTemplate::getArmorRatingString(ArmorRating type) if (i_type < 0 || i_type >= ARMOR_RATING_NAMES_SIZE) return emptyString; - return ARMOR_RATING_NAMES[i_type]; + return ARMOR_RATING_NAMES [i_type]; } //---------------------------------------------------------------------- //@BEGIN TFD -const std::string & ServerObjectTemplate::getSharedTemplate() const +const std::string & ServerObjectTemplate::getSharedTemplate(bool testData) const { +#ifdef _DEBUG +std::string testDataValue = DefaultString; +#else +UNREF(testData); +#endif + const ServerObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getSharedTemplate(true); +#endif } if (!m_sharedTemplate.isLoaded()) @@ -386,6 +396,11 @@ const std::string & ServerObjectTemplate::getSharedTemplate() const } const std::string & value = m_sharedTemplate.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerObjectTemplate::getSharedTemplate @@ -462,7 +477,7 @@ void ServerObjectTemplate::getObjvars(DynamicVariableList &list) const if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter objvars in template %s", DataResource::getName())); - return; + return ; } else { @@ -477,12 +492,22 @@ void ServerObjectTemplate::getObjvars(DynamicVariableList &list) const m_objvars.getDynamicVariableList(list); } // ServerObjectTemplate::getObjvars -int ServerObjectTemplate::getVolume() const +int ServerObjectTemplate::getVolume(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getVolume(true); +#endif } if (!m_volume.isLoaded()) @@ -522,16 +547,31 @@ int ServerObjectTemplate::getVolume() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerObjectTemplate::getVolume -int ServerObjectTemplate::getVolumeMin() const +int ServerObjectTemplate::getVolumeMin(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getVolumeMin(true); +#endif } if (!m_volume.isLoaded()) @@ -571,16 +611,31 @@ int ServerObjectTemplate::getVolumeMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerObjectTemplate::getVolumeMin -int ServerObjectTemplate::getVolumeMax() const +int ServerObjectTemplate::getVolumeMax(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getVolumeMax(true); +#endif } if (!m_volume.isLoaded()) @@ -620,6 +675,11 @@ int ServerObjectTemplate::getVolumeMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerObjectTemplate::getVolumeMax @@ -798,12 +858,22 @@ size_t ServerObjectTemplate::getMoveFlagsCount(void) const return count; } // ServerObjectTemplate::getMoveFlagsCount -bool ServerObjectTemplate::getInvulnerable() const +bool ServerObjectTemplate::getInvulnerable(bool testData) const { +#ifdef _DEBUG +bool testDataValue = false; +#else +UNREF(testData); +#endif + const ServerObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getInvulnerable(true); +#endif } if (!m_invulnerable.isLoaded()) @@ -821,16 +891,31 @@ bool ServerObjectTemplate::getInvulnerable() const } bool value = m_invulnerable.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerObjectTemplate::getInvulnerable -float ServerObjectTemplate::getComplexity() const +float ServerObjectTemplate::getComplexity(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getComplexity(true); +#endif } if (!m_complexity.isLoaded()) @@ -870,16 +955,31 @@ float ServerObjectTemplate::getComplexity() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerObjectTemplate::getComplexity -float ServerObjectTemplate::getComplexityMin() const +float ServerObjectTemplate::getComplexityMin(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getComplexityMin(true); +#endif } if (!m_complexity.isLoaded()) @@ -919,16 +1019,31 @@ float ServerObjectTemplate::getComplexityMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerObjectTemplate::getComplexityMin -float ServerObjectTemplate::getComplexityMax() const +float ServerObjectTemplate::getComplexityMax(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getComplexityMax(true); +#endif } if (!m_complexity.isLoaded()) @@ -968,16 +1083,31 @@ float ServerObjectTemplate::getComplexityMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerObjectTemplate::getComplexityMax -int ServerObjectTemplate::getTintIndex() const +int ServerObjectTemplate::getTintIndex(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getTintIndex(true); +#endif } if (!m_tintIndex.isLoaded()) @@ -1017,16 +1147,31 @@ int ServerObjectTemplate::getTintIndex() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerObjectTemplate::getTintIndex -int ServerObjectTemplate::getTintIndexMin() const +int ServerObjectTemplate::getTintIndexMin(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getTintIndexMin(true); +#endif } if (!m_tintIndex.isLoaded()) @@ -1066,16 +1211,31 @@ int ServerObjectTemplate::getTintIndexMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerObjectTemplate::getTintIndexMin -int ServerObjectTemplate::getTintIndexMax() const +int ServerObjectTemplate::getTintIndexMax(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getTintIndexMax(true); +#endif } if (!m_tintIndex.isLoaded()) @@ -1115,6 +1275,11 @@ int ServerObjectTemplate::getTintIndexMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerObjectTemplate::getTintIndexMax @@ -1279,7 +1444,7 @@ void ServerObjectTemplate::getContents(Contents &data, int index) const if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter contents in template %s", DataResource::getName())); - return; + return ; } else { @@ -1293,10 +1458,10 @@ void ServerObjectTemplate::getContents(Contents &data, int index) const { int baseCount = base->getContentsCount(); if (index < baseCount) - { - base->getContents(data, index); - return; - } + { + base->getContents(data, index); + return; + } index -= baseCount; } @@ -1323,7 +1488,7 @@ void ServerObjectTemplate::getContentsMin(Contents &data, int index) const if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter contents in template %s", DataResource::getName())); - return; + return ; } else { @@ -1337,10 +1502,10 @@ void ServerObjectTemplate::getContentsMin(Contents &data, int index) const { int baseCount = base->getContentsCount(); if (index < baseCount) - { - base->getContentsMin(data, index); - return; - } + { + base->getContentsMin(data, index); + return; + } index -= baseCount; } @@ -1367,7 +1532,7 @@ void ServerObjectTemplate::getContentsMax(Contents &data, int index) const if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter contents in template %s", DataResource::getName())); - return; + return ; } else { @@ -1381,10 +1546,10 @@ void ServerObjectTemplate::getContentsMax(Contents &data, int index) const { int baseCount = base->getContentsCount(); if (index < baseCount) - { - base->getContentsMax(data, index); - return; - } + { + base->getContentsMax(data, index); + return; + } index -= baseCount; } @@ -1435,7 +1600,7 @@ void ServerObjectTemplate::getXpPoints(Xp &data, int index) const if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter xpPoints in template %s", DataResource::getName())); - return; + return ; } else { @@ -1449,10 +1614,10 @@ void ServerObjectTemplate::getXpPoints(Xp &data, int index) const { int baseCount = base->getXpPointsCount(); if (index < baseCount) - { - base->getXpPoints(data, index); - return; - } + { + base->getXpPoints(data, index); + return; + } index -= baseCount; } @@ -1479,7 +1644,7 @@ void ServerObjectTemplate::getXpPointsMin(Xp &data, int index) const if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter xpPoints in template %s", DataResource::getName())); - return; + return ; } else { @@ -1493,10 +1658,10 @@ void ServerObjectTemplate::getXpPointsMin(Xp &data, int index) const { int baseCount = base->getXpPointsCount(); if (index < baseCount) - { - base->getXpPointsMin(data, index); - return; - } + { + base->getXpPointsMin(data, index); + return; + } index -= baseCount; } @@ -1523,7 +1688,7 @@ void ServerObjectTemplate::getXpPointsMax(Xp &data, int index) const if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter xpPoints in template %s", DataResource::getName())); - return; + return ; } else { @@ -1537,10 +1702,10 @@ void ServerObjectTemplate::getXpPointsMax(Xp &data, int index) const { int baseCount = base->getXpPointsCount(); if (index < baseCount) - { - base->getXpPointsMax(data, index); - return; - } + { + base->getXpPointsMax(data, index); + return; + } index -= baseCount; } @@ -1578,12 +1743,22 @@ size_t ServerObjectTemplate::getXpPointsCount(void) const return count; } // ServerObjectTemplate::getXpPointsCount -bool ServerObjectTemplate::getPersistByDefault() const +bool ServerObjectTemplate::getPersistByDefault(bool testData) const { +#ifdef _DEBUG +bool testDataValue = false; +#else +UNREF(testData); +#endif + const ServerObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getPersistByDefault(true); +#endif } if (!m_persistByDefault.isLoaded()) @@ -1601,16 +1776,31 @@ bool ServerObjectTemplate::getPersistByDefault() const } bool value = m_persistByDefault.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerObjectTemplate::getPersistByDefault -bool ServerObjectTemplate::getPersistContents() const +bool ServerObjectTemplate::getPersistContents(bool testData) const { +#ifdef _DEBUG +bool testDataValue = false; +#else +UNREF(testData); +#endif + const ServerObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getPersistContents(true); +#endif } if (!m_persistContents.isLoaded()) @@ -1628,10 +1818,34 @@ bool ServerObjectTemplate::getPersistContents() const } bool value = m_persistContents.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerObjectTemplate::getPersistContents +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void ServerObjectTemplate::testValues(void) const +{ + IGNORE_RETURN(getSharedTemplate(true)); + IGNORE_RETURN(getVolumeMin(true)); + IGNORE_RETURN(getVolumeMax(true)); + IGNORE_RETURN(getInvulnerable(true)); + IGNORE_RETURN(getComplexityMin(true)); + IGNORE_RETURN(getComplexityMax(true)); + IGNORE_RETURN(getTintIndexMin(true)); + IGNORE_RETURN(getTintIndexMax(true)); + IGNORE_RETURN(getPersistByDefault(true)); + IGNORE_RETURN(getPersistContents(true)); +} // ServerObjectTemplate::testValues +#endif + /** * Loads the template data from an iff file. We should already be in the form * for this template. @@ -1640,8 +1854,8 @@ bool ServerObjectTemplate::getPersistContents() const */ void ServerObjectTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != ServerObjectTemplate_tag) { @@ -1650,7 +1864,7 @@ void ServerObjectTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -1670,8 +1884,10 @@ void ServerObjectTemplate::load(Iff &file) file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 1, 1)) + if (getHighestTemplateVersion() != TAG(0,0,1,1)) { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); m_versionOk = false; } @@ -1835,6 +2051,7 @@ void ServerObjectTemplate::load(Iff &file) return; } // ServerObjectTemplate::load + //============================================================================= // class ServerObjectTemplate::_AttribMod @@ -1881,12 +2098,22 @@ Tag ServerObjectTemplate::_AttribMod::getId(void) const return _AttribMod_tag; } // ServerObjectTemplate::_AttribMod::getId -ServerObjectTemplate::Attributes ServerObjectTemplate::_AttribMod::getTarget(bool versionOk) const +ServerObjectTemplate::Attributes ServerObjectTemplate::_AttribMod::getTarget(bool versionOk, bool testData) const { +#ifdef _DEBUG +ServerObjectTemplate::Attributes testDataValue = static_cast(0); +#else +UNREF(testData); +#endif + const ServerObjectTemplate::_AttribMod * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getTarget(true); +#endif } if (!m_target.isLoaded()) @@ -1904,16 +2131,31 @@ ServerObjectTemplate::Attributes ServerObjectTemplate::_AttribMod::getTarget(boo } Attributes value = static_cast(m_target.getValue()); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerObjectTemplate::_AttribMod::getTarget -int ServerObjectTemplate::_AttribMod::getValue(bool versionOk) const +int ServerObjectTemplate::_AttribMod::getValue(bool versionOk, bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerObjectTemplate::_AttribMod * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getValue(true); +#endif } if (!m_value.isLoaded()) @@ -1953,16 +2195,31 @@ int ServerObjectTemplate::_AttribMod::getValue(bool versionOk) const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerObjectTemplate::_AttribMod::getValue -int ServerObjectTemplate::_AttribMod::getValueMin(bool versionOk) const +int ServerObjectTemplate::_AttribMod::getValueMin(bool versionOk, bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerObjectTemplate::_AttribMod * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getValueMin(true); +#endif } if (!m_value.isLoaded()) @@ -2002,16 +2259,31 @@ int ServerObjectTemplate::_AttribMod::getValueMin(bool versionOk) const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerObjectTemplate::_AttribMod::getValueMin -int ServerObjectTemplate::_AttribMod::getValueMax(bool versionOk) const +int ServerObjectTemplate::_AttribMod::getValueMax(bool versionOk, bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerObjectTemplate::_AttribMod * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getValueMax(true); +#endif } if (!m_value.isLoaded()) @@ -2051,16 +2323,31 @@ int ServerObjectTemplate::_AttribMod::getValueMax(bool versionOk) const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerObjectTemplate::_AttribMod::getValueMax -float ServerObjectTemplate::_AttribMod::getTime(bool versionOk) const +float ServerObjectTemplate::_AttribMod::getTime(bool versionOk, bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerObjectTemplate::_AttribMod * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getTime(true); +#endif } if (!m_time.isLoaded()) @@ -2100,16 +2387,31 @@ float ServerObjectTemplate::_AttribMod::getTime(bool versionOk) const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerObjectTemplate::_AttribMod::getTime -float ServerObjectTemplate::_AttribMod::getTimeMin(bool versionOk) const +float ServerObjectTemplate::_AttribMod::getTimeMin(bool versionOk, bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerObjectTemplate::_AttribMod * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getTimeMin(true); +#endif } if (!m_time.isLoaded()) @@ -2149,16 +2451,31 @@ float ServerObjectTemplate::_AttribMod::getTimeMin(bool versionOk) const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerObjectTemplate::_AttribMod::getTimeMin -float ServerObjectTemplate::_AttribMod::getTimeMax(bool versionOk) const +float ServerObjectTemplate::_AttribMod::getTimeMax(bool versionOk, bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerObjectTemplate::_AttribMod * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getTimeMax(true); +#endif } if (!m_time.isLoaded()) @@ -2198,16 +2515,31 @@ float ServerObjectTemplate::_AttribMod::getTimeMax(bool versionOk) const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerObjectTemplate::_AttribMod::getTimeMax -float ServerObjectTemplate::_AttribMod::getTimeAtValue(bool versionOk) const +float ServerObjectTemplate::_AttribMod::getTimeAtValue(bool versionOk, bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerObjectTemplate::_AttribMod * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getTimeAtValue(true); +#endif } if (!m_timeAtValue.isLoaded()) @@ -2247,16 +2579,31 @@ float ServerObjectTemplate::_AttribMod::getTimeAtValue(bool versionOk) const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerObjectTemplate::_AttribMod::getTimeAtValue -float ServerObjectTemplate::_AttribMod::getTimeAtValueMin(bool versionOk) const +float ServerObjectTemplate::_AttribMod::getTimeAtValueMin(bool versionOk, bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerObjectTemplate::_AttribMod * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getTimeAtValueMin(true); +#endif } if (!m_timeAtValue.isLoaded()) @@ -2296,16 +2643,31 @@ float ServerObjectTemplate::_AttribMod::getTimeAtValueMin(bool versionOk) const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerObjectTemplate::_AttribMod::getTimeAtValueMin -float ServerObjectTemplate::_AttribMod::getTimeAtValueMax(bool versionOk) const +float ServerObjectTemplate::_AttribMod::getTimeAtValueMax(bool versionOk, bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerObjectTemplate::_AttribMod * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getTimeAtValueMax(true); +#endif } if (!m_timeAtValue.isLoaded()) @@ -2345,16 +2707,31 @@ float ServerObjectTemplate::_AttribMod::getTimeAtValueMax(bool versionOk) const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerObjectTemplate::_AttribMod::getTimeAtValueMax -float ServerObjectTemplate::_AttribMod::getDecay(bool versionOk) const +float ServerObjectTemplate::_AttribMod::getDecay(bool versionOk, bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerObjectTemplate::_AttribMod * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getDecay(true); +#endif } if (!m_decay.isLoaded()) @@ -2394,16 +2771,31 @@ float ServerObjectTemplate::_AttribMod::getDecay(bool versionOk) const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerObjectTemplate::_AttribMod::getDecay -float ServerObjectTemplate::_AttribMod::getDecayMin(bool versionOk) const +float ServerObjectTemplate::_AttribMod::getDecayMin(bool versionOk, bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerObjectTemplate::_AttribMod * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getDecayMin(true); +#endif } if (!m_decay.isLoaded()) @@ -2443,16 +2835,31 @@ float ServerObjectTemplate::_AttribMod::getDecayMin(bool versionOk) const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerObjectTemplate::_AttribMod::getDecayMin -float ServerObjectTemplate::_AttribMod::getDecayMax(bool versionOk) const +float ServerObjectTemplate::_AttribMod::getDecayMax(bool versionOk, bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerObjectTemplate::_AttribMod * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getDecayMax(true); +#endif } if (!m_decay.isLoaded()) @@ -2492,10 +2899,33 @@ float ServerObjectTemplate::_AttribMod::getDecayMax(bool versionOk) const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerObjectTemplate::_AttribMod::getDecayMax +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void ServerObjectTemplate::_AttribMod::testValues(void) const +{ + IGNORE_RETURN(getTarget(true)); + IGNORE_RETURN(getValueMin(true)); + IGNORE_RETURN(getValueMax(true)); + IGNORE_RETURN(getTimeMin(true)); + IGNORE_RETURN(getTimeMax(true)); + IGNORE_RETURN(getTimeAtValueMin(true)); + IGNORE_RETURN(getTimeAtValueMax(true)); + IGNORE_RETURN(getDecayMin(true)); + IGNORE_RETURN(getDecayMax(true)); +} // ServerObjectTemplate::_AttribMod::testValues +#endif + /** * Loads the template data from an iff file. We should already be in the form * for this template. @@ -2504,8 +2934,8 @@ float ServerObjectTemplate::_AttribMod::getDecayMax(bool versionOk) const */ void ServerObjectTemplate::_AttribMod::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; file.enterForm(); @@ -2533,6 +2963,7 @@ void ServerObjectTemplate::_AttribMod::load(Iff &file) UNREF(file); } // ServerObjectTemplate::_AttribMod::load + //============================================================================= // struct ServerObjectTemplate::Contents @@ -2579,6 +3010,7 @@ ServerObjectTemplate::Contents & ServerObjectTemplate::Contents::operator =(cons } // ServerObjectTemplate::Contents::operator = #endif + //============================================================================= // class ServerObjectTemplate::_Contents @@ -2625,12 +3057,22 @@ Tag ServerObjectTemplate::_Contents::getId(void) const return _Contents_tag; } // ServerObjectTemplate::_Contents::getId -const std::string & ServerObjectTemplate::_Contents::getSlotName(bool versionOk) const +const std::string & ServerObjectTemplate::_Contents::getSlotName(bool versionOk, bool testData) const { +#ifdef _DEBUG +std::string testDataValue = DefaultString; +#else +UNREF(testData); +#endif + const ServerObjectTemplate::_Contents * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getSlotName(true); +#endif } if (!m_slotName.isLoaded()) @@ -2648,16 +3090,31 @@ const std::string & ServerObjectTemplate::_Contents::getSlotName(bool versionOk) } const std::string & value = m_slotName.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerObjectTemplate::_Contents::getSlotName -bool ServerObjectTemplate::_Contents::getEquipObject(bool versionOk) const +bool ServerObjectTemplate::_Contents::getEquipObject(bool versionOk, bool testData) const { +#ifdef _DEBUG +bool testDataValue = false; +#else +UNREF(testData); +#endif + const ServerObjectTemplate::_Contents * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getEquipObject(true); +#endif } if (!m_equipObject.isLoaded()) @@ -2675,6 +3132,11 @@ bool ServerObjectTemplate::_Contents::getEquipObject(bool versionOk) const } bool value = m_equipObject.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerObjectTemplate::_Contents::getEquipObject @@ -2707,11 +3169,22 @@ const ServerObjectTemplate * ServerObjectTemplate::_Contents::getContent(bool ve { returnValue = dynamic_cast(ObjectTemplateList::fetch(templateName)); if (returnValue == nullptr) - WARNING_STRICT_FATAL(true, ("Error loading template %s", templateName.c_str())); + WARNING_STRICT_FATAL(true, ("Error loading template %s",templateName.c_str())); } return returnValue; } // ServerObjectTemplate::_Contents::getContent +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void ServerObjectTemplate::_Contents::testValues(void) const +{ + IGNORE_RETURN(getSlotName(true)); + IGNORE_RETURN(getEquipObject(true)); +} // ServerObjectTemplate::_Contents::testValues +#endif + /** * Loads the template data from an iff file. We should already be in the form * for this template. @@ -2720,8 +3193,8 @@ const ServerObjectTemplate * ServerObjectTemplate::_Contents::getContent(bool ve */ void ServerObjectTemplate::_Contents::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; file.enterForm(); @@ -2745,6 +3218,7 @@ void ServerObjectTemplate::_Contents::load(Iff &file) UNREF(file); } // ServerObjectTemplate::_Contents::load + //============================================================================= // class ServerObjectTemplate::_MentalStateMod @@ -2791,12 +3265,22 @@ Tag ServerObjectTemplate::_MentalStateMod::getId(void) const return _MentalStateMod_tag; } // ServerObjectTemplate::_MentalStateMod::getId -ServerObjectTemplate::MentalStates ServerObjectTemplate::_MentalStateMod::getTarget(bool versionOk) const +ServerObjectTemplate::MentalStates ServerObjectTemplate::_MentalStateMod::getTarget(bool versionOk, bool testData) const { +#ifdef _DEBUG +ServerObjectTemplate::MentalStates testDataValue = static_cast(0); +#else +UNREF(testData); +#endif + const ServerObjectTemplate::_MentalStateMod * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getTarget(true); +#endif } if (!m_target.isLoaded()) @@ -2814,16 +3298,31 @@ ServerObjectTemplate::MentalStates ServerObjectTemplate::_MentalStateMod::getTar } MentalStates value = static_cast(m_target.getValue()); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerObjectTemplate::_MentalStateMod::getTarget -float ServerObjectTemplate::_MentalStateMod::getValue(bool versionOk) const +float ServerObjectTemplate::_MentalStateMod::getValue(bool versionOk, bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerObjectTemplate::_MentalStateMod * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getValue(true); +#endif } if (!m_value.isLoaded()) @@ -2863,16 +3362,31 @@ float ServerObjectTemplate::_MentalStateMod::getValue(bool versionOk) const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerObjectTemplate::_MentalStateMod::getValue -float ServerObjectTemplate::_MentalStateMod::getValueMin(bool versionOk) const +float ServerObjectTemplate::_MentalStateMod::getValueMin(bool versionOk, bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerObjectTemplate::_MentalStateMod * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getValueMin(true); +#endif } if (!m_value.isLoaded()) @@ -2912,16 +3426,31 @@ float ServerObjectTemplate::_MentalStateMod::getValueMin(bool versionOk) const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerObjectTemplate::_MentalStateMod::getValueMin -float ServerObjectTemplate::_MentalStateMod::getValueMax(bool versionOk) const +float ServerObjectTemplate::_MentalStateMod::getValueMax(bool versionOk, bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerObjectTemplate::_MentalStateMod * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getValueMax(true); +#endif } if (!m_value.isLoaded()) @@ -2961,16 +3490,31 @@ float ServerObjectTemplate::_MentalStateMod::getValueMax(bool versionOk) const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerObjectTemplate::_MentalStateMod::getValueMax -float ServerObjectTemplate::_MentalStateMod::getTime(bool versionOk) const +float ServerObjectTemplate::_MentalStateMod::getTime(bool versionOk, bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerObjectTemplate::_MentalStateMod * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getTime(true); +#endif } if (!m_time.isLoaded()) @@ -3010,16 +3554,31 @@ float ServerObjectTemplate::_MentalStateMod::getTime(bool versionOk) const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerObjectTemplate::_MentalStateMod::getTime -float ServerObjectTemplate::_MentalStateMod::getTimeMin(bool versionOk) const +float ServerObjectTemplate::_MentalStateMod::getTimeMin(bool versionOk, bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerObjectTemplate::_MentalStateMod * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getTimeMin(true); +#endif } if (!m_time.isLoaded()) @@ -3059,16 +3618,31 @@ float ServerObjectTemplate::_MentalStateMod::getTimeMin(bool versionOk) const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerObjectTemplate::_MentalStateMod::getTimeMin -float ServerObjectTemplate::_MentalStateMod::getTimeMax(bool versionOk) const +float ServerObjectTemplate::_MentalStateMod::getTimeMax(bool versionOk, bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerObjectTemplate::_MentalStateMod * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getTimeMax(true); +#endif } if (!m_time.isLoaded()) @@ -3108,16 +3682,31 @@ float ServerObjectTemplate::_MentalStateMod::getTimeMax(bool versionOk) const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerObjectTemplate::_MentalStateMod::getTimeMax -float ServerObjectTemplate::_MentalStateMod::getTimeAtValue(bool versionOk) const +float ServerObjectTemplate::_MentalStateMod::getTimeAtValue(bool versionOk, bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerObjectTemplate::_MentalStateMod * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getTimeAtValue(true); +#endif } if (!m_timeAtValue.isLoaded()) @@ -3157,16 +3746,31 @@ float ServerObjectTemplate::_MentalStateMod::getTimeAtValue(bool versionOk) cons else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerObjectTemplate::_MentalStateMod::getTimeAtValue -float ServerObjectTemplate::_MentalStateMod::getTimeAtValueMin(bool versionOk) const +float ServerObjectTemplate::_MentalStateMod::getTimeAtValueMin(bool versionOk, bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerObjectTemplate::_MentalStateMod * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getTimeAtValueMin(true); +#endif } if (!m_timeAtValue.isLoaded()) @@ -3206,16 +3810,31 @@ float ServerObjectTemplate::_MentalStateMod::getTimeAtValueMin(bool versionOk) c else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerObjectTemplate::_MentalStateMod::getTimeAtValueMin -float ServerObjectTemplate::_MentalStateMod::getTimeAtValueMax(bool versionOk) const +float ServerObjectTemplate::_MentalStateMod::getTimeAtValueMax(bool versionOk, bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerObjectTemplate::_MentalStateMod * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getTimeAtValueMax(true); +#endif } if (!m_timeAtValue.isLoaded()) @@ -3255,16 +3874,31 @@ float ServerObjectTemplate::_MentalStateMod::getTimeAtValueMax(bool versionOk) c else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerObjectTemplate::_MentalStateMod::getTimeAtValueMax -float ServerObjectTemplate::_MentalStateMod::getDecay(bool versionOk) const +float ServerObjectTemplate::_MentalStateMod::getDecay(bool versionOk, bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerObjectTemplate::_MentalStateMod * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getDecay(true); +#endif } if (!m_decay.isLoaded()) @@ -3304,16 +3938,31 @@ float ServerObjectTemplate::_MentalStateMod::getDecay(bool versionOk) const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerObjectTemplate::_MentalStateMod::getDecay -float ServerObjectTemplate::_MentalStateMod::getDecayMin(bool versionOk) const +float ServerObjectTemplate::_MentalStateMod::getDecayMin(bool versionOk, bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerObjectTemplate::_MentalStateMod * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getDecayMin(true); +#endif } if (!m_decay.isLoaded()) @@ -3353,16 +4002,31 @@ float ServerObjectTemplate::_MentalStateMod::getDecayMin(bool versionOk) const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerObjectTemplate::_MentalStateMod::getDecayMin -float ServerObjectTemplate::_MentalStateMod::getDecayMax(bool versionOk) const +float ServerObjectTemplate::_MentalStateMod::getDecayMax(bool versionOk, bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerObjectTemplate::_MentalStateMod * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getDecayMax(true); +#endif } if (!m_decay.isLoaded()) @@ -3402,10 +4066,33 @@ float ServerObjectTemplate::_MentalStateMod::getDecayMax(bool versionOk) const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerObjectTemplate::_MentalStateMod::getDecayMax +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void ServerObjectTemplate::_MentalStateMod::testValues(void) const +{ + IGNORE_RETURN(getTarget(true)); + IGNORE_RETURN(getValueMin(true)); + IGNORE_RETURN(getValueMax(true)); + IGNORE_RETURN(getTimeMin(true)); + IGNORE_RETURN(getTimeMax(true)); + IGNORE_RETURN(getTimeAtValueMin(true)); + IGNORE_RETURN(getTimeAtValueMax(true)); + IGNORE_RETURN(getDecayMin(true)); + IGNORE_RETURN(getDecayMax(true)); +} // ServerObjectTemplate::_MentalStateMod::testValues +#endif + /** * Loads the template data from an iff file. We should already be in the form * for this template. @@ -3414,8 +4101,8 @@ float ServerObjectTemplate::_MentalStateMod::getDecayMax(bool versionOk) const */ void ServerObjectTemplate::_MentalStateMod::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; file.enterForm(); @@ -3443,6 +4130,7 @@ void ServerObjectTemplate::_MentalStateMod::load(Iff &file) UNREF(file); } // ServerObjectTemplate::_MentalStateMod::load + //============================================================================= // class ServerObjectTemplate::_Xp @@ -3489,12 +4177,22 @@ Tag ServerObjectTemplate::_Xp::getId(void) const return _Xp_tag; } // ServerObjectTemplate::_Xp::getId -ServerObjectTemplate::XpTypes ServerObjectTemplate::_Xp::getType(bool versionOk) const +ServerObjectTemplate::XpTypes ServerObjectTemplate::_Xp::getType(bool versionOk, bool testData) const { +#ifdef _DEBUG +ServerObjectTemplate::XpTypes testDataValue = static_cast(0); +#else +UNREF(testData); +#endif + const ServerObjectTemplate::_Xp * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getType(true); +#endif } if (!m_type.isLoaded()) @@ -3512,16 +4210,31 @@ ServerObjectTemplate::XpTypes ServerObjectTemplate::_Xp::getType(bool versionOk) } XpTypes value = static_cast(m_type.getValue()); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerObjectTemplate::_Xp::getType -int ServerObjectTemplate::_Xp::getLevel(bool versionOk) const +int ServerObjectTemplate::_Xp::getLevel(bool versionOk, bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerObjectTemplate::_Xp * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getLevel(true); +#endif } if (!m_level.isLoaded()) @@ -3561,16 +4274,31 @@ int ServerObjectTemplate::_Xp::getLevel(bool versionOk) const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerObjectTemplate::_Xp::getLevel -int ServerObjectTemplate::_Xp::getLevelMin(bool versionOk) const +int ServerObjectTemplate::_Xp::getLevelMin(bool versionOk, bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerObjectTemplate::_Xp * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getLevelMin(true); +#endif } if (!m_level.isLoaded()) @@ -3610,16 +4338,31 @@ int ServerObjectTemplate::_Xp::getLevelMin(bool versionOk) const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerObjectTemplate::_Xp::getLevelMin -int ServerObjectTemplate::_Xp::getLevelMax(bool versionOk) const +int ServerObjectTemplate::_Xp::getLevelMax(bool versionOk, bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerObjectTemplate::_Xp * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getLevelMax(true); +#endif } if (!m_level.isLoaded()) @@ -3659,16 +4402,31 @@ int ServerObjectTemplate::_Xp::getLevelMax(bool versionOk) const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerObjectTemplate::_Xp::getLevelMax -int ServerObjectTemplate::_Xp::getValue(bool versionOk) const +int ServerObjectTemplate::_Xp::getValue(bool versionOk, bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerObjectTemplate::_Xp * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getValue(true); +#endif } if (!m_value.isLoaded()) @@ -3708,16 +4466,31 @@ int ServerObjectTemplate::_Xp::getValue(bool versionOk) const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerObjectTemplate::_Xp::getValue -int ServerObjectTemplate::_Xp::getValueMin(bool versionOk) const +int ServerObjectTemplate::_Xp::getValueMin(bool versionOk, bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerObjectTemplate::_Xp * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getValueMin(true); +#endif } if (!m_value.isLoaded()) @@ -3757,16 +4530,31 @@ int ServerObjectTemplate::_Xp::getValueMin(bool versionOk) const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerObjectTemplate::_Xp::getValueMin -int ServerObjectTemplate::_Xp::getValueMax(bool versionOk) const +int ServerObjectTemplate::_Xp::getValueMax(bool versionOk, bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerObjectTemplate::_Xp * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getValueMax(true); +#endif } if (!m_value.isLoaded()) @@ -3806,10 +4594,29 @@ int ServerObjectTemplate::_Xp::getValueMax(bool versionOk) const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerObjectTemplate::_Xp::getValueMax +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void ServerObjectTemplate::_Xp::testValues(void) const +{ + IGNORE_RETURN(getType(true)); + IGNORE_RETURN(getLevelMin(true)); + IGNORE_RETURN(getLevelMax(true)); + IGNORE_RETURN(getValueMin(true)); + IGNORE_RETURN(getValueMax(true)); +} // ServerObjectTemplate::_Xp::testValues +#endif + /** * Loads the template data from an iff file. We should already be in the form * for this template. @@ -3818,8 +4625,8 @@ int ServerObjectTemplate::_Xp::getValueMax(bool versionOk) const */ void ServerObjectTemplate::_Xp::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; file.enterForm(); @@ -3843,4 +4650,4 @@ void ServerObjectTemplate::_Xp::load(Iff &file) UNREF(file); } // ServerObjectTemplate::_Xp::load -//@END TFD \ No newline at end of file +//@END TFD diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerObjectTemplate.h old mode 100755 new mode 100644 index ca64fd5e..774c30f6 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerObjectTemplate.h +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerObjectTemplate.h @@ -317,20 +317,25 @@ protected: virtual Tag getId(void) const; public: - Attributes getTarget(bool versionOk) const; - int getValue(bool versionOk) const; - int getValueMin(bool versionOk) const; - int getValueMax(bool versionOk) const; - float getTime(bool versionOk) const; - float getTimeMin(bool versionOk) const; - float getTimeMax(bool versionOk) const; - float getTimeAtValue(bool versionOk) const; - float getTimeAtValueMin(bool versionOk) const; - float getTimeAtValueMax(bool versionOk) const; - float getDecay(bool versionOk) const; - float getDecayMin(bool versionOk) const; - float getDecayMax(bool versionOk) const; + Attributes getTarget(bool versionOk, bool testData = false) const; + int getValue(bool versionOk, bool testData = false) const; + int getValueMin(bool versionOk, bool testData = false) const; + int getValueMax(bool versionOk, bool testData = false) const; + float getTime(bool versionOk, bool testData = false) const; + float getTimeMin(bool versionOk, bool testData = false) const; + float getTimeMax(bool versionOk, bool testData = false) const; + float getTimeAtValue(bool versionOk, bool testData = false) const; + float getTimeAtValueMin(bool versionOk, bool testData = false) const; + float getTimeAtValueMax(bool versionOk, bool testData = false) const; + float getDecay(bool versionOk, bool testData = false) const; + float getDecayMin(bool versionOk, bool testData = false) const; + float getDecayMax(bool versionOk, bool testData = false) const; +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); @@ -366,20 +371,25 @@ private: virtual Tag getId(void) const; public: - MentalStates getTarget(bool versionOk) const; - float getValue(bool versionOk) const; - float getValueMin(bool versionOk) const; - float getValueMax(bool versionOk) const; - float getTime(bool versionOk) const; - float getTimeMin(bool versionOk) const; - float getTimeMax(bool versionOk) const; - float getTimeAtValue(bool versionOk) const; - float getTimeAtValueMin(bool versionOk) const; - float getTimeAtValueMax(bool versionOk) const; - float getDecay(bool versionOk) const; - float getDecayMin(bool versionOk) const; - float getDecayMax(bool versionOk) const; + MentalStates getTarget(bool versionOk, bool testData = false) const; + float getValue(bool versionOk, bool testData = false) const; + float getValueMin(bool versionOk, bool testData = false) const; + float getValueMax(bool versionOk, bool testData = false) const; + float getTime(bool versionOk, bool testData = false) const; + float getTimeMin(bool versionOk, bool testData = false) const; + float getTimeMax(bool versionOk, bool testData = false) const; + float getTimeAtValue(bool versionOk, bool testData = false) const; + float getTimeAtValueMin(bool versionOk, bool testData = false) const; + float getTimeAtValueMax(bool versionOk, bool testData = false) const; + float getDecay(bool versionOk, bool testData = false) const; + float getDecayMin(bool versionOk, bool testData = false) const; + float getDecayMax(bool versionOk, bool testData = false) const; +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); @@ -415,10 +425,15 @@ private: virtual Tag getId(void) const; public: - const std::string & getSlotName(bool versionOk) const; - bool getEquipObject(bool versionOk) const; + const std::string & getSlotName(bool versionOk, bool testData = false) const; + bool getEquipObject(bool versionOk, bool testData = false) const; const ServerObjectTemplate * getContent(bool versionOk) const; +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); @@ -452,14 +467,19 @@ private: virtual Tag getId(void) const; public: - XpTypes getType(bool versionOk) const; - int getLevel(bool versionOk) const; - int getLevelMin(bool versionOk) const; - int getLevelMax(bool versionOk) const; - int getValue(bool versionOk) const; - int getValueMin(bool versionOk) const; - int getValueMax(bool versionOk) const; + XpTypes getType(bool versionOk, bool testData = false) const; + int getLevel(bool versionOk, bool testData = false) const; + int getLevelMin(bool versionOk, bool testData = false) const; + int getLevelMax(bool versionOk, bool testData = false) const; + int getValue(bool versionOk, bool testData = false) const; + int getValueMin(bool versionOk, bool testData = false) const; + int getValueMax(bool versionOk, bool testData = false) const; +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); @@ -478,26 +498,26 @@ private: friend class ServerObjectTemplate::_Xp; public: - const std::string & getSharedTemplate() const; + const std::string & getSharedTemplate(bool testData = false) const; const std::string & getScripts(int index) const; size_t getScriptsCount(void) const; void getObjvars(DynamicVariableList &list) const; - int getVolume() const; - int getVolumeMin() const; - int getVolumeMax() const; + int getVolume(bool testData = false) const; + int getVolumeMin(bool testData = false) const; + int getVolumeMax(bool testData = false) const; VisibleFlags getVisibleFlags(int index) const; size_t getVisibleFlagsCount(void) const; DeleteFlags getDeleteFlags(int index) const; size_t getDeleteFlagsCount(void) const; MoveFlags getMoveFlags(int index) const; size_t getMoveFlagsCount(void) const; - bool getInvulnerable() const; - float getComplexity() const; - float getComplexityMin() const; - float getComplexityMax() const; - int getTintIndex() const; - int getTintIndexMin() const; - int getTintIndexMax() const; + bool getInvulnerable(bool testData = false) const; + float getComplexity(bool testData = false) const; + float getComplexityMin(bool testData = false) const; + float getComplexityMax(bool testData = false) const; + int getTintIndex(bool testData = false) const; + int getTintIndexMin(bool testData = false) const; + int getTintIndexMax(bool testData = false) const; float getUpdateRanges(UpdateRanges index) const; float getUpdateRangesMin(UpdateRanges index) const; float getUpdateRangesMax(UpdateRanges index) const; @@ -509,9 +529,14 @@ public: void getXpPointsMin(Xp &data, int index) const; void getXpPointsMax(Xp &data, int index) const; size_t getXpPointsCount(void) const; - bool getPersistByDefault() const; - bool getPersistContents() const; + bool getPersistByDefault(bool testData = false) const; + bool getPersistContents(bool testData = false) const; +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerPlanetObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerPlanetObjectTemplate.cpp old mode 100755 new mode 100644 index 6f5a7cbf..543ca0f5 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerPlanetObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerPlanetObjectTemplate.cpp @@ -22,20 +22,20 @@ const std::string DefaultString(""); const StringId DefaultStringId("", 0); -const Vector DefaultVector(0, 0, 0); +const Vector DefaultVector(0,0,0); const TriggerVolumeData DefaultTriggerVolumeData; bool ServerPlanetObjectTemplate::ms_allowDefaultTemplateParams = true; + /** * Class constructor. */ ServerPlanetObjectTemplate::ServerPlanetObjectTemplate(const std::string & filename) //@BEGIN TFD INIT : ServerUniverseObjectTemplate(filename) - , m_versionOk(true) - , m_templateVersion(0) - //@END TFD INIT + ,m_versionOk(true) +//@END TFD INIT { } // ServerPlanetObjectTemplate::ServerPlanetObjectTemplate @@ -44,8 +44,8 @@ ServerPlanetObjectTemplate::ServerPlanetObjectTemplate(const std::string & filen */ ServerPlanetObjectTemplate::~ServerPlanetObjectTemplate() { - //@BEGIN TFD CLEANUP - //@END TFD CLEANUP +//@BEGIN TFD CLEANUP +//@END TFD CLEANUP } // ServerPlanetObjectTemplate::~ServerPlanetObjectTemplate /** @@ -93,10 +93,10 @@ Tag ServerPlanetObjectTemplate::getTemplateVersion(void) const */ Tag ServerPlanetObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerPlanetObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerPlanetObjectTemplate::getHighestTemplateVersion @@ -112,12 +112,22 @@ Object * ServerPlanetObjectTemplate::createObject(void) const } // ServerPlanetObjectTemplate::createObject //@BEGIN TFD -const std::string & ServerPlanetObjectTemplate::getPlanetName() const +const std::string & ServerPlanetObjectTemplate::getPlanetName(bool testData) const { +#ifdef _DEBUG +std::string testDataValue = DefaultString; +#else +UNREF(testData); +#endif + const ServerPlanetObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getPlanetName(true); +#endif } if (!m_planetName.isLoaded()) @@ -135,10 +145,26 @@ const std::string & ServerPlanetObjectTemplate::getPlanetName() const } const std::string & value = m_planetName.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerPlanetObjectTemplate::getPlanetName +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void ServerPlanetObjectTemplate::testValues(void) const +{ + IGNORE_RETURN(getPlanetName(true)); + ServerUniverseObjectTemplate::testValues(); +} // ServerPlanetObjectTemplate::testValues +#endif + /** * Loads the template data from an iff file. We should already be in the form * for this template. @@ -147,8 +173,8 @@ const std::string & ServerPlanetObjectTemplate::getPlanetName() const */ void ServerPlanetObjectTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != ServerPlanetObjectTemplate_tag) { @@ -158,7 +184,7 @@ void ServerPlanetObjectTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -178,8 +204,10 @@ void ServerPlanetObjectTemplate::load(Iff &file) file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 0, 0)) + if (getHighestTemplateVersion() != TAG(0,0,0,0)) { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); m_versionOk = false; } @@ -203,4 +231,4 @@ void ServerPlanetObjectTemplate::load(Iff &file) return; } // ServerPlanetObjectTemplate::load -//@END TFD \ No newline at end of file +//@END TFD diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerPlanetObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerPlanetObjectTemplate.h old mode 100755 new mode 100644 index c87a9d50..16160251 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerPlanetObjectTemplate.h +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerPlanetObjectTemplate.h @@ -44,8 +44,13 @@ public: //@BEGIN TFD public: - const std::string & getPlanetName() const; + const std::string & getPlanetName(bool testData = false) const; +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerPlayerObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerPlayerObjectTemplate.cpp old mode 100755 new mode 100644 index 752f5ed4..75bbfeca --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerPlayerObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerPlayerObjectTemplate.cpp @@ -12,7 +12,7 @@ #include "serverGame/FirstServerGame.h" #include "ServerPlayerObjectTemplate.h" - +#include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedObject/ObjectTemplate.h" #include "sharedObject/ObjectTemplateList.h" @@ -24,20 +24,20 @@ const std::string DefaultString(""); const StringId DefaultStringId("", 0); -const Vector DefaultVector(0, 0, 0); +const Vector DefaultVector(0,0,0); const TriggerVolumeData DefaultTriggerVolumeData; bool ServerPlayerObjectTemplate::ms_allowDefaultTemplateParams = true; + /** * Class constructor. */ ServerPlayerObjectTemplate::ServerPlayerObjectTemplate(const std::string & filename) //@BEGIN TFD INIT : ServerIntangibleObjectTemplate(filename) - , m_versionOk(true) - , m_templateVersion(0) - //@END TFD INIT + ,m_versionOk(true) +//@END TFD INIT { } // ServerPlayerObjectTemplate::ServerPlayerObjectTemplate @@ -46,8 +46,8 @@ ServerPlayerObjectTemplate::ServerPlayerObjectTemplate(const std::string & filen */ ServerPlayerObjectTemplate::~ServerPlayerObjectTemplate() { - //@BEGIN TFD CLEANUP - //@END TFD CLEANUP +//@BEGIN TFD CLEANUP +//@END TFD CLEANUP } // ServerPlayerObjectTemplate::~ServerPlayerObjectTemplate /** @@ -95,10 +95,10 @@ Tag ServerPlayerObjectTemplate::getTemplateVersion(void) const */ Tag ServerPlayerObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerPlayerObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerPlayerObjectTemplate::getHighestTemplateVersion @@ -114,6 +114,15 @@ Object * ServerPlayerObjectTemplate::createObject(void) const } // ServerPlayerObjectTemplate::createObject //@BEGIN TFD +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void ServerPlayerObjectTemplate::testValues(void) const +{ + ServerIntangibleObjectTemplate::testValues(); +} // ServerPlayerObjectTemplate::testValues +#endif /** * Loads the template data from an iff file. We should already be in the form @@ -123,8 +132,8 @@ Object * ServerPlayerObjectTemplate::createObject(void) const */ void ServerPlayerObjectTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != ServerPlayerObjectTemplate_tag) { @@ -134,7 +143,7 @@ void ServerPlayerObjectTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -154,8 +163,10 @@ void ServerPlayerObjectTemplate::load(Iff &file) file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 0, 0)) + if (getHighestTemplateVersion() != TAG(0,0,0,0)) { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); m_versionOk = false; } @@ -173,4 +184,4 @@ void ServerPlayerObjectTemplate::load(Iff &file) return; } // ServerPlayerObjectTemplate::load -//@END TFD \ No newline at end of file +//@END TFD diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerPlayerObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerPlayerObjectTemplate.h old mode 100755 new mode 100644 index 098ed26c..9ca8d598 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerPlayerObjectTemplate.h +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerPlayerObjectTemplate.h @@ -48,6 +48,11 @@ public: //@BEGIN TFD public: +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerPlayerQuestObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerPlayerQuestObjectTemplate.cpp old mode 100755 new mode 100644 index 48d74162..e757e2d2 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerPlayerQuestObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerPlayerQuestObjectTemplate.cpp @@ -13,7 +13,7 @@ #include "serverGame/FirstServerGame.h" #include "serverGame/PlayerQuestObject.h" #include "ServerPlayerQuestObjectTemplate.h" - +#include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedMath/Vector.h" #include "sharedObject/ObjectTemplate.h" @@ -24,20 +24,20 @@ const std::string DefaultString(""); const StringId DefaultStringId("", 0); -const Vector DefaultVector(0, 0, 0); +const Vector DefaultVector(0,0,0); const TriggerVolumeData DefaultTriggerVolumeData; bool ServerPlayerQuestObjectTemplate::ms_allowDefaultTemplateParams = true; + /** * Class constructor. */ ServerPlayerQuestObjectTemplate::ServerPlayerQuestObjectTemplate(const std::string & filename) //@BEGIN TFD INIT : ServerTangibleObjectTemplate(filename) - , m_versionOk(true) - , m_templateVersion(0) - //@END TFD INIT + ,m_versionOk(true) +//@END TFD INIT { } // ServerPlayerQuestObjectTemplate::ServerPlayerQuestObjectTemplate @@ -46,8 +46,8 @@ ServerPlayerQuestObjectTemplate::ServerPlayerQuestObjectTemplate(const std::stri */ ServerPlayerQuestObjectTemplate::~ServerPlayerQuestObjectTemplate() { - //@BEGIN TFD CLEANUP - //@END TFD CLEANUP +//@BEGIN TFD CLEANUP +//@END TFD CLEANUP } // ServerPlayerQuestObjectTemplate::~ServerPlayerQuestObjectTemplate /** @@ -95,10 +95,10 @@ Tag ServerPlayerQuestObjectTemplate::getTemplateVersion(void) const */ Tag ServerPlayerQuestObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerPlayerQuestObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerPlayerQuestObjectTemplate::getHighestTemplateVersion @@ -113,7 +113,17 @@ Object * ServerPlayerQuestObjectTemplate::createObject(void) const return new PlayerQuestObject(this); } // ServerMissionObjectTemplate::createObject + //@BEGIN TFD +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void ServerPlayerQuestObjectTemplate::testValues(void) const +{ + ServerTangibleObjectTemplate::testValues(); +} // ServerPlayerQuestObjectTemplate::testValues +#endif /** * Loads the template data from an iff file. We should already be in the form @@ -123,8 +133,8 @@ Object * ServerPlayerQuestObjectTemplate::createObject(void) const */ void ServerPlayerQuestObjectTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != ServerPlayerQuestObjectTemplate_tag) { @@ -134,7 +144,7 @@ void ServerPlayerQuestObjectTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -154,8 +164,10 @@ void ServerPlayerQuestObjectTemplate::load(Iff &file) file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 0, 0)) + if (getHighestTemplateVersion() != TAG(0,0,0,0)) { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); m_versionOk = false; } @@ -173,4 +185,4 @@ void ServerPlayerQuestObjectTemplate::load(Iff &file) return; } // ServerPlayerQuestObjectTemplate::load -//@END TFD \ No newline at end of file +//@END TFD diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerPlayerQuestObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerPlayerQuestObjectTemplate.h old mode 100755 new mode 100644 index cf677c9c..3027c1af --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerPlayerQuestObjectTemplate.h +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerPlayerQuestObjectTemplate.h @@ -45,6 +45,11 @@ public: //@BEGIN TFD public: +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerResourceContainerObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerResourceContainerObjectTemplate.cpp old mode 100755 new mode 100644 index a4eba676..66022f81 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerResourceContainerObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerResourceContainerObjectTemplate.cpp @@ -22,20 +22,20 @@ const std::string DefaultString(""); const StringId DefaultStringId("", 0); -const Vector DefaultVector(0, 0, 0); +const Vector DefaultVector(0,0,0); const TriggerVolumeData DefaultTriggerVolumeData; bool ServerResourceContainerObjectTemplate::ms_allowDefaultTemplateParams = true; + /** * Class constructor. */ ServerResourceContainerObjectTemplate::ServerResourceContainerObjectTemplate(const std::string & filename) //@BEGIN TFD INIT : ServerTangibleObjectTemplate(filename) - , m_versionOk(true) - , m_templateVersion(0) - //@END TFD INIT + ,m_versionOk(true) +//@END TFD INIT { } // ServerResourceContainerObjectTemplate::ServerResourceContainerObjectTemplate @@ -44,8 +44,8 @@ ServerResourceContainerObjectTemplate::ServerResourceContainerObjectTemplate(con */ ServerResourceContainerObjectTemplate::~ServerResourceContainerObjectTemplate() { - //@BEGIN TFD CLEANUP - //@END TFD CLEANUP +//@BEGIN TFD CLEANUP +//@END TFD CLEANUP } // ServerResourceContainerObjectTemplate::~ServerResourceContainerObjectTemplate /** @@ -93,10 +93,10 @@ Tag ServerResourceContainerObjectTemplate::getTemplateVersion(void) const */ Tag ServerResourceContainerObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerResourceContainerObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerResourceContainerObjectTemplate::getHighestTemplateVersion @@ -112,12 +112,22 @@ Object * ServerResourceContainerObjectTemplate::createObject(void) const } // ServerResourceContainerObjectTemplate::createObject //@BEGIN TFD -int ServerResourceContainerObjectTemplate::getMaxResources() const +int ServerResourceContainerObjectTemplate::getMaxResources(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerResourceContainerObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getMaxResources(true); +#endif } if (!m_maxResources.isLoaded()) @@ -157,16 +167,31 @@ int ServerResourceContainerObjectTemplate::getMaxResources() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerResourceContainerObjectTemplate::getMaxResources -int ServerResourceContainerObjectTemplate::getMaxResourcesMin() const +int ServerResourceContainerObjectTemplate::getMaxResourcesMin(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerResourceContainerObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getMaxResourcesMin(true); +#endif } if (!m_maxResources.isLoaded()) @@ -206,16 +231,31 @@ int ServerResourceContainerObjectTemplate::getMaxResourcesMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerResourceContainerObjectTemplate::getMaxResourcesMin -int ServerResourceContainerObjectTemplate::getMaxResourcesMax() const +int ServerResourceContainerObjectTemplate::getMaxResourcesMax(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerResourceContainerObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getMaxResourcesMax(true); +#endif } if (!m_maxResources.isLoaded()) @@ -255,10 +295,27 @@ int ServerResourceContainerObjectTemplate::getMaxResourcesMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerResourceContainerObjectTemplate::getMaxResourcesMax +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void ServerResourceContainerObjectTemplate::testValues(void) const +{ + IGNORE_RETURN(getMaxResourcesMin(true)); + IGNORE_RETURN(getMaxResourcesMax(true)); + ServerTangibleObjectTemplate::testValues(); +} // ServerResourceContainerObjectTemplate::testValues +#endif + /** * Loads the template data from an iff file. We should already be in the form * for this template. @@ -267,8 +324,8 @@ int ServerResourceContainerObjectTemplate::getMaxResourcesMax() const */ void ServerResourceContainerObjectTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != ServerResourceContainerObjectTemplate_tag) { @@ -278,7 +335,7 @@ void ServerResourceContainerObjectTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -298,8 +355,10 @@ void ServerResourceContainerObjectTemplate::load(Iff &file) file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 0, 0)) + if (getHighestTemplateVersion() != TAG(0,0,0,0)) { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); m_versionOk = false; } @@ -323,4 +382,4 @@ void ServerResourceContainerObjectTemplate::load(Iff &file) return; } // ServerResourceContainerObjectTemplate::load -//@END TFD \ No newline at end of file +//@END TFD diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerResourceContainerObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerResourceContainerObjectTemplate.h old mode 100755 new mode 100644 index aff0948e..478e871f --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerResourceContainerObjectTemplate.h +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerResourceContainerObjectTemplate.h @@ -44,10 +44,15 @@ public: //@BEGIN TFD public: - int getMaxResources() const; - int getMaxResourcesMin() const; - int getMaxResourcesMax() const; + int getMaxResources(bool testData = false) const; + int getMaxResourcesMin(bool testData = false) const; + int getMaxResourcesMax(bool testData = false) const; +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerSharedObjectTemplateInterface.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerSharedObjectTemplateInterface.cpp old mode 100755 new mode 100644 diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerSharedObjectTemplateInterface.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerSharedObjectTemplateInterface.h old mode 100755 new mode 100644 diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerShipObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerShipObjectTemplate.cpp old mode 100755 new mode 100644 index d4b0320c..0b090670 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerShipObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerShipObjectTemplate.cpp @@ -13,7 +13,7 @@ #include "serverGame/FirstServerGame.h" #include "ServerShipObjectTemplate.h" #include "serverGame/ShipObject.h" - +#include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedObject/ObjectTemplate.h" #include "sharedObject/ObjectTemplateList.h" @@ -23,20 +23,20 @@ const std::string DefaultString(""); const StringId DefaultStringId("", 0); -const Vector DefaultVector(0, 0, 0); +const Vector DefaultVector(0,0,0); const TriggerVolumeData DefaultTriggerVolumeData; bool ServerShipObjectTemplate::ms_allowDefaultTemplateParams = true; + /** * Class constructor. */ ServerShipObjectTemplate::ServerShipObjectTemplate(const std::string & filename) //@BEGIN TFD INIT : ServerTangibleObjectTemplate(filename) - , m_versionOk(true) - , m_templateVersion(0) - //@END TFD INIT + ,m_versionOk(true) +//@END TFD INIT { } // ServerShipObjectTemplate::ServerShipObjectTemplate @@ -45,8 +45,8 @@ ServerShipObjectTemplate::ServerShipObjectTemplate(const std::string & filename) */ ServerShipObjectTemplate::~ServerShipObjectTemplate() { - //@BEGIN TFD CLEANUP - //@END TFD CLEANUP +//@BEGIN TFD CLEANUP +//@END TFD CLEANUP } // ServerShipObjectTemplate::~ServerShipObjectTemplate /** @@ -94,10 +94,10 @@ Tag ServerShipObjectTemplate::getTemplateVersion(void) const */ Tag ServerShipObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerShipObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerShipObjectTemplate::getHighestTemplateVersion @@ -113,12 +113,22 @@ Object * ServerShipObjectTemplate::createObject(void) const } // ServerShipObjectTemplate::createObject //@BEGIN TFD -const std::string & ServerShipObjectTemplate::getShipType() const +const std::string & ServerShipObjectTemplate::getShipType(bool testData) const { +#ifdef _DEBUG +std::string testDataValue = DefaultString; +#else +UNREF(testData); +#endif + const ServerShipObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getShipType(true); +#endif } if (!m_shipType.isLoaded()) @@ -136,10 +146,26 @@ const std::string & ServerShipObjectTemplate::getShipType() const } const std::string & value = m_shipType.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerShipObjectTemplate::getShipType +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void ServerShipObjectTemplate::testValues(void) const +{ + IGNORE_RETURN(getShipType(true)); + ServerTangibleObjectTemplate::testValues(); +} // ServerShipObjectTemplate::testValues +#endif + /** * Loads the template data from an iff file. We should already be in the form * for this template. @@ -148,8 +174,8 @@ const std::string & ServerShipObjectTemplate::getShipType() const */ void ServerShipObjectTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != ServerShipObjectTemplate_tag) { @@ -159,7 +185,7 @@ void ServerShipObjectTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -179,8 +205,10 @@ void ServerShipObjectTemplate::load(Iff &file) file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 0, 1)) + if (getHighestTemplateVersion() != TAG(0,0,0,1)) { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); m_versionOk = false; } @@ -204,4 +232,4 @@ void ServerShipObjectTemplate::load(Iff &file) return; } // ServerShipObjectTemplate::load -//@END TFD \ No newline at end of file +//@END TFD diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerShipObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerShipObjectTemplate.h old mode 100755 new mode 100644 index c55342f9..44f18426 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerShipObjectTemplate.h +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerShipObjectTemplate.h @@ -44,8 +44,13 @@ public: //@BEGIN TFD public: - const std::string & getShipType() const; + const std::string & getShipType(bool testData = false) const; +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerStaticObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerStaticObjectTemplate.cpp old mode 100755 new mode 100644 index 46819a82..fc226556 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerStaticObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerStaticObjectTemplate.cpp @@ -22,20 +22,20 @@ const std::string DefaultString(""); const StringId DefaultStringId("", 0); -const Vector DefaultVector(0, 0, 0); +const Vector DefaultVector(0,0,0); const TriggerVolumeData DefaultTriggerVolumeData; bool ServerStaticObjectTemplate::ms_allowDefaultTemplateParams = true; + /** * Class constructor. */ ServerStaticObjectTemplate::ServerStaticObjectTemplate(const std::string & filename) //@BEGIN TFD INIT : ServerObjectTemplate(filename) - , m_versionOk(true) - , m_templateVersion(0) - //@END TFD INIT + ,m_versionOk(true) +//@END TFD INIT { } // ServerStaticObjectTemplate::ServerStaticObjectTemplate @@ -44,8 +44,8 @@ ServerStaticObjectTemplate::ServerStaticObjectTemplate(const std::string & filen */ ServerStaticObjectTemplate::~ServerStaticObjectTemplate() { - //@BEGIN TFD CLEANUP - //@END TFD CLEANUP +//@BEGIN TFD CLEANUP +//@END TFD CLEANUP } // ServerStaticObjectTemplate::~ServerStaticObjectTemplate /** @@ -93,10 +93,10 @@ Tag ServerStaticObjectTemplate::getTemplateVersion(void) const */ Tag ServerStaticObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerStaticObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerStaticObjectTemplate::getHighestTemplateVersion @@ -112,12 +112,22 @@ Object * ServerStaticObjectTemplate::createObject(void) const } // ServerStaticObjectTemplate::createObject //@BEGIN TFD -bool ServerStaticObjectTemplate::getClientOnlyBuildout() const +bool ServerStaticObjectTemplate::getClientOnlyBuildout(bool testData) const { +#ifdef _DEBUG +bool testDataValue = false; +#else +UNREF(testData); +#endif + const ServerStaticObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getClientOnlyBuildout(true); +#endif } if (!m_clientOnlyBuildout.isLoaded()) @@ -135,10 +145,26 @@ bool ServerStaticObjectTemplate::getClientOnlyBuildout() const } bool value = m_clientOnlyBuildout.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerStaticObjectTemplate::getClientOnlyBuildout +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void ServerStaticObjectTemplate::testValues(void) const +{ + IGNORE_RETURN(getClientOnlyBuildout(true)); + ServerObjectTemplate::testValues(); +} // ServerStaticObjectTemplate::testValues +#endif + /** * Loads the template data from an iff file. We should already be in the form * for this template. @@ -147,8 +173,8 @@ bool ServerStaticObjectTemplate::getClientOnlyBuildout() const */ void ServerStaticObjectTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != ServerStaticObjectTemplate_tag) { @@ -158,7 +184,7 @@ void ServerStaticObjectTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -178,8 +204,10 @@ void ServerStaticObjectTemplate::load(Iff &file) file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 0, 1)) + if (getHighestTemplateVersion() != TAG(0,0,0,1)) { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); m_versionOk = false; } @@ -203,4 +231,4 @@ void ServerStaticObjectTemplate::load(Iff &file) return; } // ServerStaticObjectTemplate::load -//@END TFD \ No newline at end of file +//@END TFD diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerStaticObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerStaticObjectTemplate.h old mode 100755 new mode 100644 index 71125cdb..cda42b71 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerStaticObjectTemplate.h +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerStaticObjectTemplate.h @@ -44,8 +44,13 @@ public: //@BEGIN TFD public: - bool getClientOnlyBuildout() const; + bool getClientOnlyBuildout(bool testData = false) const; +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerTangibleObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerTangibleObjectTemplate.cpp old mode 100755 new mode 100644 index 7909df9e..23505a15 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerTangibleObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerTangibleObjectTemplate.cpp @@ -23,22 +23,22 @@ const std::string DefaultString(""); const StringId DefaultStringId("", 0); -const Vector DefaultVector(0, 0, 0); +const Vector DefaultVector(0,0,0); const TriggerVolumeData DefaultTriggerVolumeData; bool ServerTangibleObjectTemplate::ms_allowDefaultTemplateParams = true; + /** * Class constructor. */ ServerTangibleObjectTemplate::ServerTangibleObjectTemplate(const std::string & filename) //@BEGIN TFD INIT : ServerObjectTemplate(filename) - , m_triggerVolumesLoaded(false) - , m_triggerVolumesAppend(false) - , m_versionOk(true) - , m_templateVersion(0) - //@END TFD INIT + ,m_triggerVolumesLoaded(false) + ,m_triggerVolumesAppend(false) + ,m_versionOk(true) +//@END TFD INIT { } // ServerTangibleObjectTemplate::ServerTangibleObjectTemplate @@ -47,7 +47,7 @@ ServerTangibleObjectTemplate::ServerTangibleObjectTemplate(const std::string & f */ ServerTangibleObjectTemplate::~ServerTangibleObjectTemplate() { - //@BEGIN TFD CLEANUP +//@BEGIN TFD CLEANUP { std::vector::iterator iter; for (iter = m_triggerVolumes.begin(); iter != m_triggerVolumes.end(); ++iter) @@ -57,7 +57,7 @@ ServerTangibleObjectTemplate::~ServerTangibleObjectTemplate() } m_triggerVolumes.clear(); } - //@END TFD CLEANUP +//@END TFD CLEANUP } // ServerTangibleObjectTemplate::~ServerTangibleObjectTemplate /** @@ -105,10 +105,10 @@ Tag ServerTangibleObjectTemplate::getTemplateVersion(void) const */ Tag ServerTangibleObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerTangibleObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerTangibleObjectTemplate::getHighestTemplateVersion @@ -124,7 +124,7 @@ Object * ServerTangibleObjectTemplate::createObject(void) const } // ServerTangibleObjectTemplate::createObject //@BEGIN TFD -const TriggerVolumeData ServerTangibleObjectTemplate::getTriggerVolumes(int index) const +const TriggerVolumeData & ServerTangibleObjectTemplate::getTriggerVolumes(int index) const { const ServerTangibleObjectTemplate * base = nullptr; if (m_baseData != nullptr) @@ -155,8 +155,7 @@ const TriggerVolumeData ServerTangibleObjectTemplate::getTriggerVolumes(int inde } DEBUG_FATAL(index < 0 || static_cast(index) >= m_triggerVolumes.size(), ("template param index out of range")); - const TriggerVolumeData value = m_triggerVolumes[index]->getValue(); - + const TriggerVolumeData & value = m_triggerVolumes[index]->getValue(); return value; } // ServerTangibleObjectTemplate::getTriggerVolumes @@ -184,12 +183,22 @@ size_t ServerTangibleObjectTemplate::getTriggerVolumesCount(void) const return count; } // ServerTangibleObjectTemplate::getTriggerVolumesCount -ServerTangibleObjectTemplate::CombatSkeleton ServerTangibleObjectTemplate::getCombatSkeleton() const +ServerTangibleObjectTemplate::CombatSkeleton ServerTangibleObjectTemplate::getCombatSkeleton(bool testData) const { +#ifdef _DEBUG +ServerTangibleObjectTemplate::CombatSkeleton testDataValue = static_cast(0); +#else +UNREF(testData); +#endif + const ServerTangibleObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getCombatSkeleton(true); +#endif } if (!m_combatSkeleton.isLoaded()) @@ -207,16 +216,31 @@ ServerTangibleObjectTemplate::CombatSkeleton ServerTangibleObjectTemplate::getCo } CombatSkeleton value = static_cast(m_combatSkeleton.getValue()); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerTangibleObjectTemplate::getCombatSkeleton -int ServerTangibleObjectTemplate::getMaxHitPoints() const +int ServerTangibleObjectTemplate::getMaxHitPoints(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerTangibleObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getMaxHitPoints(true); +#endif } if (!m_maxHitPoints.isLoaded()) @@ -256,16 +280,31 @@ int ServerTangibleObjectTemplate::getMaxHitPoints() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerTangibleObjectTemplate::getMaxHitPoints -int ServerTangibleObjectTemplate::getMaxHitPointsMin() const +int ServerTangibleObjectTemplate::getMaxHitPointsMin(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerTangibleObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getMaxHitPointsMin(true); +#endif } if (!m_maxHitPoints.isLoaded()) @@ -305,16 +344,31 @@ int ServerTangibleObjectTemplate::getMaxHitPointsMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerTangibleObjectTemplate::getMaxHitPointsMin -int ServerTangibleObjectTemplate::getMaxHitPointsMax() const +int ServerTangibleObjectTemplate::getMaxHitPointsMax(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerTangibleObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getMaxHitPointsMax(true); +#endif } if (!m_maxHitPoints.isLoaded()) @@ -354,6 +408,11 @@ int ServerTangibleObjectTemplate::getMaxHitPointsMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerTangibleObjectTemplate::getMaxHitPointsMax @@ -386,17 +445,27 @@ const ServerArmorTemplate * ServerTangibleObjectTemplate::getArmor() const { returnValue = dynamic_cast(ObjectTemplateList::fetch(templateName)); if (returnValue == nullptr) - WARNING_STRICT_FATAL(true, ("Error loading template %s", templateName.c_str())); + WARNING_STRICT_FATAL(true, ("Error loading template %s",templateName.c_str())); } return returnValue; } // ServerTangibleObjectTemplate::getArmor -int ServerTangibleObjectTemplate::getInterestRadius() const +int ServerTangibleObjectTemplate::getInterestRadius(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerTangibleObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getInterestRadius(true); +#endif } if (!m_interestRadius.isLoaded()) @@ -436,16 +505,31 @@ int ServerTangibleObjectTemplate::getInterestRadius() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerTangibleObjectTemplate::getInterestRadius -int ServerTangibleObjectTemplate::getInterestRadiusMin() const +int ServerTangibleObjectTemplate::getInterestRadiusMin(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerTangibleObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getInterestRadiusMin(true); +#endif } if (!m_interestRadius.isLoaded()) @@ -485,16 +569,31 @@ int ServerTangibleObjectTemplate::getInterestRadiusMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerTangibleObjectTemplate::getInterestRadiusMin -int ServerTangibleObjectTemplate::getInterestRadiusMax() const +int ServerTangibleObjectTemplate::getInterestRadiusMax(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerTangibleObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getInterestRadiusMax(true); +#endif } if (!m_interestRadius.isLoaded()) @@ -534,16 +633,31 @@ int ServerTangibleObjectTemplate::getInterestRadiusMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerTangibleObjectTemplate::getInterestRadiusMax -int ServerTangibleObjectTemplate::getCount() const +int ServerTangibleObjectTemplate::getCount(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerTangibleObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getCount(true); +#endif } if (!m_count.isLoaded()) @@ -583,16 +697,31 @@ int ServerTangibleObjectTemplate::getCount() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerTangibleObjectTemplate::getCount -int ServerTangibleObjectTemplate::getCountMin() const +int ServerTangibleObjectTemplate::getCountMin(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerTangibleObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getCountMin(true); +#endif } if (!m_count.isLoaded()) @@ -632,16 +761,31 @@ int ServerTangibleObjectTemplate::getCountMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerTangibleObjectTemplate::getCountMin -int ServerTangibleObjectTemplate::getCountMax() const +int ServerTangibleObjectTemplate::getCountMax(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerTangibleObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getCountMax(true); +#endif } if (!m_count.isLoaded()) @@ -681,16 +825,31 @@ int ServerTangibleObjectTemplate::getCountMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerTangibleObjectTemplate::getCountMax -int ServerTangibleObjectTemplate::getCondition() const +int ServerTangibleObjectTemplate::getCondition(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerTangibleObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getCondition(true); +#endif } if (!m_condition.isLoaded()) @@ -730,16 +889,31 @@ int ServerTangibleObjectTemplate::getCondition() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerTangibleObjectTemplate::getCondition -int ServerTangibleObjectTemplate::getConditionMin() const +int ServerTangibleObjectTemplate::getConditionMin(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerTangibleObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getConditionMin(true); +#endif } if (!m_condition.isLoaded()) @@ -779,16 +953,31 @@ int ServerTangibleObjectTemplate::getConditionMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerTangibleObjectTemplate::getConditionMin -int ServerTangibleObjectTemplate::getConditionMax() const +int ServerTangibleObjectTemplate::getConditionMax(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerTangibleObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getConditionMax(true); +#endif } if (!m_condition.isLoaded()) @@ -828,16 +1017,31 @@ int ServerTangibleObjectTemplate::getConditionMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerTangibleObjectTemplate::getConditionMax -bool ServerTangibleObjectTemplate::getWantSawAttackTriggers() const +bool ServerTangibleObjectTemplate::getWantSawAttackTriggers(bool testData) const { +#ifdef _DEBUG +bool testDataValue = false; +#else +UNREF(testData); +#endif + const ServerTangibleObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getWantSawAttackTriggers(true); +#endif } if (!m_wantSawAttackTriggers.isLoaded()) @@ -855,10 +1059,35 @@ bool ServerTangibleObjectTemplate::getWantSawAttackTriggers() const } bool value = m_wantSawAttackTriggers.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerTangibleObjectTemplate::getWantSawAttackTriggers +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void ServerTangibleObjectTemplate::testValues(void) const +{ + IGNORE_RETURN(getCombatSkeleton(true)); + IGNORE_RETURN(getMaxHitPointsMin(true)); + IGNORE_RETURN(getMaxHitPointsMax(true)); + IGNORE_RETURN(getInterestRadiusMin(true)); + IGNORE_RETURN(getInterestRadiusMax(true)); + IGNORE_RETURN(getCountMin(true)); + IGNORE_RETURN(getCountMax(true)); + IGNORE_RETURN(getConditionMin(true)); + IGNORE_RETURN(getConditionMax(true)); + IGNORE_RETURN(getWantSawAttackTriggers(true)); + ServerObjectTemplate::testValues(); +} // ServerTangibleObjectTemplate::testValues +#endif + /** * Loads the template data from an iff file. We should already be in the form * for this template. @@ -867,8 +1096,8 @@ bool ServerTangibleObjectTemplate::getWantSawAttackTriggers() const */ void ServerTangibleObjectTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != ServerTangibleObjectTemplate_tag) { @@ -878,7 +1107,7 @@ void ServerTangibleObjectTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -898,8 +1127,10 @@ void ServerTangibleObjectTemplate::load(Iff &file) file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 0, 4)) + if (getHighestTemplateVersion() != TAG(0,0,0,4)) { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); m_versionOk = false; } @@ -954,4 +1185,4 @@ void ServerTangibleObjectTemplate::load(Iff &file) return; } // ServerTangibleObjectTemplate::load -//@END TFD \ No newline at end of file +//@END TFD diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerTangibleObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerTangibleObjectTemplate.h old mode 100755 new mode 100644 index 8d4520de..30d0e447 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerTangibleObjectTemplate.h +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerTangibleObjectTemplate.h @@ -80,35 +80,46 @@ public: C_inflightTutorial = 0x00800000, C_spaceCombatMusic = 0x01000000, // Set programmatically by the AI system. Do not set this in the template. C_encounterLocked = 0x02000000, - Conditions_Last = C_encounterLocked, + C_spawnedCreature = 0x04000000, + C_holidayInteresting = 0x08000000, + C_locked = 0x10000000, + Conditions_Last = C_locked, }; public: - const TriggerVolumeData getTriggerVolumes(int index) const; + const TriggerVolumeData & getTriggerVolumes(int index) const; size_t getTriggerVolumesCount(void) const; - CombatSkeleton getCombatSkeleton() const; - int getMaxHitPoints() const; - int getMaxHitPointsMin() const; - int getMaxHitPointsMax() const; + CombatSkeleton getCombatSkeleton(bool testData = false) const; + int getMaxHitPoints(bool testData = false) const; + int getMaxHitPointsMin(bool testData = false) const; + int getMaxHitPointsMax(bool testData = false) const; const ServerArmorTemplate * getArmor() const; - int getInterestRadius() const; - int getInterestRadiusMin() const; - int getInterestRadiusMax() const; - int getCount() const; - int getCountMin() const; - int getCountMax() const; - int getCondition() const; - int getConditionMin() const; - int getConditionMax() const; - bool getWantSawAttackTriggers() const; + int getInterestRadius(bool testData = false) const; + int getInterestRadiusMin(bool testData = false) const; + int getInterestRadiusMax(bool testData = false) const; + int getCount(bool testData = false) const; + int getCountMin(bool testData = false) const; + int getCountMax(bool testData = false) const; + int getCondition(bool testData = false) const; + int getConditionMin(bool testData = false) const; + int getConditionMax(bool testData = false) const; + bool getWantSawAttackTriggers(bool testData = false) const; +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); private: - // these MUST be reflected in clientGame/TangibleObject.h - // these MUST be reflected in base_class.java + // these MUST be reflected in: + // //depot/swg/current/dsrc/sku.0/sys.server/compiled/game/object/tangible_object_template.tdf + // //depot/swg/current/dsrc/sku.0/sys.server/compiled/game/script/base_class.java + // //depot/swg/current/src/engine/client/library/clientGame/src/shared/object/TangibleObject.h + // //depot/swg/current/src/engine/server/library/serverGame/src/shared/object/TangibleObject.h stdvector::fwd m_triggerVolumes; // trigger volume(s) attached to the object bool m_triggerVolumesLoaded; bool m_triggerVolumesAppend; diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerTokenObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerTokenObjectTemplate.cpp new file mode 100644 index 00000000..d43d6c37 --- /dev/null +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerTokenObjectTemplate.cpp @@ -0,0 +1,176 @@ +//======================================================================== +// +// ServerTokenObjectTemplate.cpp +// +//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be +//overwritten the next time the template definition is compiled. Do not +//make changes to code inside these blocks. +// +// copyright 2001 Sony Online Entertainment +// +//======================================================================== + +#include "serverGame/FirstServerGame.h" +#include "ServerTokenObjectTemplate.h" +#include "sharedDebug/DataLint.h" +#include "sharedFile/Iff.h" +#include "sharedObject/ObjectTemplate.h" +#include "sharedObject/ObjectTemplateList.h" +#include "sharedMath/Vector.h" +//@BEGIN TFD TEMPLATE REFS +//@END TFD TEMPLATE REFS +#include + +const std::string DefaultString(""); +const StringId DefaultStringId("", 0); +const Vector DefaultVector(0,0,0); +const TriggerVolumeData DefaultTriggerVolumeData; + +bool ServerTokenObjectTemplate::ms_allowDefaultTemplateParams = true; + + +/** + * Class constructor. + */ +ServerTokenObjectTemplate::ServerTokenObjectTemplate(const std::string & filename) +//@BEGIN TFD INIT + : ServerIntangibleObjectTemplate(filename) + ,m_versionOk(true) +//@END TFD INIT +{ +} // ServerTokenObjectTemplate::ServerTokenObjectTemplate + +/** + * Class destructor. + */ +ServerTokenObjectTemplate::~ServerTokenObjectTemplate() +{ +//@BEGIN TFD CLEANUP +//@END TFD CLEANUP +} // ServerTokenObjectTemplate::~ServerTokenObjectTemplate + +/** + * Static function used to register this template. + */ +void ServerTokenObjectTemplate::registerMe(void) +{ + ObjectTemplateList::registerTemplate(ServerTokenObjectTemplate_tag, create); +} // ServerTokenObjectTemplate::registerMe + +/** + * Creates a ServerTokenObjectTemplate template. + * + * @return a new instance of the template + */ +ObjectTemplate * ServerTokenObjectTemplate::create(const std::string & filename) +{ + return new ServerTokenObjectTemplate(filename); +} // ServerTokenObjectTemplate::create + +/** + * Returns the template id. + * + * @return the template id + */ +Tag ServerTokenObjectTemplate::getId(void) const +{ + return ServerTokenObjectTemplate_tag; +} // ServerTokenObjectTemplate::getId + +/** + * Returns this template's version. + * + * @return the version + */ +Tag ServerTokenObjectTemplate::getTemplateVersion(void) const +{ + return m_templateVersion; +} // ServerTokenObjectTemplate::getTemplateVersion + +/** + * Returns the highest version of this template or it's base templates. + * + * @return the highest version + */ +Tag ServerTokenObjectTemplate::getHighestTemplateVersion(void) const +{ + if (m_baseData == nullptr) + return m_templateVersion; + const ServerTokenObjectTemplate * base = dynamic_cast(m_baseData); + if (base == nullptr) + return m_templateVersion; + return std::max(m_templateVersion, base->getHighestTemplateVersion()); +} // ServerTokenObjectTemplate::getHighestTemplateVersion + +//@BEGIN TFD +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void ServerTokenObjectTemplate::testValues(void) const +{ + ServerIntangibleObjectTemplate::testValues(); +} // ServerTokenObjectTemplate::testValues +#endif + +/** + * Loads the template data from an iff file. We should already be in the form + * for this template. + * + * @param file file to load from + */ +void ServerTokenObjectTemplate::load(Iff &file) +{ +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; + + if (file.getCurrentName() != ServerTokenObjectTemplate_tag) + { + ServerIntangibleObjectTemplate::load(file); + return; + } + + file.enterForm(); + m_templateVersion = file.getCurrentName(); + if (m_templateVersion == TAG(D,E,R,V)) + { + file.enterForm(); + file.enterChunk(); + std::string baseFilename; + file.read_string(baseFilename); + file.exitChunk(); + const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) + base->releaseReference(); + else + { + if (m_baseData != nullptr) + m_baseData->releaseReference(); + m_baseData = base; + } + file.exitForm(); + m_templateVersion = file.getCurrentName(); + } + if (getHighestTemplateVersion() != TAG(0,0,0,0)) + { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); + m_versionOk = false; + } + + file.enterForm(); + + file.enterChunk(); + int paramCount = file.read_int32(); + file.exitChunk(); + UNREF(paramName); + UNREF(paramCount); + + file.exitForm(); + ServerIntangibleObjectTemplate::load(file); + file.exitForm(); + return; +} // ServerTokenObjectTemplate::load + +//@END TFD diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerTokenObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerTokenObjectTemplate.h new file mode 100644 index 00000000..2c1cb805 --- /dev/null +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerTokenObjectTemplate.h @@ -0,0 +1,83 @@ +//======================================================================== +// +// ServerTokenObjectTemplate.h +// +//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be +//overwritten the next time the template definition is compiled. Do not +//make changes to code inside these blocks. +// +// copyright 2001 Sony Online Entertainment +// +//======================================================================== + +#ifndef _INCLUDED_ServerTokenObjectTemplate_H +#define _INCLUDED_ServerTokenObjectTemplate_H + +#include "ServerIntangibleObjectTemplate.h" +#include "sharedFoundation/DynamicVariable.h" +#include "sharedUtility/TemplateParameter.h" + + +class Vector; +typedef StructParam StructParamOT; +//@BEGIN TFD TEMPLATE REFS +//@END TFD TEMPLATE REFS + + +class ServerTokenObjectTemplate : public ServerIntangibleObjectTemplate +{ +public: +//@BEGIN TFD ID + enum + { + ServerTokenObjectTemplate_tag = TAG(T,O,K,N) + }; +//@END TFD ID +public: + ServerTokenObjectTemplate(const std::string & filename); + virtual ~ServerTokenObjectTemplate(); + + virtual Tag getId(void) const; + virtual Tag getTemplateVersion(void) const; + virtual Tag getHighestTemplateVersion(void) const; + static void install(bool allowDefaultTemplateParams = true); + +//@BEGIN TFD +public: + +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif + +protected: + virtual void load(Iff &file); + +private: +//@END TFD + +private: + Tag m_templateVersion; // the template version + bool m_versionOk; // flag that the template version loaded is the one we expect + static bool ms_allowDefaultTemplateParams; // flag to allow defaut params instead of fataling + + static void registerMe(void); + static ObjectTemplate * create(const std::string & filename); + + // no copying + ServerTokenObjectTemplate(const ServerTokenObjectTemplate &); + ServerTokenObjectTemplate & operator =(const ServerTokenObjectTemplate &); +}; + + +inline void ServerTokenObjectTemplate::install(bool allowDefaultTemplateParams) +{ + ms_allowDefaultTemplateParams = allowDefaultTemplateParams; +//@BEGIN TFD INSTALL + ServerTokenObjectTemplate::registerMe(); +//@END TFD INSTALL +} + + +#endif // _INCLUDED_ServerTokenObjectTemplate_H diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerUniverseObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerUniverseObjectTemplate.cpp old mode 100755 new mode 100644 index eb9194d0..59602c6b --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerUniverseObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerUniverseObjectTemplate.cpp @@ -22,20 +22,20 @@ const std::string DefaultString(""); const StringId DefaultStringId("", 0); -const Vector DefaultVector(0, 0, 0); +const Vector DefaultVector(0,0,0); const TriggerVolumeData DefaultTriggerVolumeData; bool ServerUniverseObjectTemplate::ms_allowDefaultTemplateParams = true; + /** * Class constructor. */ ServerUniverseObjectTemplate::ServerUniverseObjectTemplate(const std::string & filename) //@BEGIN TFD INIT : ServerObjectTemplate(filename) - , m_versionOk(true) - , m_templateVersion(0) - //@END TFD INIT + ,m_versionOk(true) +//@END TFD INIT { } // ServerUniverseObjectTemplate::ServerUniverseObjectTemplate @@ -44,8 +44,8 @@ ServerUniverseObjectTemplate::ServerUniverseObjectTemplate(const std::string & f */ ServerUniverseObjectTemplate::~ServerUniverseObjectTemplate() { - //@BEGIN TFD CLEANUP - //@END TFD CLEANUP +//@BEGIN TFD CLEANUP +//@END TFD CLEANUP } // ServerUniverseObjectTemplate::~ServerUniverseObjectTemplate /** @@ -93,10 +93,10 @@ Tag ServerUniverseObjectTemplate::getTemplateVersion(void) const */ Tag ServerUniverseObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerUniverseObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerUniverseObjectTemplate::getHighestTemplateVersion @@ -112,6 +112,15 @@ Object * ServerUniverseObjectTemplate::createObject(void) const } // ServerUniverseObjectTemplate::createObject //@BEGIN TFD +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void ServerUniverseObjectTemplate::testValues(void) const +{ + ServerObjectTemplate::testValues(); +} // ServerUniverseObjectTemplate::testValues +#endif /** * Loads the template data from an iff file. We should already be in the form @@ -121,8 +130,8 @@ Object * ServerUniverseObjectTemplate::createObject(void) const */ void ServerUniverseObjectTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != ServerUniverseObjectTemplate_tag) { @@ -132,7 +141,7 @@ void ServerUniverseObjectTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -152,8 +161,10 @@ void ServerUniverseObjectTemplate::load(Iff &file) file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 0, 0)) + if (getHighestTemplateVersion() != TAG(0,0,0,0)) { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); m_versionOk = false; } @@ -171,4 +182,4 @@ void ServerUniverseObjectTemplate::load(Iff &file) return; } // ServerUniverseObjectTemplate::load -//@END TFD \ No newline at end of file +//@END TFD diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerUniverseObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerUniverseObjectTemplate.h old mode 100755 new mode 100644 index 773f6584..1a49cd4f --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerUniverseObjectTemplate.h +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerUniverseObjectTemplate.h @@ -45,6 +45,11 @@ public: //@BEGIN TFD public: +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerVehicleObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerVehicleObjectTemplate.cpp old mode 100755 new mode 100644 index 0ee8b18c..d014163a --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerVehicleObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerVehicleObjectTemplate.cpp @@ -22,20 +22,20 @@ const std::string DefaultString(""); const StringId DefaultStringId("", 0); -const Vector DefaultVector(0, 0, 0); +const Vector DefaultVector(0,0,0); const TriggerVolumeData DefaultTriggerVolumeData; bool ServerVehicleObjectTemplate::ms_allowDefaultTemplateParams = true; + /** * Class constructor. */ ServerVehicleObjectTemplate::ServerVehicleObjectTemplate(const std::string & filename) //@BEGIN TFD INIT : ServerTangibleObjectTemplate(filename) - , m_versionOk(true) - , m_templateVersion(0) - //@END TFD INIT + ,m_versionOk(true) +//@END TFD INIT { } // ServerVehicleObjectTemplate::ServerVehicleObjectTemplate @@ -44,8 +44,8 @@ ServerVehicleObjectTemplate::ServerVehicleObjectTemplate(const std::string & fil */ ServerVehicleObjectTemplate::~ServerVehicleObjectTemplate() { - //@BEGIN TFD CLEANUP - //@END TFD CLEANUP +//@BEGIN TFD CLEANUP +//@END TFD CLEANUP } // ServerVehicleObjectTemplate::~ServerVehicleObjectTemplate /** @@ -93,10 +93,10 @@ Tag ServerVehicleObjectTemplate::getTemplateVersion(void) const */ Tag ServerVehicleObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerVehicleObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerVehicleObjectTemplate::getHighestTemplateVersion @@ -112,12 +112,22 @@ Object * ServerVehicleObjectTemplate::createObject(void) const } // ServerVehicleObjectTemplate::createObject //@BEGIN TFD -const std::string & ServerVehicleObjectTemplate::getFuelType() const +const std::string & ServerVehicleObjectTemplate::getFuelType(bool testData) const { +#ifdef _DEBUG +std::string testDataValue = DefaultString; +#else +UNREF(testData); +#endif + const ServerVehicleObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getFuelType(true); +#endif } if (!m_fuelType.isLoaded()) @@ -135,16 +145,31 @@ const std::string & ServerVehicleObjectTemplate::getFuelType() const } const std::string & value = m_fuelType.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerVehicleObjectTemplate::getFuelType -float ServerVehicleObjectTemplate::getCurrentFuel() const +float ServerVehicleObjectTemplate::getCurrentFuel(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerVehicleObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getCurrentFuel(true); +#endif } if (!m_currentFuel.isLoaded()) @@ -184,16 +209,31 @@ float ServerVehicleObjectTemplate::getCurrentFuel() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerVehicleObjectTemplate::getCurrentFuel -float ServerVehicleObjectTemplate::getCurrentFuelMin() const +float ServerVehicleObjectTemplate::getCurrentFuelMin(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerVehicleObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getCurrentFuelMin(true); +#endif } if (!m_currentFuel.isLoaded()) @@ -233,16 +273,31 @@ float ServerVehicleObjectTemplate::getCurrentFuelMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerVehicleObjectTemplate::getCurrentFuelMin -float ServerVehicleObjectTemplate::getCurrentFuelMax() const +float ServerVehicleObjectTemplate::getCurrentFuelMax(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerVehicleObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getCurrentFuelMax(true); +#endif } if (!m_currentFuel.isLoaded()) @@ -282,16 +337,31 @@ float ServerVehicleObjectTemplate::getCurrentFuelMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerVehicleObjectTemplate::getCurrentFuelMax -float ServerVehicleObjectTemplate::getMaxFuel() const +float ServerVehicleObjectTemplate::getMaxFuel(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerVehicleObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getMaxFuel(true); +#endif } if (!m_maxFuel.isLoaded()) @@ -331,16 +401,31 @@ float ServerVehicleObjectTemplate::getMaxFuel() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerVehicleObjectTemplate::getMaxFuel -float ServerVehicleObjectTemplate::getMaxFuelMin() const +float ServerVehicleObjectTemplate::getMaxFuelMin(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerVehicleObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getMaxFuelMin(true); +#endif } if (!m_maxFuel.isLoaded()) @@ -380,16 +465,31 @@ float ServerVehicleObjectTemplate::getMaxFuelMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerVehicleObjectTemplate::getMaxFuelMin -float ServerVehicleObjectTemplate::getMaxFuelMax() const +float ServerVehicleObjectTemplate::getMaxFuelMax(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerVehicleObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getMaxFuelMax(true); +#endif } if (!m_maxFuel.isLoaded()) @@ -429,16 +529,31 @@ float ServerVehicleObjectTemplate::getMaxFuelMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerVehicleObjectTemplate::getMaxFuelMax -float ServerVehicleObjectTemplate::getConsumpsion() const +float ServerVehicleObjectTemplate::getConsumpsion(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerVehicleObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getConsumpsion(true); +#endif } if (!m_consumpsion.isLoaded()) @@ -478,16 +593,31 @@ float ServerVehicleObjectTemplate::getConsumpsion() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerVehicleObjectTemplate::getConsumpsion -float ServerVehicleObjectTemplate::getConsumpsionMin() const +float ServerVehicleObjectTemplate::getConsumpsionMin(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerVehicleObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getConsumpsionMin(true); +#endif } if (!m_consumpsion.isLoaded()) @@ -527,16 +657,31 @@ float ServerVehicleObjectTemplate::getConsumpsionMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerVehicleObjectTemplate::getConsumpsionMin -float ServerVehicleObjectTemplate::getConsumpsionMax() const +float ServerVehicleObjectTemplate::getConsumpsionMax(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerVehicleObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getConsumpsionMax(true); +#endif } if (!m_consumpsion.isLoaded()) @@ -576,10 +721,32 @@ float ServerVehicleObjectTemplate::getConsumpsionMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerVehicleObjectTemplate::getConsumpsionMax +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void ServerVehicleObjectTemplate::testValues(void) const +{ + IGNORE_RETURN(getFuelType(true)); + IGNORE_RETURN(getCurrentFuelMin(true)); + IGNORE_RETURN(getCurrentFuelMax(true)); + IGNORE_RETURN(getMaxFuelMin(true)); + IGNORE_RETURN(getMaxFuelMax(true)); + IGNORE_RETURN(getConsumpsionMin(true)); + IGNORE_RETURN(getConsumpsionMax(true)); + ServerTangibleObjectTemplate::testValues(); +} // ServerVehicleObjectTemplate::testValues +#endif + /** * Loads the template data from an iff file. We should already be in the form * for this template. @@ -588,8 +755,8 @@ float ServerVehicleObjectTemplate::getConsumpsionMax() const */ void ServerVehicleObjectTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != ServerVehicleObjectTemplate_tag) { @@ -599,7 +766,7 @@ void ServerVehicleObjectTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -619,8 +786,10 @@ void ServerVehicleObjectTemplate::load(Iff &file) file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 0, 0)) + if (getHighestTemplateVersion() != TAG(0,0,0,0)) { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); m_versionOk = false; } @@ -650,4 +819,4 @@ void ServerVehicleObjectTemplate::load(Iff &file) return; } // ServerVehicleObjectTemplate::load -//@END TFD \ No newline at end of file +//@END TFD diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerVehicleObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerVehicleObjectTemplate.h old mode 100755 new mode 100644 index 1b0abf8a..8b66cfd5 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerVehicleObjectTemplate.h +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerVehicleObjectTemplate.h @@ -44,17 +44,22 @@ public: //@BEGIN TFD public: - const std::string & getFuelType() const; - float getCurrentFuel() const; - float getCurrentFuelMin() const; - float getCurrentFuelMax() const; - float getMaxFuel() const; - float getMaxFuelMin() const; - float getMaxFuelMax() const; - float getConsumpsion() const; - float getConsumpsionMin() const; - float getConsumpsionMax() const; + const std::string & getFuelType(bool testData = false) const; + float getCurrentFuel(bool testData = false) const; + float getCurrentFuelMin(bool testData = false) const; + float getCurrentFuelMax(bool testData = false) const; + float getMaxFuel(bool testData = false) const; + float getMaxFuelMin(bool testData = false) const; + float getMaxFuelMax(bool testData = false) const; + float getConsumpsion(bool testData = false) const; + float getConsumpsionMin(bool testData = false) const; + float getConsumpsionMax(bool testData = false) const; +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerWeaponObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerWeaponObjectTemplate.cpp old mode 100755 new mode 100644 index ee19eb9c..e4716a76 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerWeaponObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerWeaponObjectTemplate.cpp @@ -22,20 +22,20 @@ const std::string DefaultString(""); const StringId DefaultStringId("", 0); -const Vector DefaultVector(0, 0, 0); +const Vector DefaultVector(0,0,0); const TriggerVolumeData DefaultTriggerVolumeData; bool ServerWeaponObjectTemplate::ms_allowDefaultTemplateParams = true; + /** * Class constructor. */ ServerWeaponObjectTemplate::ServerWeaponObjectTemplate(const std::string & filename) //@BEGIN TFD INIT : ServerTangibleObjectTemplate(filename) - , m_versionOk(true) - , m_templateVersion(0) - //@END TFD INIT + ,m_versionOk(true) +//@END TFD INIT { } // ServerWeaponObjectTemplate::ServerWeaponObjectTemplate @@ -44,8 +44,8 @@ ServerWeaponObjectTemplate::ServerWeaponObjectTemplate(const std::string & filen */ ServerWeaponObjectTemplate::~ServerWeaponObjectTemplate() { - //@BEGIN TFD CLEANUP - //@END TFD CLEANUP +//@BEGIN TFD CLEANUP +//@END TFD CLEANUP } // ServerWeaponObjectTemplate::~ServerWeaponObjectTemplate /** @@ -93,10 +93,10 @@ Tag ServerWeaponObjectTemplate::getTemplateVersion(void) const */ Tag ServerWeaponObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerWeaponObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerWeaponObjectTemplate::getHighestTemplateVersion @@ -112,12 +112,22 @@ Object * ServerWeaponObjectTemplate::createObject(void) const } // ServerWeaponObjectTemplate::createObject //@BEGIN TFD -ServerWeaponObjectTemplate::WeaponType ServerWeaponObjectTemplate::getWeaponType() const +ServerWeaponObjectTemplate::WeaponType ServerWeaponObjectTemplate::getWeaponType(bool testData) const { +#ifdef _DEBUG +ServerWeaponObjectTemplate::WeaponType testDataValue = static_cast(0); +#else +UNREF(testData); +#endif + const ServerWeaponObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getWeaponType(true); +#endif } if (!m_weaponType.isLoaded()) @@ -135,16 +145,31 @@ ServerWeaponObjectTemplate::WeaponType ServerWeaponObjectTemplate::getWeaponType } WeaponType value = static_cast(m_weaponType.getValue()); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerWeaponObjectTemplate::getWeaponType -ServerWeaponObjectTemplate::AttackType ServerWeaponObjectTemplate::getAttackType() const +ServerWeaponObjectTemplate::AttackType ServerWeaponObjectTemplate::getAttackType(bool testData) const { +#ifdef _DEBUG +ServerWeaponObjectTemplate::AttackType testDataValue = static_cast(0); +#else +UNREF(testData); +#endif + const ServerWeaponObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getAttackType(true); +#endif } if (!m_attackType.isLoaded()) @@ -162,16 +187,31 @@ ServerWeaponObjectTemplate::AttackType ServerWeaponObjectTemplate::getAttackType } AttackType value = static_cast(m_attackType.getValue()); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerWeaponObjectTemplate::getAttackType -ServerWeaponObjectTemplate::DamageType ServerWeaponObjectTemplate::getDamageType() const +ServerWeaponObjectTemplate::DamageType ServerWeaponObjectTemplate::getDamageType(bool testData) const { +#ifdef _DEBUG +ServerWeaponObjectTemplate::DamageType testDataValue = static_cast(0); +#else +UNREF(testData); +#endif + const ServerWeaponObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getDamageType(true); +#endif } if (!m_damageType.isLoaded()) @@ -189,16 +229,31 @@ ServerWeaponObjectTemplate::DamageType ServerWeaponObjectTemplate::getDamageType } DamageType value = static_cast(m_damageType.getValue()); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerWeaponObjectTemplate::getDamageType -ServerWeaponObjectTemplate::DamageType ServerWeaponObjectTemplate::getElementalType() const +ServerWeaponObjectTemplate::DamageType ServerWeaponObjectTemplate::getElementalType(bool testData) const { +#ifdef _DEBUG +ServerWeaponObjectTemplate::DamageType testDataValue = static_cast(0); +#else +UNREF(testData); +#endif + const ServerWeaponObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getElementalType(true); +#endif } if (!m_elementalType.isLoaded()) @@ -216,16 +271,31 @@ ServerWeaponObjectTemplate::DamageType ServerWeaponObjectTemplate::getElementalT } DamageType value = static_cast(m_elementalType.getValue()); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerWeaponObjectTemplate::getElementalType -int ServerWeaponObjectTemplate::getElementalValue() const +int ServerWeaponObjectTemplate::getElementalValue(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerWeaponObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getElementalValue(true); +#endif } if (!m_elementalValue.isLoaded()) @@ -265,16 +335,31 @@ int ServerWeaponObjectTemplate::getElementalValue() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerWeaponObjectTemplate::getElementalValue -int ServerWeaponObjectTemplate::getElementalValueMin() const +int ServerWeaponObjectTemplate::getElementalValueMin(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerWeaponObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getElementalValueMin(true); +#endif } if (!m_elementalValue.isLoaded()) @@ -314,16 +399,31 @@ int ServerWeaponObjectTemplate::getElementalValueMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerWeaponObjectTemplate::getElementalValueMin -int ServerWeaponObjectTemplate::getElementalValueMax() const +int ServerWeaponObjectTemplate::getElementalValueMax(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerWeaponObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getElementalValueMax(true); +#endif } if (!m_elementalValue.isLoaded()) @@ -363,16 +463,31 @@ int ServerWeaponObjectTemplate::getElementalValueMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerWeaponObjectTemplate::getElementalValueMax -int ServerWeaponObjectTemplate::getMinDamageAmount() const +int ServerWeaponObjectTemplate::getMinDamageAmount(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerWeaponObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getMinDamageAmount(true); +#endif } if (!m_minDamageAmount.isLoaded()) @@ -412,16 +527,31 @@ int ServerWeaponObjectTemplate::getMinDamageAmount() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerWeaponObjectTemplate::getMinDamageAmount -int ServerWeaponObjectTemplate::getMinDamageAmountMin() const +int ServerWeaponObjectTemplate::getMinDamageAmountMin(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerWeaponObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getMinDamageAmountMin(true); +#endif } if (!m_minDamageAmount.isLoaded()) @@ -461,16 +591,31 @@ int ServerWeaponObjectTemplate::getMinDamageAmountMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerWeaponObjectTemplate::getMinDamageAmountMin -int ServerWeaponObjectTemplate::getMinDamageAmountMax() const +int ServerWeaponObjectTemplate::getMinDamageAmountMax(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerWeaponObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getMinDamageAmountMax(true); +#endif } if (!m_minDamageAmount.isLoaded()) @@ -510,16 +655,31 @@ int ServerWeaponObjectTemplate::getMinDamageAmountMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerWeaponObjectTemplate::getMinDamageAmountMax -int ServerWeaponObjectTemplate::getMaxDamageAmount() const +int ServerWeaponObjectTemplate::getMaxDamageAmount(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerWeaponObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getMaxDamageAmount(true); +#endif } if (!m_maxDamageAmount.isLoaded()) @@ -559,16 +719,31 @@ int ServerWeaponObjectTemplate::getMaxDamageAmount() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerWeaponObjectTemplate::getMaxDamageAmount -int ServerWeaponObjectTemplate::getMaxDamageAmountMin() const +int ServerWeaponObjectTemplate::getMaxDamageAmountMin(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerWeaponObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getMaxDamageAmountMin(true); +#endif } if (!m_maxDamageAmount.isLoaded()) @@ -608,16 +783,31 @@ int ServerWeaponObjectTemplate::getMaxDamageAmountMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerWeaponObjectTemplate::getMaxDamageAmountMin -int ServerWeaponObjectTemplate::getMaxDamageAmountMax() const +int ServerWeaponObjectTemplate::getMaxDamageAmountMax(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerWeaponObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getMaxDamageAmountMax(true); +#endif } if (!m_maxDamageAmount.isLoaded()) @@ -657,16 +847,31 @@ int ServerWeaponObjectTemplate::getMaxDamageAmountMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerWeaponObjectTemplate::getMaxDamageAmountMax -float ServerWeaponObjectTemplate::getAttackSpeed() const +float ServerWeaponObjectTemplate::getAttackSpeed(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerWeaponObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getAttackSpeed(true); +#endif } if (!m_attackSpeed.isLoaded()) @@ -706,16 +911,31 @@ float ServerWeaponObjectTemplate::getAttackSpeed() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerWeaponObjectTemplate::getAttackSpeed -float ServerWeaponObjectTemplate::getAttackSpeedMin() const +float ServerWeaponObjectTemplate::getAttackSpeedMin(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerWeaponObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getAttackSpeedMin(true); +#endif } if (!m_attackSpeed.isLoaded()) @@ -755,16 +975,31 @@ float ServerWeaponObjectTemplate::getAttackSpeedMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerWeaponObjectTemplate::getAttackSpeedMin -float ServerWeaponObjectTemplate::getAttackSpeedMax() const +float ServerWeaponObjectTemplate::getAttackSpeedMax(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerWeaponObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getAttackSpeedMax(true); +#endif } if (!m_attackSpeed.isLoaded()) @@ -804,16 +1039,31 @@ float ServerWeaponObjectTemplate::getAttackSpeedMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerWeaponObjectTemplate::getAttackSpeedMax -float ServerWeaponObjectTemplate::getAudibleRange() const +float ServerWeaponObjectTemplate::getAudibleRange(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerWeaponObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getAudibleRange(true); +#endif } if (!m_audibleRange.isLoaded()) @@ -853,16 +1103,31 @@ float ServerWeaponObjectTemplate::getAudibleRange() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerWeaponObjectTemplate::getAudibleRange -float ServerWeaponObjectTemplate::getAudibleRangeMin() const +float ServerWeaponObjectTemplate::getAudibleRangeMin(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerWeaponObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getAudibleRangeMin(true); +#endif } if (!m_audibleRange.isLoaded()) @@ -902,16 +1167,31 @@ float ServerWeaponObjectTemplate::getAudibleRangeMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerWeaponObjectTemplate::getAudibleRangeMin -float ServerWeaponObjectTemplate::getAudibleRangeMax() const +float ServerWeaponObjectTemplate::getAudibleRangeMax(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerWeaponObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getAudibleRangeMax(true); +#endif } if (!m_audibleRange.isLoaded()) @@ -951,16 +1231,31 @@ float ServerWeaponObjectTemplate::getAudibleRangeMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerWeaponObjectTemplate::getAudibleRangeMax -float ServerWeaponObjectTemplate::getMinRange() const +float ServerWeaponObjectTemplate::getMinRange(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerWeaponObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getMinRange(true); +#endif } if (!m_minRange.isLoaded()) @@ -1000,16 +1295,31 @@ float ServerWeaponObjectTemplate::getMinRange() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerWeaponObjectTemplate::getMinRange -float ServerWeaponObjectTemplate::getMinRangeMin() const +float ServerWeaponObjectTemplate::getMinRangeMin(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerWeaponObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getMinRangeMin(true); +#endif } if (!m_minRange.isLoaded()) @@ -1049,16 +1359,31 @@ float ServerWeaponObjectTemplate::getMinRangeMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerWeaponObjectTemplate::getMinRangeMin -float ServerWeaponObjectTemplate::getMinRangeMax() const +float ServerWeaponObjectTemplate::getMinRangeMax(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerWeaponObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getMinRangeMax(true); +#endif } if (!m_minRange.isLoaded()) @@ -1098,16 +1423,31 @@ float ServerWeaponObjectTemplate::getMinRangeMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerWeaponObjectTemplate::getMinRangeMax -float ServerWeaponObjectTemplate::getMaxRange() const +float ServerWeaponObjectTemplate::getMaxRange(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerWeaponObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getMaxRange(true); +#endif } if (!m_maxRange.isLoaded()) @@ -1147,16 +1487,31 @@ float ServerWeaponObjectTemplate::getMaxRange() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerWeaponObjectTemplate::getMaxRange -float ServerWeaponObjectTemplate::getMaxRangeMin() const +float ServerWeaponObjectTemplate::getMaxRangeMin(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerWeaponObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getMaxRangeMin(true); +#endif } if (!m_maxRange.isLoaded()) @@ -1196,16 +1551,31 @@ float ServerWeaponObjectTemplate::getMaxRangeMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerWeaponObjectTemplate::getMaxRangeMin -float ServerWeaponObjectTemplate::getMaxRangeMax() const +float ServerWeaponObjectTemplate::getMaxRangeMax(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerWeaponObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getMaxRangeMax(true); +#endif } if (!m_maxRange.isLoaded()) @@ -1245,16 +1615,31 @@ float ServerWeaponObjectTemplate::getMaxRangeMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerWeaponObjectTemplate::getMaxRangeMax -float ServerWeaponObjectTemplate::getDamageRadius() const +float ServerWeaponObjectTemplate::getDamageRadius(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerWeaponObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getDamageRadius(true); +#endif } if (!m_damageRadius.isLoaded()) @@ -1294,16 +1679,31 @@ float ServerWeaponObjectTemplate::getDamageRadius() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerWeaponObjectTemplate::getDamageRadius -float ServerWeaponObjectTemplate::getDamageRadiusMin() const +float ServerWeaponObjectTemplate::getDamageRadiusMin(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerWeaponObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getDamageRadiusMin(true); +#endif } if (!m_damageRadius.isLoaded()) @@ -1343,16 +1743,31 @@ float ServerWeaponObjectTemplate::getDamageRadiusMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerWeaponObjectTemplate::getDamageRadiusMin -float ServerWeaponObjectTemplate::getDamageRadiusMax() const +float ServerWeaponObjectTemplate::getDamageRadiusMax(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerWeaponObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getDamageRadiusMax(true); +#endif } if (!m_damageRadius.isLoaded()) @@ -1392,16 +1807,31 @@ float ServerWeaponObjectTemplate::getDamageRadiusMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerWeaponObjectTemplate::getDamageRadiusMax -float ServerWeaponObjectTemplate::getWoundChance() const +float ServerWeaponObjectTemplate::getWoundChance(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerWeaponObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getWoundChance(true); +#endif } if (!m_woundChance.isLoaded()) @@ -1441,16 +1871,31 @@ float ServerWeaponObjectTemplate::getWoundChance() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerWeaponObjectTemplate::getWoundChance -float ServerWeaponObjectTemplate::getWoundChanceMin() const +float ServerWeaponObjectTemplate::getWoundChanceMin(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerWeaponObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getWoundChanceMin(true); +#endif } if (!m_woundChance.isLoaded()) @@ -1490,16 +1935,31 @@ float ServerWeaponObjectTemplate::getWoundChanceMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerWeaponObjectTemplate::getWoundChanceMin -float ServerWeaponObjectTemplate::getWoundChanceMax() const +float ServerWeaponObjectTemplate::getWoundChanceMax(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const ServerWeaponObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getWoundChanceMax(true); +#endif } if (!m_woundChance.isLoaded()) @@ -1539,16 +1999,31 @@ float ServerWeaponObjectTemplate::getWoundChanceMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerWeaponObjectTemplate::getWoundChanceMax -int ServerWeaponObjectTemplate::getAttackCost() const +int ServerWeaponObjectTemplate::getAttackCost(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerWeaponObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getAttackCost(true); +#endif } if (!m_attackCost.isLoaded()) @@ -1588,16 +2063,31 @@ int ServerWeaponObjectTemplate::getAttackCost() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerWeaponObjectTemplate::getAttackCost -int ServerWeaponObjectTemplate::getAttackCostMin() const +int ServerWeaponObjectTemplate::getAttackCostMin(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerWeaponObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getAttackCostMin(true); +#endif } if (!m_attackCost.isLoaded()) @@ -1637,16 +2127,31 @@ int ServerWeaponObjectTemplate::getAttackCostMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerWeaponObjectTemplate::getAttackCostMin -int ServerWeaponObjectTemplate::getAttackCostMax() const +int ServerWeaponObjectTemplate::getAttackCostMax(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerWeaponObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getAttackCostMax(true); +#endif } if (!m_attackCost.isLoaded()) @@ -1686,16 +2191,31 @@ int ServerWeaponObjectTemplate::getAttackCostMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerWeaponObjectTemplate::getAttackCostMax -int ServerWeaponObjectTemplate::getAccuracy() const +int ServerWeaponObjectTemplate::getAccuracy(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerWeaponObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getAccuracy(true); +#endif } if (!m_accuracy.isLoaded()) @@ -1735,16 +2255,31 @@ int ServerWeaponObjectTemplate::getAccuracy() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerWeaponObjectTemplate::getAccuracy -int ServerWeaponObjectTemplate::getAccuracyMin() const +int ServerWeaponObjectTemplate::getAccuracyMin(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerWeaponObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getAccuracyMin(true); +#endif } if (!m_accuracy.isLoaded()) @@ -1784,16 +2319,31 @@ int ServerWeaponObjectTemplate::getAccuracyMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerWeaponObjectTemplate::getAccuracyMin -int ServerWeaponObjectTemplate::getAccuracyMax() const +int ServerWeaponObjectTemplate::getAccuracyMax(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const ServerWeaponObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getAccuracyMax(true); +#endif } if (!m_accuracy.isLoaded()) @@ -1833,10 +2383,51 @@ int ServerWeaponObjectTemplate::getAccuracyMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // ServerWeaponObjectTemplate::getAccuracyMax +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void ServerWeaponObjectTemplate::testValues(void) const +{ + IGNORE_RETURN(getWeaponType(true)); + IGNORE_RETURN(getAttackType(true)); + IGNORE_RETURN(getDamageType(true)); + IGNORE_RETURN(getElementalType(true)); + IGNORE_RETURN(getElementalValueMin(true)); + IGNORE_RETURN(getElementalValueMax(true)); + IGNORE_RETURN(getMinDamageAmountMin(true)); + IGNORE_RETURN(getMinDamageAmountMax(true)); + IGNORE_RETURN(getMaxDamageAmountMin(true)); + IGNORE_RETURN(getMaxDamageAmountMax(true)); + IGNORE_RETURN(getAttackSpeedMin(true)); + IGNORE_RETURN(getAttackSpeedMax(true)); + IGNORE_RETURN(getAudibleRangeMin(true)); + IGNORE_RETURN(getAudibleRangeMax(true)); + IGNORE_RETURN(getMinRangeMin(true)); + IGNORE_RETURN(getMinRangeMax(true)); + IGNORE_RETURN(getMaxRangeMin(true)); + IGNORE_RETURN(getMaxRangeMax(true)); + IGNORE_RETURN(getDamageRadiusMin(true)); + IGNORE_RETURN(getDamageRadiusMax(true)); + IGNORE_RETURN(getWoundChanceMin(true)); + IGNORE_RETURN(getWoundChanceMax(true)); + IGNORE_RETURN(getAttackCostMin(true)); + IGNORE_RETURN(getAttackCostMax(true)); + IGNORE_RETURN(getAccuracyMin(true)); + IGNORE_RETURN(getAccuracyMax(true)); + ServerTangibleObjectTemplate::testValues(); +} // ServerWeaponObjectTemplate::testValues +#endif + /** * Loads the template data from an iff file. We should already be in the form * for this template. @@ -1845,8 +2436,8 @@ int ServerWeaponObjectTemplate::getAccuracyMax() const */ void ServerWeaponObjectTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != ServerWeaponObjectTemplate_tag) { @@ -1856,7 +2447,7 @@ void ServerWeaponObjectTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -1876,8 +2467,10 @@ void ServerWeaponObjectTemplate::load(Iff &file) file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 1, 1)) + if (getHighestTemplateVersion() != TAG(0,0,1,1)) { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); m_versionOk = false; } @@ -1929,4 +2522,4 @@ void ServerWeaponObjectTemplate::load(Iff &file) return; } // ServerWeaponObjectTemplate::load -//@END TFD \ No newline at end of file +//@END TFD diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerWeaponObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerWeaponObjectTemplate.h old mode 100755 new mode 100644 index 1f4c57d6..7d48dbfd --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerWeaponObjectTemplate.h +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerWeaponObjectTemplate.h @@ -74,48 +74,55 @@ public: WT_1handLightsaber, WT_2handLightsaber, WT_polearmLightsaber, - WeaponType_Last = WT_polearmLightsaber, + WT_groundTargetting, + WT_directionTargetting, + WeaponType_Last = WT_directionTargetting, }; public: - WeaponType getWeaponType() const; - AttackType getAttackType() const; - DamageType getDamageType() const; - DamageType getElementalType() const; - int getElementalValue() const; - int getElementalValueMin() const; - int getElementalValueMax() const; - int getMinDamageAmount() const; - int getMinDamageAmountMin() const; - int getMinDamageAmountMax() const; - int getMaxDamageAmount() const; - int getMaxDamageAmountMin() const; - int getMaxDamageAmountMax() const; - float getAttackSpeed() const; - float getAttackSpeedMin() const; - float getAttackSpeedMax() const; - float getAudibleRange() const; - float getAudibleRangeMin() const; - float getAudibleRangeMax() const; - float getMinRange() const; - float getMinRangeMin() const; - float getMinRangeMax() const; - float getMaxRange() const; - float getMaxRangeMin() const; - float getMaxRangeMax() const; - float getDamageRadius() const; - float getDamageRadiusMin() const; - float getDamageRadiusMax() const; - float getWoundChance() const; - float getWoundChanceMin() const; - float getWoundChanceMax() const; - int getAttackCost() const; - int getAttackCostMin() const; - int getAttackCostMax() const; - int getAccuracy() const; - int getAccuracyMin() const; - int getAccuracyMax() const; + WeaponType getWeaponType(bool testData = false) const; + AttackType getAttackType(bool testData = false) const; + DamageType getDamageType(bool testData = false) const; + DamageType getElementalType(bool testData = false) const; + int getElementalValue(bool testData = false) const; + int getElementalValueMin(bool testData = false) const; + int getElementalValueMax(bool testData = false) const; + int getMinDamageAmount(bool testData = false) const; + int getMinDamageAmountMin(bool testData = false) const; + int getMinDamageAmountMax(bool testData = false) const; + int getMaxDamageAmount(bool testData = false) const; + int getMaxDamageAmountMin(bool testData = false) const; + int getMaxDamageAmountMax(bool testData = false) const; + float getAttackSpeed(bool testData = false) const; + float getAttackSpeedMin(bool testData = false) const; + float getAttackSpeedMax(bool testData = false) const; + float getAudibleRange(bool testData = false) const; + float getAudibleRangeMin(bool testData = false) const; + float getAudibleRangeMax(bool testData = false) const; + float getMinRange(bool testData = false) const; + float getMinRangeMin(bool testData = false) const; + float getMinRangeMax(bool testData = false) const; + float getMaxRange(bool testData = false) const; + float getMaxRangeMin(bool testData = false) const; + float getMaxRangeMax(bool testData = false) const; + float getDamageRadius(bool testData = false) const; + float getDamageRadiusMin(bool testData = false) const; + float getDamageRadiusMax(bool testData = false) const; + float getWoundChance(bool testData = false) const; + float getWoundChanceMin(bool testData = false) const; + float getWoundChanceMax(bool testData = false) const; + int getAttackCost(bool testData = false) const; + int getAttackCostMin(bool testData = false) const; + int getAttackCostMax(bool testData = false) const; + int getAccuracy(bool testData = false) const; + int getAccuracyMin(bool testData = false) const; + int getAccuracyMax(bool testData = false) const; +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerXpManagerObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerXpManagerObjectTemplate.cpp old mode 100755 new mode 100644 index 332585f5..80b08bdf --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerXpManagerObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerXpManagerObjectTemplate.cpp @@ -12,15 +12,14 @@ #include "serverGame/FirstServerGame.h" #include "ServerXpManagerObjectTemplate.h" - +#include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedObject/ObjectTemplate.h" #include "sharedObject/ObjectTemplateList.h" //#include "serverGame/XpManagerObject.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS -#include -#include +#include const std::string DefaultString(""); const StringId DefaultStringId("", 0); @@ -29,15 +28,15 @@ const TriggerVolumeData DefaultTriggerVolumeData; bool ServerXpManagerObjectTemplate::ms_allowDefaultTemplateParams = true; + /** * Class constructor. */ ServerXpManagerObjectTemplate::ServerXpManagerObjectTemplate(const std::string & filename) //@BEGIN TFD INIT : ServerUniverseObjectTemplate(filename) - , m_versionOk(true) - , m_templateVersion(0) - //@END TFD INIT + ,m_versionOk(true) +//@END TFD INIT { } // ServerXpManagerObjectTemplate::ServerXpManagerObjectTemplate @@ -46,8 +45,8 @@ ServerXpManagerObjectTemplate::ServerXpManagerObjectTemplate(const std::string & */ ServerXpManagerObjectTemplate::~ServerXpManagerObjectTemplate() { - //@BEGIN TFD CLEANUP - //@END TFD CLEANUP +//@BEGIN TFD CLEANUP +//@END TFD CLEANUP } // ServerXpManagerObjectTemplate::~ServerXpManagerObjectTemplate /** @@ -95,10 +94,10 @@ Tag ServerXpManagerObjectTemplate::getTemplateVersion(void) const */ Tag ServerXpManagerObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerXpManagerObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerXpManagerObjectTemplate::getHighestTemplateVersion @@ -110,11 +109,20 @@ Tag ServerXpManagerObjectTemplate::getHighestTemplateVersion(void) const */ Object * ServerXpManagerObjectTemplate::createObject(void) const { - // return new XpManagerObject(this); - return nullptr; +// return new XpManagerObject(this); + return NULL; } // ServerXpManagerObjectTemplate::createObject //@BEGIN TFD +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void ServerXpManagerObjectTemplate::testValues(void) const +{ + ServerUniverseObjectTemplate::testValues(); +} // ServerXpManagerObjectTemplate::testValues +#endif /** * Loads the template data from an iff file. We should already be in the form @@ -124,8 +132,8 @@ Object * ServerXpManagerObjectTemplate::createObject(void) const */ void ServerXpManagerObjectTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != ServerXpManagerObjectTemplate_tag) { @@ -135,7 +143,7 @@ void ServerXpManagerObjectTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -155,8 +163,10 @@ void ServerXpManagerObjectTemplate::load(Iff &file) file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 0, 0)) + if (getHighestTemplateVersion() != TAG(0,0,0,0)) { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); m_versionOk = false; } @@ -174,4 +184,4 @@ void ServerXpManagerObjectTemplate::load(Iff &file) return; } // ServerXpManagerObjectTemplate::load -//@END TFD \ No newline at end of file +//@END TFD diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerXpManagerObjectTemplate.h b/engine/server/library/serverGame/src/shared/objectTemplate/ServerXpManagerObjectTemplate.h old mode 100755 new mode 100644 index 4147ea9f..0e17966c --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerXpManagerObjectTemplate.h +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerXpManagerObjectTemplate.h @@ -45,6 +45,11 @@ public: //@BEGIN TFD public: +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); diff --git a/engine/shared/library/sharedGame/src/CMakeLists.txt b/engine/shared/library/sharedGame/src/CMakeLists.txt index 7cb435dc..67f45c4e 100644 --- a/engine/shared/library/sharedGame/src/CMakeLists.txt +++ b/engine/shared/library/sharedGame/src/CMakeLists.txt @@ -197,18 +197,18 @@ set(SHARED_SOURCES shared/objectTemplate/SharedJediManagerObjectTemplate.h shared/objectTemplate/SharedManufactureSchematicObjectTemplate.cpp shared/objectTemplate/SharedManufactureSchematicObjectTemplate.h + shared/objectTemplate/SharedMissionDataObjectTemplate.cpp + shared/objectTemplate/SharedMissionDataObjectTemplate.h + shared/objectTemplate/SharedMissionListEntryObjectTemplate.cpp + shared/objectTemplate/SharedMissionListEntryObjectTemplate.h shared/objectTemplate/SharedMissionObjectTemplate.cpp shared/objectTemplate/SharedMissionObjectTemplate.h - shared/objectTemplate/SharedObjectTemplateClientData.cpp - shared/objectTemplate/SharedObjectTemplateClientData.h - shared/objectTemplate/SharedObjectTemplateInterface.cpp - shared/objectTemplate/SharedObjectTemplateInterface.h shared/objectTemplate/SharedObjectTemplate.cpp shared/objectTemplate/SharedObjectTemplate.h - shared/objectTemplate/SharedPlayerQuestObjectTemplate.h - shared/objectTemplate/SharedPlayerQuestObjectTemplate.cpp shared/objectTemplate/SharedPlayerObjectTemplate.cpp shared/objectTemplate/SharedPlayerObjectTemplate.h + shared/objectTemplate/SharedPlayerQuestObjectTemplate.cpp + shared/objectTemplate/SharedPlayerQuestObjectTemplate.h shared/objectTemplate/SharedResourceContainerObjectTemplate.cpp shared/objectTemplate/SharedResourceContainerObjectTemplate.h shared/objectTemplate/SharedShipObjectTemplate.cpp @@ -219,6 +219,8 @@ set(SHARED_SOURCES shared/objectTemplate/SharedTangibleObjectTemplate.h shared/objectTemplate/SharedTerrainSurfaceObjectTemplate.cpp shared/objectTemplate/SharedTerrainSurfaceObjectTemplate.h + shared/objectTemplate/SharedTokenObjectTemplate.cpp + shared/objectTemplate/SharedTokenObjectTemplate.h shared/objectTemplate/SharedUniverseObjectTemplate.cpp shared/objectTemplate/SharedUniverseObjectTemplate.h shared/objectTemplate/SharedVehicleObjectTemplate.cpp @@ -226,7 +228,7 @@ set(SHARED_SOURCES shared/objectTemplate/SharedWaypointObjectTemplate.cpp shared/objectTemplate/SharedWaypointObjectTemplate.h shared/objectTemplate/SharedWeaponObjectTemplate.cpp - shared/objectTemplate/SharedWeaponObjectTemplate.h + shared/objectTemplate/SharedWeaponObjectTemplate.h shared/quest/PlayerQuestData.cpp shared/quest/PlayerQuestData.h diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedBattlefieldMarkerObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedBattlefieldMarkerObjectTemplate.cpp old mode 100755 new mode 100644 index ee7609f5..a83d8b7f --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedBattlefieldMarkerObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedBattlefieldMarkerObjectTemplate.cpp @@ -12,7 +12,7 @@ #include "sharedGame/FirstSharedGame.h" #include "SharedBattlefieldMarkerObjectTemplate.h" - +#include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedMath/Vector.h" #include "sharedObject/ObjectTemplate.h" @@ -24,20 +24,20 @@ const std::string DefaultString(""); const StringId DefaultStringId("", 0); -const Vector DefaultVector(0, 0, 0); +const Vector DefaultVector(0,0,0); const TriggerVolumeData DefaultTriggerVolumeData; bool SharedBattlefieldMarkerObjectTemplate::ms_allowDefaultTemplateParams = true; + /** * Class constructor. */ SharedBattlefieldMarkerObjectTemplate::SharedBattlefieldMarkerObjectTemplate(const std::string & filename) //@BEGIN TFD INIT : SharedTangibleObjectTemplate(filename) - , m_versionOk(true) - , m_templateVersion(0) - //@END TFD INIT + ,m_versionOk(true) +//@END TFD INIT { } // SharedBattlefieldMarkerObjectTemplate::SharedBattlefieldMarkerObjectTemplate @@ -46,8 +46,8 @@ SharedBattlefieldMarkerObjectTemplate::SharedBattlefieldMarkerObjectTemplate(con */ SharedBattlefieldMarkerObjectTemplate::~SharedBattlefieldMarkerObjectTemplate() { - //@BEGIN TFD CLEANUP - //@END TFD CLEANUP +//@BEGIN TFD CLEANUP +//@END TFD CLEANUP } // SharedBattlefieldMarkerObjectTemplate::~SharedBattlefieldMarkerObjectTemplate /** @@ -104,12 +104,22 @@ Tag SharedBattlefieldMarkerObjectTemplate::getHighestTemplateVersion(void) const } // SharedBattlefieldMarkerObjectTemplate::getHighestTemplateVersion //@BEGIN TFD -int SharedBattlefieldMarkerObjectTemplate::getNumberOfPoles() const +int SharedBattlefieldMarkerObjectTemplate::getNumberOfPoles(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const SharedBattlefieldMarkerObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getNumberOfPoles(true); +#endif } if (!m_numberOfPoles.isLoaded()) @@ -149,16 +159,31 @@ int SharedBattlefieldMarkerObjectTemplate::getNumberOfPoles() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedBattlefieldMarkerObjectTemplate::getNumberOfPoles -int SharedBattlefieldMarkerObjectTemplate::getNumberOfPolesMin() const +int SharedBattlefieldMarkerObjectTemplate::getNumberOfPolesMin(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const SharedBattlefieldMarkerObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getNumberOfPolesMin(true); +#endif } if (!m_numberOfPoles.isLoaded()) @@ -198,16 +223,31 @@ int SharedBattlefieldMarkerObjectTemplate::getNumberOfPolesMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedBattlefieldMarkerObjectTemplate::getNumberOfPolesMin -int SharedBattlefieldMarkerObjectTemplate::getNumberOfPolesMax() const +int SharedBattlefieldMarkerObjectTemplate::getNumberOfPolesMax(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const SharedBattlefieldMarkerObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getNumberOfPolesMax(true); +#endif } if (!m_numberOfPoles.isLoaded()) @@ -247,16 +287,31 @@ int SharedBattlefieldMarkerObjectTemplate::getNumberOfPolesMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedBattlefieldMarkerObjectTemplate::getNumberOfPolesMax -float SharedBattlefieldMarkerObjectTemplate::getRadius() const +float SharedBattlefieldMarkerObjectTemplate::getRadius(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedBattlefieldMarkerObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getRadius(true); +#endif } if (!m_radius.isLoaded()) @@ -296,16 +351,31 @@ float SharedBattlefieldMarkerObjectTemplate::getRadius() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedBattlefieldMarkerObjectTemplate::getRadius -float SharedBattlefieldMarkerObjectTemplate::getRadiusMin() const +float SharedBattlefieldMarkerObjectTemplate::getRadiusMin(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedBattlefieldMarkerObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getRadiusMin(true); +#endif } if (!m_radius.isLoaded()) @@ -345,16 +415,31 @@ float SharedBattlefieldMarkerObjectTemplate::getRadiusMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedBattlefieldMarkerObjectTemplate::getRadiusMin -float SharedBattlefieldMarkerObjectTemplate::getRadiusMax() const +float SharedBattlefieldMarkerObjectTemplate::getRadiusMax(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedBattlefieldMarkerObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getRadiusMax(true); +#endif } if (!m_radius.isLoaded()) @@ -394,10 +479,29 @@ float SharedBattlefieldMarkerObjectTemplate::getRadiusMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedBattlefieldMarkerObjectTemplate::getRadiusMax +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void SharedBattlefieldMarkerObjectTemplate::testValues(void) const +{ + IGNORE_RETURN(getNumberOfPolesMin(true)); + IGNORE_RETURN(getNumberOfPolesMax(true)); + IGNORE_RETURN(getRadiusMin(true)); + IGNORE_RETURN(getRadiusMax(true)); + SharedTangibleObjectTemplate::testValues(); +} // SharedBattlefieldMarkerObjectTemplate::testValues +#endif + /** * Loads the template data from an iff file. We should already be in the form * for this template. @@ -406,8 +510,8 @@ float SharedBattlefieldMarkerObjectTemplate::getRadiusMax() const */ void SharedBattlefieldMarkerObjectTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != SharedBattlefieldMarkerObjectTemplate_tag) { @@ -417,7 +521,7 @@ void SharedBattlefieldMarkerObjectTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -437,8 +541,10 @@ void SharedBattlefieldMarkerObjectTemplate::load(Iff &file) file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 0, 1)) + if (getHighestTemplateVersion() != TAG(0,0,0,1)) { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); m_versionOk = false; } @@ -464,4 +570,4 @@ void SharedBattlefieldMarkerObjectTemplate::load(Iff &file) return; } // SharedBattlefieldMarkerObjectTemplate::load -//@END TFD \ No newline at end of file +//@END TFD diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedBattlefieldMarkerObjectTemplate.h b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedBattlefieldMarkerObjectTemplate.h old mode 100755 new mode 100644 index 52200959..29672636 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedBattlefieldMarkerObjectTemplate.h +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedBattlefieldMarkerObjectTemplate.h @@ -44,13 +44,18 @@ public: //@BEGIN TFD public: - int getNumberOfPoles() const; - int getNumberOfPolesMin() const; - int getNumberOfPolesMax() const; - float getRadius() const; - float getRadiusMin() const; - float getRadiusMax() const; + int getNumberOfPoles(bool testData = false) const; + int getNumberOfPolesMin(bool testData = false) const; + int getNumberOfPolesMax(bool testData = false) const; + float getRadius(bool testData = false) const; + float getRadiusMin(bool testData = false) const; + float getRadiusMax(bool testData = false) const; +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedBuildingObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedBuildingObjectTemplate.cpp old mode 100755 new mode 100644 index 04da57c3..89b64952 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedBuildingObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedBuildingObjectTemplate.cpp @@ -23,20 +23,20 @@ const std::string DefaultString(""); const StringId DefaultStringId("", 0); -const Vector DefaultVector(0, 0, 0); +const Vector DefaultVector(0,0,0); const TriggerVolumeData DefaultTriggerVolumeData; bool SharedBuildingObjectTemplate::ms_allowDefaultTemplateParams = true; + /** * Class constructor. */ SharedBuildingObjectTemplate::SharedBuildingObjectTemplate(const std::string & filename) //@BEGIN TFD INIT : SharedTangibleObjectTemplate(filename) - , m_versionOk(true) - , m_templateVersion(0) - //@END TFD INIT + ,m_versionOk(true) +//@END TFD INIT { } // SharedBuildingObjectTemplate::SharedBuildingObjectTemplate @@ -45,8 +45,8 @@ SharedBuildingObjectTemplate::SharedBuildingObjectTemplate(const std::string & f */ SharedBuildingObjectTemplate::~SharedBuildingObjectTemplate() { - //@BEGIN TFD CLEANUP - //@END TFD CLEANUP +//@BEGIN TFD CLEANUP +//@END TFD CLEANUP } // SharedBuildingObjectTemplate::~SharedBuildingObjectTemplate /** @@ -103,12 +103,22 @@ Tag SharedBuildingObjectTemplate::getHighestTemplateVersion(void) const } // SharedBuildingObjectTemplate::getHighestTemplateVersion //@BEGIN TFD -const std::string & SharedBuildingObjectTemplate::getTerrainModificationFileName() const +const std::string & SharedBuildingObjectTemplate::getTerrainModificationFileName(bool testData) const { +#ifdef _DEBUG +std::string testDataValue = DefaultString; +#else +UNREF(testData); +#endif + const SharedBuildingObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getTerrainModificationFileName(true); +#endif } if (!m_terrainModificationFileName.isLoaded()) @@ -126,16 +136,31 @@ const std::string & SharedBuildingObjectTemplate::getTerrainModificationFileName } const std::string & value = m_terrainModificationFileName.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedBuildingObjectTemplate::getTerrainModificationFileName -const std::string & SharedBuildingObjectTemplate::getInteriorLayoutFileName() const +const std::string & SharedBuildingObjectTemplate::getInteriorLayoutFileName(bool testData) const { +#ifdef _DEBUG +std::string testDataValue = DefaultString; +#else +UNREF(testData); +#endif + const SharedBuildingObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getInteriorLayoutFileName(true); +#endif } if (!m_interiorLayoutFileName.isLoaded()) @@ -153,10 +178,27 @@ const std::string & SharedBuildingObjectTemplate::getInteriorLayoutFileName() co } const std::string & value = m_interiorLayoutFileName.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedBuildingObjectTemplate::getInteriorLayoutFileName +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void SharedBuildingObjectTemplate::testValues(void) const +{ + IGNORE_RETURN(getTerrainModificationFileName(true)); + IGNORE_RETURN(getInteriorLayoutFileName(true)); + SharedTangibleObjectTemplate::testValues(); +} // SharedBuildingObjectTemplate::testValues +#endif + /** * Loads the template data from an iff file. We should already be in the form * for this template. @@ -165,8 +207,8 @@ const std::string & SharedBuildingObjectTemplate::getInteriorLayoutFileName() co */ void SharedBuildingObjectTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != SharedBuildingObjectTemplate_tag) { @@ -176,7 +218,7 @@ void SharedBuildingObjectTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -196,8 +238,10 @@ void SharedBuildingObjectTemplate::load(Iff &file) file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 0, 1)) + if (getHighestTemplateVersion() != TAG(0,0,0,1)) { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); m_versionOk = false; } @@ -223,4 +267,4 @@ void SharedBuildingObjectTemplate::load(Iff &file) return; } // SharedBuildingObjectTemplate::load -//@END TFD \ No newline at end of file +//@END TFD diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedBuildingObjectTemplate.h b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedBuildingObjectTemplate.h old mode 100755 new mode 100644 index 9405f059..1c37d84e --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedBuildingObjectTemplate.h +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedBuildingObjectTemplate.h @@ -44,9 +44,14 @@ public: //@BEGIN TFD public: - const std::string & getTerrainModificationFileName() const; - const std::string & getInteriorLayoutFileName() const; + const std::string & getTerrainModificationFileName(bool testData = false) const; + const std::string & getInteriorLayoutFileName(bool testData = false) const; +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedCellObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedCellObjectTemplate.cpp old mode 100755 new mode 100644 index 5b19458e..0c319760 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedCellObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedCellObjectTemplate.cpp @@ -23,20 +23,20 @@ const std::string DefaultString(""); const StringId DefaultStringId("", 0); -const Vector DefaultVector(0, 0, 0); +const Vector DefaultVector(0,0,0); const TriggerVolumeData DefaultTriggerVolumeData; bool SharedCellObjectTemplate::ms_allowDefaultTemplateParams = true; + /** * Class constructor. */ SharedCellObjectTemplate::SharedCellObjectTemplate(const std::string & filename) //@BEGIN TFD INIT : SharedObjectTemplate(filename) - , m_versionOk(true) - , m_templateVersion(0) - //@END TFD INIT + ,m_versionOk(true) +//@END TFD INIT { } // SharedCellObjectTemplate::SharedCellObjectTemplate @@ -45,8 +45,8 @@ SharedCellObjectTemplate::SharedCellObjectTemplate(const std::string & filename) */ SharedCellObjectTemplate::~SharedCellObjectTemplate() { - //@BEGIN TFD CLEANUP - //@END TFD CLEANUP +//@BEGIN TFD CLEANUP +//@END TFD CLEANUP } // SharedCellObjectTemplate::~SharedCellObjectTemplate /** @@ -103,6 +103,15 @@ Tag SharedCellObjectTemplate::getHighestTemplateVersion(void) const } // SharedCellObjectTemplate::getHighestTemplateVersion //@BEGIN TFD +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void SharedCellObjectTemplate::testValues(void) const +{ + SharedObjectTemplate::testValues(); +} // SharedCellObjectTemplate::testValues +#endif /** * Loads the template data from an iff file. We should already be in the form @@ -112,8 +121,8 @@ Tag SharedCellObjectTemplate::getHighestTemplateVersion(void) const */ void SharedCellObjectTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != SharedCellObjectTemplate_tag) { @@ -123,7 +132,7 @@ void SharedCellObjectTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -143,8 +152,10 @@ void SharedCellObjectTemplate::load(Iff &file) file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 0, 0)) + if (getHighestTemplateVersion() != TAG(0,0,0,0)) { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); m_versionOk = false; } @@ -162,4 +173,4 @@ void SharedCellObjectTemplate::load(Iff &file) return; } // SharedCellObjectTemplate::load -//@END TFD \ No newline at end of file +//@END TFD diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedCellObjectTemplate.h b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedCellObjectTemplate.h old mode 100755 new mode 100644 index c7489b64..01c05587 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedCellObjectTemplate.h +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedCellObjectTemplate.h @@ -45,6 +45,11 @@ public: //@BEGIN TFD public: +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedConstructionContractObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedConstructionContractObjectTemplate.cpp old mode 100755 new mode 100644 index b47a62d9..ab455e20 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedConstructionContractObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedConstructionContractObjectTemplate.cpp @@ -23,20 +23,20 @@ const std::string DefaultString(""); const StringId DefaultStringId("", 0); -const Vector DefaultVector(0, 0, 0); +const Vector DefaultVector(0,0,0); const TriggerVolumeData DefaultTriggerVolumeData; bool SharedConstructionContractObjectTemplate::ms_allowDefaultTemplateParams = true; + /** * Class constructor. */ SharedConstructionContractObjectTemplate::SharedConstructionContractObjectTemplate(const std::string & filename) //@BEGIN TFD INIT : SharedIntangibleObjectTemplate(filename) - , m_versionOk(true) - , m_templateVersion(0) - //@END TFD INIT + ,m_versionOk(true) +//@END TFD INIT { } // SharedConstructionContractObjectTemplate::SharedConstructionContractObjectTemplate @@ -45,8 +45,8 @@ SharedConstructionContractObjectTemplate::SharedConstructionContractObjectTempla */ SharedConstructionContractObjectTemplate::~SharedConstructionContractObjectTemplate() { - //@BEGIN TFD CLEANUP - //@END TFD CLEANUP +//@BEGIN TFD CLEANUP +//@END TFD CLEANUP } // SharedConstructionContractObjectTemplate::~SharedConstructionContractObjectTemplate /** @@ -103,6 +103,15 @@ Tag SharedConstructionContractObjectTemplate::getHighestTemplateVersion(void) co } // SharedConstructionContractObjectTemplate::getHighestTemplateVersion //@BEGIN TFD +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void SharedConstructionContractObjectTemplate::testValues(void) const +{ + SharedIntangibleObjectTemplate::testValues(); +} // SharedConstructionContractObjectTemplate::testValues +#endif /** * Loads the template data from an iff file. We should already be in the form @@ -112,8 +121,8 @@ Tag SharedConstructionContractObjectTemplate::getHighestTemplateVersion(void) co */ void SharedConstructionContractObjectTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != SharedConstructionContractObjectTemplate_tag) { @@ -123,7 +132,7 @@ void SharedConstructionContractObjectTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -143,8 +152,10 @@ void SharedConstructionContractObjectTemplate::load(Iff &file) file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 0, 0)) + if (getHighestTemplateVersion() != TAG(0,0,0,0)) { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); m_versionOk = false; } @@ -162,4 +173,4 @@ void SharedConstructionContractObjectTemplate::load(Iff &file) return; } // SharedConstructionContractObjectTemplate::load -//@END TFD \ No newline at end of file +//@END TFD diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedConstructionContractObjectTemplate.h b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedConstructionContractObjectTemplate.h old mode 100755 new mode 100644 index 8e72f49a..20804df0 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedConstructionContractObjectTemplate.h +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedConstructionContractObjectTemplate.h @@ -45,6 +45,11 @@ public: //@BEGIN TFD public: +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedCreatureObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedCreatureObjectTemplate.cpp old mode 100755 new mode 100644 index 9a451895..78098e21 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedCreatureObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedCreatureObjectTemplate.cpp @@ -29,7 +29,7 @@ const std::string DefaultString(""); const StringId DefaultStringId("", 0); -const Vector DefaultVector(0, 0, 0); +const Vector DefaultVector(0,0,0); const TriggerVolumeData DefaultTriggerVolumeData; bool SharedCreatureObjectTemplate::ms_allowDefaultTemplateParams = true; @@ -42,9 +42,8 @@ typedef ::RangedIntCustomizationVariable GlobalRangedIntCustomizationVariableTyp SharedCreatureObjectTemplate::SharedCreatureObjectTemplate(const std::string & filename) //@BEGIN TFD INIT : SharedTangibleObjectTemplate(filename) - , m_versionOk(true) - , m_templateVersion(0) - //@END TFD INIT + ,m_versionOk(true) +//@END TFD INIT { m_movementTable = 0; } // SharedCreatureObjectTemplate::SharedCreatureObjectTemplate @@ -54,8 +53,8 @@ SharedCreatureObjectTemplate::SharedCreatureObjectTemplate(const std::string & f */ SharedCreatureObjectTemplate::~SharedCreatureObjectTemplate() { - //@BEGIN TFD CLEANUP - //@END TFD CLEANUP +//@BEGIN TFD CLEANUP +//@END TFD CLEANUP delete m_movementTable; m_movementTable = 0; } // SharedCreatureObjectTemplate::~SharedCreatureObjectTemplate @@ -123,7 +122,7 @@ void SharedCreatureObjectTemplate::postLoad() void SharedCreatureObjectTemplate::createCustomizationDataPropertyAsNeeded(Object &object, bool /* forceCreation */) const { - //-- Properties cannot be added while an object is in the world. Some callers may be in the world, + //-- Properties cannot be added while an object is in the world. Some callers may be in the world, // so temporarily remove the object from the world if necessary. bool shouldBeInWorld = object.isInWorld(); if (shouldBeInWorld) @@ -148,18 +147,18 @@ void SharedCreatureObjectTemplate::createCustomizationDataPropertyAsNeeded(Objec AssetCustomizationManager::addCustomizationVariablesForAsset(TemporaryCrcString(getAppearanceFilename().c_str(), true), *customizationData, skipSharedOwnerVariables); //-- set up mappings for any variables which need dependent mappings - int numVariableMappings = getCustomizationVariableMappingCount(); + int numVariableMappings = getCustomizationVariableMappingCount(); for (int i = 0; i < numVariableMappings; ++i) { CustomizationVariableMapping localVariableMapping; - getCustomizationVariableMapping(localVariableMapping, i); + getCustomizationVariableMapping(localVariableMapping, i); GlobalRangedIntCustomizationVariableType *source = safe_cast(customizationData->findVariable(localVariableMapping.sourceVariable)); - if (source) - { - source->setDependentVariable(localVariableMapping.dependentVariable); - } - } - + if(source) + { + source->setDependentVariable(localVariableMapping.dependentVariable); + } + } + //-- release local reference to the CustomizationData instance customizationData->release(); } @@ -168,12 +167,22 @@ void SharedCreatureObjectTemplate::createCustomizationDataPropertyAsNeeded(Objec // ---------------------------------------------------------------------- //@BEGIN TFD -SharedCreatureObjectTemplate::Gender SharedCreatureObjectTemplate::getGender() const +SharedCreatureObjectTemplate::Gender SharedCreatureObjectTemplate::getGender(bool testData) const { +#ifdef _DEBUG +SharedCreatureObjectTemplate::Gender testDataValue = static_cast(0); +#else +UNREF(testData); +#endif + const SharedCreatureObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getGender(true); +#endif } if (!m_gender.isLoaded()) @@ -191,16 +200,31 @@ SharedCreatureObjectTemplate::Gender SharedCreatureObjectTemplate::getGender() c } Gender value = static_cast(m_gender.getValue()); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedCreatureObjectTemplate::getGender -SharedCreatureObjectTemplate::Niche SharedCreatureObjectTemplate::getNiche() const +SharedCreatureObjectTemplate::Niche SharedCreatureObjectTemplate::getNiche(bool testData) const { +#ifdef _DEBUG +SharedCreatureObjectTemplate::Niche testDataValue = static_cast(0); +#else +UNREF(testData); +#endif + const SharedCreatureObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getNiche(true); +#endif } if (!m_niche.isLoaded()) @@ -218,16 +242,31 @@ SharedCreatureObjectTemplate::Niche SharedCreatureObjectTemplate::getNiche() con } Niche value = static_cast(m_niche.getValue()); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedCreatureObjectTemplate::getNiche -SharedCreatureObjectTemplate::Species SharedCreatureObjectTemplate::getSpecies() const +SharedCreatureObjectTemplate::Species SharedCreatureObjectTemplate::getSpecies(bool testData) const { +#ifdef _DEBUG +SharedCreatureObjectTemplate::Species testDataValue = static_cast(0); +#else +UNREF(testData); +#endif + const SharedCreatureObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getSpecies(true); +#endif } if (!m_species.isLoaded()) @@ -245,16 +284,31 @@ SharedCreatureObjectTemplate::Species SharedCreatureObjectTemplate::getSpecies() } Species value = static_cast(m_species.getValue()); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedCreatureObjectTemplate::getSpecies -SharedCreatureObjectTemplate::Race SharedCreatureObjectTemplate::getRace() const +SharedCreatureObjectTemplate::Race SharedCreatureObjectTemplate::getRace(bool testData) const { +#ifdef _DEBUG +SharedCreatureObjectTemplate::Race testDataValue = static_cast(0); +#else +UNREF(testData); +#endif + const SharedCreatureObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getRace(true); +#endif } if (!m_race.isLoaded()) @@ -272,6 +326,11 @@ SharedCreatureObjectTemplate::Race SharedCreatureObjectTemplate::getRace() const } Race value = static_cast(m_race.getValue()); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedCreatureObjectTemplate::getRace @@ -284,7 +343,7 @@ float SharedCreatureObjectTemplate::getAcceleration(MovementTypes index) const base = dynamic_cast(m_baseData); } - DEBUG_FATAL(static_cast(index) < 0 || static_cast(index) >= 2, ("template param index out of range")); + DEBUG_FATAL(index < 0 || index >= 2, ("template param index out of range")); if (!m_acceleration[index].isLoaded()) { if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) @@ -333,7 +392,7 @@ float SharedCreatureObjectTemplate::getAccelerationMin(MovementTypes index) cons base = dynamic_cast(m_baseData); } - DEBUG_FATAL(static_cast(index) < 0 || static_cast(index) >= 2, ("template param index out of range")); + DEBUG_FATAL(index < 0 || index >= 2, ("template param index out of range")); if (!m_acceleration[index].isLoaded()) { if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) @@ -382,7 +441,7 @@ float SharedCreatureObjectTemplate::getAccelerationMax(MovementTypes index) cons base = dynamic_cast(m_baseData); } - DEBUG_FATAL(static_cast(index) < 0 || static_cast(index) >= 2, ("template param index out of range")); + DEBUG_FATAL(index < 0 || index >= 2, ("template param index out of range")); if (!m_acceleration[index].isLoaded()) { if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) @@ -431,7 +490,7 @@ float SharedCreatureObjectTemplate::getSpeed(MovementTypes index) const base = dynamic_cast(m_baseData); } - DEBUG_FATAL(static_cast(index) < 0 || static_cast(index) >= 2, ("template param index out of range")); + DEBUG_FATAL(index < 0 || index >= 2, ("template param index out of range")); if (!m_speed[index].isLoaded()) { if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) @@ -480,7 +539,7 @@ float SharedCreatureObjectTemplate::getSpeedMin(MovementTypes index) const base = dynamic_cast(m_baseData); } - DEBUG_FATAL(static_cast(index) < 0 || static_cast(index) >= 2, ("template param index out of range")); + DEBUG_FATAL(index < 0 || index >= 2, ("template param index out of range")); if (!m_speed[index].isLoaded()) { if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) @@ -529,7 +588,7 @@ float SharedCreatureObjectTemplate::getSpeedMax(MovementTypes index) const base = dynamic_cast(m_baseData); } - DEBUG_FATAL(static_cast(index) < 0 || static_cast(index) >= 2, ("template param index out of range")); + DEBUG_FATAL(index < 0 || index >= 2, ("template param index out of range")); if (!m_speed[index].isLoaded()) { if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) @@ -578,7 +637,7 @@ float SharedCreatureObjectTemplate::getTurnRate(MovementTypes index) const base = dynamic_cast(m_baseData); } - DEBUG_FATAL(static_cast(index) < 0 || static_cast(index) >= 2, ("template param index out of range")); + DEBUG_FATAL(index < 0 || index >= 2, ("template param index out of range")); if (!m_turnRate[index].isLoaded()) { if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) @@ -627,7 +686,7 @@ float SharedCreatureObjectTemplate::getTurnRateMin(MovementTypes index) const base = dynamic_cast(m_baseData); } - DEBUG_FATAL(static_cast(index) < 0 || static_cast(index) >= 2, ("template param index out of range")); + DEBUG_FATAL(index < 0 || index >= 2, ("template param index out of range")); if (!m_turnRate[index].isLoaded()) { if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) @@ -676,7 +735,7 @@ float SharedCreatureObjectTemplate::getTurnRateMax(MovementTypes index) const base = dynamic_cast(m_baseData); } - DEBUG_FATAL(static_cast(index) < 0 || static_cast(index) >= 2, ("template param index out of range")); + DEBUG_FATAL(index < 0 || index >= 2, ("template param index out of range")); if (!m_turnRate[index].isLoaded()) { if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) @@ -717,12 +776,22 @@ float SharedCreatureObjectTemplate::getTurnRateMax(MovementTypes index) const return value; } // SharedCreatureObjectTemplate::getTurnRateMax -const std::string & SharedCreatureObjectTemplate::getAnimationMapFilename() const +const std::string & SharedCreatureObjectTemplate::getAnimationMapFilename(bool testData) const { +#ifdef _DEBUG +std::string testDataValue = DefaultString; +#else +UNREF(testData); +#endif + const SharedCreatureObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getAnimationMapFilename(true); +#endif } if (!m_animationMapFilename.isLoaded()) @@ -740,16 +809,31 @@ const std::string & SharedCreatureObjectTemplate::getAnimationMapFilename() cons } const std::string & value = m_animationMapFilename.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedCreatureObjectTemplate::getAnimationMapFilename -float SharedCreatureObjectTemplate::getSlopeModAngle() const +float SharedCreatureObjectTemplate::getSlopeModAngle(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedCreatureObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getSlopeModAngle(true); +#endif } if (!m_slopeModAngle.isLoaded()) @@ -789,16 +873,31 @@ float SharedCreatureObjectTemplate::getSlopeModAngle() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedCreatureObjectTemplate::getSlopeModAngle -float SharedCreatureObjectTemplate::getSlopeModAngleMin() const +float SharedCreatureObjectTemplate::getSlopeModAngleMin(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedCreatureObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getSlopeModAngleMin(true); +#endif } if (!m_slopeModAngle.isLoaded()) @@ -838,16 +937,31 @@ float SharedCreatureObjectTemplate::getSlopeModAngleMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedCreatureObjectTemplate::getSlopeModAngleMin -float SharedCreatureObjectTemplate::getSlopeModAngleMax() const +float SharedCreatureObjectTemplate::getSlopeModAngleMax(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedCreatureObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getSlopeModAngleMax(true); +#endif } if (!m_slopeModAngle.isLoaded()) @@ -887,16 +1001,31 @@ float SharedCreatureObjectTemplate::getSlopeModAngleMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedCreatureObjectTemplate::getSlopeModAngleMax -float SharedCreatureObjectTemplate::getSlopeModPercent() const +float SharedCreatureObjectTemplate::getSlopeModPercent(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedCreatureObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getSlopeModPercent(true); +#endif } if (!m_slopeModPercent.isLoaded()) @@ -936,16 +1065,31 @@ float SharedCreatureObjectTemplate::getSlopeModPercent() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedCreatureObjectTemplate::getSlopeModPercent -float SharedCreatureObjectTemplate::getSlopeModPercentMin() const +float SharedCreatureObjectTemplate::getSlopeModPercentMin(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedCreatureObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getSlopeModPercentMin(true); +#endif } if (!m_slopeModPercent.isLoaded()) @@ -985,16 +1129,31 @@ float SharedCreatureObjectTemplate::getSlopeModPercentMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedCreatureObjectTemplate::getSlopeModPercentMin -float SharedCreatureObjectTemplate::getSlopeModPercentMax() const +float SharedCreatureObjectTemplate::getSlopeModPercentMax(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedCreatureObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getSlopeModPercentMax(true); +#endif } if (!m_slopeModPercent.isLoaded()) @@ -1034,16 +1193,31 @@ float SharedCreatureObjectTemplate::getSlopeModPercentMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedCreatureObjectTemplate::getSlopeModPercentMax -float SharedCreatureObjectTemplate::getWaterModPercent() const +float SharedCreatureObjectTemplate::getWaterModPercent(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedCreatureObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getWaterModPercent(true); +#endif } if (!m_waterModPercent.isLoaded()) @@ -1083,16 +1257,31 @@ float SharedCreatureObjectTemplate::getWaterModPercent() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedCreatureObjectTemplate::getWaterModPercent -float SharedCreatureObjectTemplate::getWaterModPercentMin() const +float SharedCreatureObjectTemplate::getWaterModPercentMin(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedCreatureObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getWaterModPercentMin(true); +#endif } if (!m_waterModPercent.isLoaded()) @@ -1132,16 +1321,31 @@ float SharedCreatureObjectTemplate::getWaterModPercentMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedCreatureObjectTemplate::getWaterModPercentMin -float SharedCreatureObjectTemplate::getWaterModPercentMax() const +float SharedCreatureObjectTemplate::getWaterModPercentMax(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedCreatureObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getWaterModPercentMax(true); +#endif } if (!m_waterModPercent.isLoaded()) @@ -1181,16 +1385,31 @@ float SharedCreatureObjectTemplate::getWaterModPercentMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedCreatureObjectTemplate::getWaterModPercentMax -float SharedCreatureObjectTemplate::getStepHeight() const +float SharedCreatureObjectTemplate::getStepHeight(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedCreatureObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getStepHeight(true); +#endif } if (!m_stepHeight.isLoaded()) @@ -1230,16 +1449,31 @@ float SharedCreatureObjectTemplate::getStepHeight() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedCreatureObjectTemplate::getStepHeight -float SharedCreatureObjectTemplate::getStepHeightMin() const +float SharedCreatureObjectTemplate::getStepHeightMin(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedCreatureObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getStepHeightMin(true); +#endif } if (!m_stepHeight.isLoaded()) @@ -1279,16 +1513,31 @@ float SharedCreatureObjectTemplate::getStepHeightMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedCreatureObjectTemplate::getStepHeightMin -float SharedCreatureObjectTemplate::getStepHeightMax() const +float SharedCreatureObjectTemplate::getStepHeightMax(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedCreatureObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getStepHeightMax(true); +#endif } if (!m_stepHeight.isLoaded()) @@ -1328,16 +1577,31 @@ float SharedCreatureObjectTemplate::getStepHeightMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedCreatureObjectTemplate::getStepHeightMax -float SharedCreatureObjectTemplate::getCollisionHeight() const +float SharedCreatureObjectTemplate::getCollisionHeight(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedCreatureObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getCollisionHeight(true); +#endif } if (!m_collisionHeight.isLoaded()) @@ -1377,16 +1641,31 @@ float SharedCreatureObjectTemplate::getCollisionHeight() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedCreatureObjectTemplate::getCollisionHeight -float SharedCreatureObjectTemplate::getCollisionHeightMin() const +float SharedCreatureObjectTemplate::getCollisionHeightMin(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedCreatureObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getCollisionHeightMin(true); +#endif } if (!m_collisionHeight.isLoaded()) @@ -1426,16 +1705,31 @@ float SharedCreatureObjectTemplate::getCollisionHeightMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedCreatureObjectTemplate::getCollisionHeightMin -float SharedCreatureObjectTemplate::getCollisionHeightMax() const +float SharedCreatureObjectTemplate::getCollisionHeightMax(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedCreatureObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getCollisionHeightMax(true); +#endif } if (!m_collisionHeight.isLoaded()) @@ -1475,16 +1769,31 @@ float SharedCreatureObjectTemplate::getCollisionHeightMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedCreatureObjectTemplate::getCollisionHeightMax -float SharedCreatureObjectTemplate::getCollisionRadius() const +float SharedCreatureObjectTemplate::getCollisionRadius(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedCreatureObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getCollisionRadius(true); +#endif } if (!m_collisionRadius.isLoaded()) @@ -1524,16 +1833,31 @@ float SharedCreatureObjectTemplate::getCollisionRadius() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedCreatureObjectTemplate::getCollisionRadius -float SharedCreatureObjectTemplate::getCollisionRadiusMin() const +float SharedCreatureObjectTemplate::getCollisionRadiusMin(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedCreatureObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getCollisionRadiusMin(true); +#endif } if (!m_collisionRadius.isLoaded()) @@ -1573,16 +1897,31 @@ float SharedCreatureObjectTemplate::getCollisionRadiusMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedCreatureObjectTemplate::getCollisionRadiusMin -float SharedCreatureObjectTemplate::getCollisionRadiusMax() const +float SharedCreatureObjectTemplate::getCollisionRadiusMax(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedCreatureObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getCollisionRadiusMax(true); +#endif } if (!m_collisionRadius.isLoaded()) @@ -1622,16 +1961,31 @@ float SharedCreatureObjectTemplate::getCollisionRadiusMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedCreatureObjectTemplate::getCollisionRadiusMax -const std::string & SharedCreatureObjectTemplate::getMovementDatatable() const +const std::string & SharedCreatureObjectTemplate::getMovementDatatable(bool testData) const { +#ifdef _DEBUG +std::string testDataValue = DefaultString; +#else +UNREF(testData); +#endif + const SharedCreatureObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getMovementDatatable(true); +#endif } if (!m_movementDatatable.isLoaded()) @@ -1649,6 +2003,11 @@ const std::string & SharedCreatureObjectTemplate::getMovementDatatable() const } const std::string & value = m_movementDatatable.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedCreatureObjectTemplate::getMovementDatatable @@ -1680,12 +2039,22 @@ bool SharedCreatureObjectTemplate::getPostureAlignToTerrain(Postures index) cons return value; } // SharedCreatureObjectTemplate::getPostureAlignToTerrain -float SharedCreatureObjectTemplate::getSwimHeight() const +float SharedCreatureObjectTemplate::getSwimHeight(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedCreatureObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getSwimHeight(true); +#endif } if (!m_swimHeight.isLoaded()) @@ -1725,16 +2094,31 @@ float SharedCreatureObjectTemplate::getSwimHeight() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedCreatureObjectTemplate::getSwimHeight -float SharedCreatureObjectTemplate::getSwimHeightMin() const +float SharedCreatureObjectTemplate::getSwimHeightMin(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedCreatureObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getSwimHeightMin(true); +#endif } if (!m_swimHeight.isLoaded()) @@ -1774,16 +2158,31 @@ float SharedCreatureObjectTemplate::getSwimHeightMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedCreatureObjectTemplate::getSwimHeightMin -float SharedCreatureObjectTemplate::getSwimHeightMax() const +float SharedCreatureObjectTemplate::getSwimHeightMax(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedCreatureObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getSwimHeightMax(true); +#endif } if (!m_swimHeight.isLoaded()) @@ -1823,16 +2222,31 @@ float SharedCreatureObjectTemplate::getSwimHeightMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedCreatureObjectTemplate::getSwimHeightMax -float SharedCreatureObjectTemplate::getWarpTolerance() const +float SharedCreatureObjectTemplate::getWarpTolerance(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedCreatureObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getWarpTolerance(true); +#endif } if (!m_warpTolerance.isLoaded()) @@ -1872,16 +2286,31 @@ float SharedCreatureObjectTemplate::getWarpTolerance() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedCreatureObjectTemplate::getWarpTolerance -float SharedCreatureObjectTemplate::getWarpToleranceMin() const +float SharedCreatureObjectTemplate::getWarpToleranceMin(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedCreatureObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getWarpToleranceMin(true); +#endif } if (!m_warpTolerance.isLoaded()) @@ -1921,16 +2350,31 @@ float SharedCreatureObjectTemplate::getWarpToleranceMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedCreatureObjectTemplate::getWarpToleranceMin -float SharedCreatureObjectTemplate::getWarpToleranceMax() const +float SharedCreatureObjectTemplate::getWarpToleranceMax(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedCreatureObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getWarpToleranceMax(true); +#endif } if (!m_warpTolerance.isLoaded()) @@ -1970,16 +2414,31 @@ float SharedCreatureObjectTemplate::getWarpToleranceMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedCreatureObjectTemplate::getWarpToleranceMax -float SharedCreatureObjectTemplate::getCollisionOffsetX() const +float SharedCreatureObjectTemplate::getCollisionOffsetX(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedCreatureObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getCollisionOffsetX(true); +#endif } if (!m_collisionOffsetX.isLoaded()) @@ -2019,16 +2478,31 @@ float SharedCreatureObjectTemplate::getCollisionOffsetX() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedCreatureObjectTemplate::getCollisionOffsetX -float SharedCreatureObjectTemplate::getCollisionOffsetXMin() const +float SharedCreatureObjectTemplate::getCollisionOffsetXMin(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedCreatureObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getCollisionOffsetXMin(true); +#endif } if (!m_collisionOffsetX.isLoaded()) @@ -2068,16 +2542,31 @@ float SharedCreatureObjectTemplate::getCollisionOffsetXMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedCreatureObjectTemplate::getCollisionOffsetXMin -float SharedCreatureObjectTemplate::getCollisionOffsetXMax() const +float SharedCreatureObjectTemplate::getCollisionOffsetXMax(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedCreatureObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getCollisionOffsetXMax(true); +#endif } if (!m_collisionOffsetX.isLoaded()) @@ -2117,16 +2606,31 @@ float SharedCreatureObjectTemplate::getCollisionOffsetXMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedCreatureObjectTemplate::getCollisionOffsetXMax -float SharedCreatureObjectTemplate::getCollisionOffsetZ() const +float SharedCreatureObjectTemplate::getCollisionOffsetZ(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedCreatureObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getCollisionOffsetZ(true); +#endif } if (!m_collisionOffsetZ.isLoaded()) @@ -2166,16 +2670,31 @@ float SharedCreatureObjectTemplate::getCollisionOffsetZ() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedCreatureObjectTemplate::getCollisionOffsetZ -float SharedCreatureObjectTemplate::getCollisionOffsetZMin() const +float SharedCreatureObjectTemplate::getCollisionOffsetZMin(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedCreatureObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getCollisionOffsetZMin(true); +#endif } if (!m_collisionOffsetZ.isLoaded()) @@ -2215,16 +2734,31 @@ float SharedCreatureObjectTemplate::getCollisionOffsetZMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedCreatureObjectTemplate::getCollisionOffsetZMin -float SharedCreatureObjectTemplate::getCollisionOffsetZMax() const +float SharedCreatureObjectTemplate::getCollisionOffsetZMax(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedCreatureObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getCollisionOffsetZMax(true); +#endif } if (!m_collisionOffsetZ.isLoaded()) @@ -2264,16 +2798,31 @@ float SharedCreatureObjectTemplate::getCollisionOffsetZMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedCreatureObjectTemplate::getCollisionOffsetZMax -float SharedCreatureObjectTemplate::getCollisionLength() const +float SharedCreatureObjectTemplate::getCollisionLength(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedCreatureObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getCollisionLength(true); +#endif } if (!m_collisionLength.isLoaded()) @@ -2313,16 +2862,31 @@ float SharedCreatureObjectTemplate::getCollisionLength() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedCreatureObjectTemplate::getCollisionLength -float SharedCreatureObjectTemplate::getCollisionLengthMin() const +float SharedCreatureObjectTemplate::getCollisionLengthMin(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedCreatureObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getCollisionLengthMin(true); +#endif } if (!m_collisionLength.isLoaded()) @@ -2362,16 +2926,31 @@ float SharedCreatureObjectTemplate::getCollisionLengthMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedCreatureObjectTemplate::getCollisionLengthMin -float SharedCreatureObjectTemplate::getCollisionLengthMax() const +float SharedCreatureObjectTemplate::getCollisionLengthMax(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedCreatureObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getCollisionLengthMax(true); +#endif } if (!m_collisionLength.isLoaded()) @@ -2411,16 +2990,31 @@ float SharedCreatureObjectTemplate::getCollisionLengthMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedCreatureObjectTemplate::getCollisionLengthMax -float SharedCreatureObjectTemplate::getCameraHeight() const +float SharedCreatureObjectTemplate::getCameraHeight(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedCreatureObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getCameraHeight(true); +#endif } if (!m_cameraHeight.isLoaded()) @@ -2460,16 +3054,31 @@ float SharedCreatureObjectTemplate::getCameraHeight() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedCreatureObjectTemplate::getCameraHeight -float SharedCreatureObjectTemplate::getCameraHeightMin() const +float SharedCreatureObjectTemplate::getCameraHeightMin(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedCreatureObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getCameraHeightMin(true); +#endif } if (!m_cameraHeight.isLoaded()) @@ -2509,16 +3118,31 @@ float SharedCreatureObjectTemplate::getCameraHeightMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedCreatureObjectTemplate::getCameraHeightMin -float SharedCreatureObjectTemplate::getCameraHeightMax() const +float SharedCreatureObjectTemplate::getCameraHeightMax(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedCreatureObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getCameraHeightMax(true); +#endif } if (!m_cameraHeight.isLoaded()) @@ -2558,10 +3182,55 @@ float SharedCreatureObjectTemplate::getCameraHeightMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedCreatureObjectTemplate::getCameraHeightMax +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void SharedCreatureObjectTemplate::testValues(void) const +{ + IGNORE_RETURN(getGender(true)); + IGNORE_RETURN(getNiche(true)); + IGNORE_RETURN(getSpecies(true)); + IGNORE_RETURN(getRace(true)); + IGNORE_RETURN(getAnimationMapFilename(true)); + IGNORE_RETURN(getSlopeModAngleMin(true)); + IGNORE_RETURN(getSlopeModAngleMax(true)); + IGNORE_RETURN(getSlopeModPercentMin(true)); + IGNORE_RETURN(getSlopeModPercentMax(true)); + IGNORE_RETURN(getWaterModPercentMin(true)); + IGNORE_RETURN(getWaterModPercentMax(true)); + IGNORE_RETURN(getStepHeightMin(true)); + IGNORE_RETURN(getStepHeightMax(true)); + IGNORE_RETURN(getCollisionHeightMin(true)); + IGNORE_RETURN(getCollisionHeightMax(true)); + IGNORE_RETURN(getCollisionRadiusMin(true)); + IGNORE_RETURN(getCollisionRadiusMax(true)); + IGNORE_RETURN(getMovementDatatable(true)); + IGNORE_RETURN(getSwimHeightMin(true)); + IGNORE_RETURN(getSwimHeightMax(true)); + IGNORE_RETURN(getWarpToleranceMin(true)); + IGNORE_RETURN(getWarpToleranceMax(true)); + IGNORE_RETURN(getCollisionOffsetXMin(true)); + IGNORE_RETURN(getCollisionOffsetXMax(true)); + IGNORE_RETURN(getCollisionOffsetZMin(true)); + IGNORE_RETURN(getCollisionOffsetZMax(true)); + IGNORE_RETURN(getCollisionLengthMin(true)); + IGNORE_RETURN(getCollisionLengthMax(true)); + IGNORE_RETURN(getCameraHeightMin(true)); + IGNORE_RETURN(getCameraHeightMax(true)); + SharedTangibleObjectTemplate::testValues(); +} // SharedCreatureObjectTemplate::testValues +#endif + /** * Loads the template data from an iff file. We should already be in the form * for this template. @@ -2570,8 +3239,8 @@ float SharedCreatureObjectTemplate::getCameraHeightMax() const */ void SharedCreatureObjectTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != SharedCreatureObjectTemplate_tag) { @@ -2581,7 +3250,7 @@ void SharedCreatureObjectTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -2601,8 +3270,10 @@ void SharedCreatureObjectTemplate::load(Iff &file) file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 1, 3)) + if (getHighestTemplateVersion() != TAG(0,0,1,3)) { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); m_versionOk = false; } @@ -2716,4 +3387,5 @@ void SharedCreatureObjectTemplate::load(Iff &file) return; } // SharedCreatureObjectTemplate::load -//@END TFD \ No newline at end of file +//@END TFD + diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedCreatureObjectTemplate.h b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedCreatureObjectTemplate.h old mode 100755 new mode 100644 index 63164a08..53645aa7 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedCreatureObjectTemplate.h +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedCreatureObjectTemplate.h @@ -361,10 +361,10 @@ public: }; public: - Gender getGender() const; - Niche getNiche() const; - Species getSpecies() const; - Race getRace() const; + Gender getGender(bool testData = false) const; + Niche getNiche(bool testData = false) const; + Species getSpecies(bool testData = false) const; + Race getRace(bool testData = false) const; float getAcceleration(MovementTypes index) const; float getAccelerationMin(MovementTypes index) const; float getAccelerationMax(MovementTypes index) const; @@ -374,46 +374,51 @@ public: float getTurnRate(MovementTypes index) const; float getTurnRateMin(MovementTypes index) const; float getTurnRateMax(MovementTypes index) const; - const std::string & getAnimationMapFilename() const; - float getSlopeModAngle() const; - float getSlopeModAngleMin() const; - float getSlopeModAngleMax() const; - float getSlopeModPercent() const; - float getSlopeModPercentMin() const; - float getSlopeModPercentMax() const; - float getWaterModPercent() const; - float getWaterModPercentMin() const; - float getWaterModPercentMax() const; - float getStepHeight() const; - float getStepHeightMin() const; - float getStepHeightMax() const; - float getCollisionHeight() const; - float getCollisionHeightMin() const; - float getCollisionHeightMax() const; - float getCollisionRadius() const; - float getCollisionRadiusMin() const; - float getCollisionRadiusMax() const; - const std::string & getMovementDatatable() const; + const std::string & getAnimationMapFilename(bool testData = false) const; + float getSlopeModAngle(bool testData = false) const; + float getSlopeModAngleMin(bool testData = false) const; + float getSlopeModAngleMax(bool testData = false) const; + float getSlopeModPercent(bool testData = false) const; + float getSlopeModPercentMin(bool testData = false) const; + float getSlopeModPercentMax(bool testData = false) const; + float getWaterModPercent(bool testData = false) const; + float getWaterModPercentMin(bool testData = false) const; + float getWaterModPercentMax(bool testData = false) const; + float getStepHeight(bool testData = false) const; + float getStepHeightMin(bool testData = false) const; + float getStepHeightMax(bool testData = false) const; + float getCollisionHeight(bool testData = false) const; + float getCollisionHeightMin(bool testData = false) const; + float getCollisionHeightMax(bool testData = false) const; + float getCollisionRadius(bool testData = false) const; + float getCollisionRadiusMin(bool testData = false) const; + float getCollisionRadiusMax(bool testData = false) const; + const std::string & getMovementDatatable(bool testData = false) const; bool getPostureAlignToTerrain(Postures index) const; - float getSwimHeight() const; - float getSwimHeightMin() const; - float getSwimHeightMax() const; - float getWarpTolerance() const; - float getWarpToleranceMin() const; - float getWarpToleranceMax() const; - float getCollisionOffsetX() const; - float getCollisionOffsetXMin() const; - float getCollisionOffsetXMax() const; - float getCollisionOffsetZ() const; - float getCollisionOffsetZMin() const; - float getCollisionOffsetZMax() const; - float getCollisionLength() const; - float getCollisionLengthMin() const; - float getCollisionLengthMax() const; - float getCameraHeight() const; - float getCameraHeightMin() const; - float getCameraHeightMax() const; + float getSwimHeight(bool testData = false) const; + float getSwimHeightMin(bool testData = false) const; + float getSwimHeightMax(bool testData = false) const; + float getWarpTolerance(bool testData = false) const; + float getWarpToleranceMin(bool testData = false) const; + float getWarpToleranceMax(bool testData = false) const; + float getCollisionOffsetX(bool testData = false) const; + float getCollisionOffsetXMin(bool testData = false) const; + float getCollisionOffsetXMax(bool testData = false) const; + float getCollisionOffsetZ(bool testData = false) const; + float getCollisionOffsetZMin(bool testData = false) const; + float getCollisionOffsetZMax(bool testData = false) const; + float getCollisionLength(bool testData = false) const; + float getCollisionLengthMin(bool testData = false) const; + float getCollisionLengthMax(bool testData = false) const; + float getCameraHeight(bool testData = false) const; + float getCameraHeightMin(bool testData = false) const; + float getCameraHeightMax(bool testData = false) const; +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedDraftSchematicObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedDraftSchematicObjectTemplate.cpp old mode 100755 new mode 100644 index d20a240a..961cebca --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedDraftSchematicObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedDraftSchematicObjectTemplate.cpp @@ -23,24 +23,24 @@ const std::string DefaultString(""); const StringId DefaultStringId("", 0); -const Vector DefaultVector(0, 0, 0); +const Vector DefaultVector(0,0,0); const TriggerVolumeData DefaultTriggerVolumeData; bool SharedDraftSchematicObjectTemplate::ms_allowDefaultTemplateParams = true; + /** * Class constructor. */ SharedDraftSchematicObjectTemplate::SharedDraftSchematicObjectTemplate(const std::string & filename) //@BEGIN TFD INIT : SharedIntangibleObjectTemplate(filename) - , m_slotsLoaded(false) - , m_slotsAppend(false) - , m_attributesLoaded(false) - , m_attributesAppend(false) - , m_versionOk(true) - , m_templateVersion(0) - //@END TFD INIT + ,m_slotsLoaded(false) + ,m_slotsAppend(false) + ,m_attributesLoaded(false) + ,m_attributesAppend(false) + ,m_versionOk(true) +//@END TFD INIT { } // SharedDraftSchematicObjectTemplate::SharedDraftSchematicObjectTemplate @@ -49,7 +49,7 @@ SharedDraftSchematicObjectTemplate::SharedDraftSchematicObjectTemplate(const std */ SharedDraftSchematicObjectTemplate::~SharedDraftSchematicObjectTemplate() { - //@BEGIN TFD CLEANUP +//@BEGIN TFD CLEANUP { std::vector::iterator iter; for (iter = m_slots.begin(); iter != m_slots.end(); ++iter) @@ -68,7 +68,7 @@ SharedDraftSchematicObjectTemplate::~SharedDraftSchematicObjectTemplate() } m_attributes.clear(); } - //@END TFD CLEANUP +//@END TFD CLEANUP } // SharedDraftSchematicObjectTemplate::~SharedDraftSchematicObjectTemplate /** @@ -138,7 +138,7 @@ void SharedDraftSchematicObjectTemplate::getSlots(IngredientSlot &data, int inde if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter slots in template %s", DataResource::getName())); - return; + return ; } else { @@ -152,10 +152,10 @@ void SharedDraftSchematicObjectTemplate::getSlots(IngredientSlot &data, int inde { int baseCount = base->getSlotsCount(); if (index < baseCount) - { - base->getSlots(data, index); - return; - } + { + base->getSlots(data, index); + return; + } index -= baseCount; } @@ -181,7 +181,7 @@ void SharedDraftSchematicObjectTemplate::getSlotsMin(IngredientSlot &data, int i if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter slots in template %s", DataResource::getName())); - return; + return ; } else { @@ -195,10 +195,10 @@ void SharedDraftSchematicObjectTemplate::getSlotsMin(IngredientSlot &data, int i { int baseCount = base->getSlotsCount(); if (index < baseCount) - { - base->getSlotsMin(data, index); - return; - } + { + base->getSlotsMin(data, index); + return; + } index -= baseCount; } @@ -224,7 +224,7 @@ void SharedDraftSchematicObjectTemplate::getSlotsMax(IngredientSlot &data, int i if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter slots in template %s", DataResource::getName())); - return; + return ; } else { @@ -238,10 +238,10 @@ void SharedDraftSchematicObjectTemplate::getSlotsMax(IngredientSlot &data, int i { int baseCount = base->getSlotsCount(); if (index < baseCount) - { - base->getSlotsMax(data, index); - return; - } + { + base->getSlotsMax(data, index); + return; + } index -= baseCount; } @@ -291,7 +291,7 @@ void SharedDraftSchematicObjectTemplate::getAttributes(SchematicAttribute &data, if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter attributes in template %s", DataResource::getName())); - return; + return ; } else { @@ -305,10 +305,10 @@ void SharedDraftSchematicObjectTemplate::getAttributes(SchematicAttribute &data, { int baseCount = base->getAttributesCount(); if (index < baseCount) - { - base->getAttributes(data, index); - return; - } + { + base->getAttributes(data, index); + return; + } index -= baseCount; } @@ -335,7 +335,7 @@ void SharedDraftSchematicObjectTemplate::getAttributesMin(SchematicAttribute &da if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter attributes in template %s", DataResource::getName())); - return; + return ; } else { @@ -349,10 +349,10 @@ void SharedDraftSchematicObjectTemplate::getAttributesMin(SchematicAttribute &da { int baseCount = base->getAttributesCount(); if (index < baseCount) - { - base->getAttributesMin(data, index); - return; - } + { + base->getAttributesMin(data, index); + return; + } index -= baseCount; } @@ -379,7 +379,7 @@ void SharedDraftSchematicObjectTemplate::getAttributesMax(SchematicAttribute &da if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter attributes in template %s", DataResource::getName())); - return; + return ; } else { @@ -393,10 +393,10 @@ void SharedDraftSchematicObjectTemplate::getAttributesMax(SchematicAttribute &da { int baseCount = base->getAttributesCount(); if (index < baseCount) - { - base->getAttributesMax(data, index); - return; - } + { + base->getAttributesMax(data, index); + return; + } index -= baseCount; } @@ -434,12 +434,22 @@ size_t SharedDraftSchematicObjectTemplate::getAttributesCount(void) const return count; } // SharedDraftSchematicObjectTemplate::getAttributesCount -const std::string & SharedDraftSchematicObjectTemplate::getCraftedSharedTemplate() const +const std::string & SharedDraftSchematicObjectTemplate::getCraftedSharedTemplate(bool testData) const { +#ifdef _DEBUG +std::string testDataValue = DefaultString; +#else +UNREF(testData); +#endif + const SharedDraftSchematicObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getCraftedSharedTemplate(true); +#endif } if (!m_craftedSharedTemplate.isLoaded()) @@ -457,10 +467,26 @@ const std::string & SharedDraftSchematicObjectTemplate::getCraftedSharedTemplate } const std::string & value = m_craftedSharedTemplate.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedDraftSchematicObjectTemplate::getCraftedSharedTemplate +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void SharedDraftSchematicObjectTemplate::testValues(void) const +{ + IGNORE_RETURN(getCraftedSharedTemplate(true)); + SharedIntangibleObjectTemplate::testValues(); +} // SharedDraftSchematicObjectTemplate::testValues +#endif + /** * Loads the template data from an iff file. We should already be in the form * for this template. @@ -469,8 +495,8 @@ const std::string & SharedDraftSchematicObjectTemplate::getCraftedSharedTemplate */ void SharedDraftSchematicObjectTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != SharedDraftSchematicObjectTemplate_tag) { @@ -480,7 +506,7 @@ void SharedDraftSchematicObjectTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -500,8 +526,10 @@ void SharedDraftSchematicObjectTemplate::load(Iff &file) file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 0, 3)) + if (getHighestTemplateVersion() != TAG(0,0,0,3)) { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); m_versionOk = false; } @@ -563,6 +591,7 @@ void SharedDraftSchematicObjectTemplate::load(Iff &file) return; } // SharedDraftSchematicObjectTemplate::load + //============================================================================= // class SharedDraftSchematicObjectTemplate::_IngredientSlot @@ -609,12 +638,22 @@ Tag SharedDraftSchematicObjectTemplate::_IngredientSlot::getId(void) const return _IngredientSlot_tag; } // SharedDraftSchematicObjectTemplate::_IngredientSlot::getId -const StringId SharedDraftSchematicObjectTemplate::_IngredientSlot::getName(bool versionOk) const +const StringId SharedDraftSchematicObjectTemplate::_IngredientSlot::getName(bool versionOk, bool testData) const { +#ifdef _DEBUG +StringId testDataValue = DefaultStringId; +#else +UNREF(testData); +#endif + const SharedDraftSchematicObjectTemplate::_IngredientSlot * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getName(true); +#endif } if (!m_name.isLoaded()) @@ -632,16 +671,31 @@ const StringId SharedDraftSchematicObjectTemplate::_IngredientSlot::getName(bool } const StringId value = m_name.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedDraftSchematicObjectTemplate::_IngredientSlot::getName -const std::string & SharedDraftSchematicObjectTemplate::_IngredientSlot::getHardpoint(bool versionOk) const +const std::string & SharedDraftSchematicObjectTemplate::_IngredientSlot::getHardpoint(bool versionOk, bool testData) const { +#ifdef _DEBUG +std::string testDataValue = DefaultString; +#else +UNREF(testData); +#endif + const SharedDraftSchematicObjectTemplate::_IngredientSlot * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getHardpoint(true); +#endif } if (!m_hardpoint.isLoaded()) @@ -659,10 +713,26 @@ const std::string & SharedDraftSchematicObjectTemplate::_IngredientSlot::getHard } const std::string & value = m_hardpoint.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedDraftSchematicObjectTemplate::_IngredientSlot::getHardpoint +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void SharedDraftSchematicObjectTemplate::_IngredientSlot::testValues(void) const +{ + IGNORE_RETURN(getName(true)); + IGNORE_RETURN(getHardpoint(true)); +} // SharedDraftSchematicObjectTemplate::_IngredientSlot::testValues +#endif + /** * Loads the template data from an iff file. We should already be in the form * for this template. @@ -671,8 +741,8 @@ const std::string & SharedDraftSchematicObjectTemplate::_IngredientSlot::getHard */ void SharedDraftSchematicObjectTemplate::_IngredientSlot::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; file.enterForm(); @@ -694,6 +764,7 @@ void SharedDraftSchematicObjectTemplate::_IngredientSlot::load(Iff &file) UNREF(file); } // SharedDraftSchematicObjectTemplate::_IngredientSlot::load + //============================================================================= // class SharedDraftSchematicObjectTemplate::_SchematicAttribute @@ -740,12 +811,22 @@ Tag SharedDraftSchematicObjectTemplate::_SchematicAttribute::getId(void) const return _SchematicAttribute_tag; } // SharedDraftSchematicObjectTemplate::_SchematicAttribute::getId -const StringId SharedDraftSchematicObjectTemplate::_SchematicAttribute::getName(bool versionOk) const +const StringId SharedDraftSchematicObjectTemplate::_SchematicAttribute::getName(bool versionOk, bool testData) const { +#ifdef _DEBUG +StringId testDataValue = DefaultStringId; +#else +UNREF(testData); +#endif + const SharedDraftSchematicObjectTemplate::_SchematicAttribute * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getName(true); +#endif } if (!m_name.isLoaded()) @@ -763,16 +844,31 @@ const StringId SharedDraftSchematicObjectTemplate::_SchematicAttribute::getName( } const StringId value = m_name.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedDraftSchematicObjectTemplate::_SchematicAttribute::getName -const StringId SharedDraftSchematicObjectTemplate::_SchematicAttribute::getExperiment(bool versionOk) const +const StringId SharedDraftSchematicObjectTemplate::_SchematicAttribute::getExperiment(bool versionOk, bool testData) const { +#ifdef _DEBUG +StringId testDataValue = DefaultStringId; +#else +UNREF(testData); +#endif + const SharedDraftSchematicObjectTemplate::_SchematicAttribute * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getExperiment(true); +#endif } if (!m_experiment.isLoaded()) @@ -790,16 +886,31 @@ const StringId SharedDraftSchematicObjectTemplate::_SchematicAttribute::getExper } const StringId value = m_experiment.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedDraftSchematicObjectTemplate::_SchematicAttribute::getExperiment -int SharedDraftSchematicObjectTemplate::_SchematicAttribute::getValue(bool versionOk) const +int SharedDraftSchematicObjectTemplate::_SchematicAttribute::getValue(bool versionOk, bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const SharedDraftSchematicObjectTemplate::_SchematicAttribute * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getValue(true); +#endif } if (!m_value.isLoaded()) @@ -839,16 +950,31 @@ int SharedDraftSchematicObjectTemplate::_SchematicAttribute::getValue(bool versi else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedDraftSchematicObjectTemplate::_SchematicAttribute::getValue -int SharedDraftSchematicObjectTemplate::_SchematicAttribute::getValueMin(bool versionOk) const +int SharedDraftSchematicObjectTemplate::_SchematicAttribute::getValueMin(bool versionOk, bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const SharedDraftSchematicObjectTemplate::_SchematicAttribute * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getValueMin(true); +#endif } if (!m_value.isLoaded()) @@ -888,16 +1014,31 @@ int SharedDraftSchematicObjectTemplate::_SchematicAttribute::getValueMin(bool ve else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedDraftSchematicObjectTemplate::_SchematicAttribute::getValueMin -int SharedDraftSchematicObjectTemplate::_SchematicAttribute::getValueMax(bool versionOk) const +int SharedDraftSchematicObjectTemplate::_SchematicAttribute::getValueMax(bool versionOk, bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const SharedDraftSchematicObjectTemplate::_SchematicAttribute * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getValueMax(true); +#endif } if (!m_value.isLoaded()) @@ -937,10 +1078,28 @@ int SharedDraftSchematicObjectTemplate::_SchematicAttribute::getValueMax(bool ve else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedDraftSchematicObjectTemplate::_SchematicAttribute::getValueMax +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void SharedDraftSchematicObjectTemplate::_SchematicAttribute::testValues(void) const +{ + IGNORE_RETURN(getName(true)); + IGNORE_RETURN(getExperiment(true)); + IGNORE_RETURN(getValueMin(true)); + IGNORE_RETURN(getValueMax(true)); +} // SharedDraftSchematicObjectTemplate::_SchematicAttribute::testValues +#endif + /** * Loads the template data from an iff file. We should already be in the form * for this template. @@ -949,8 +1108,8 @@ int SharedDraftSchematicObjectTemplate::_SchematicAttribute::getValueMax(bool ve */ void SharedDraftSchematicObjectTemplate::_SchematicAttribute::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; file.enterForm(); @@ -978,17 +1137,17 @@ void SharedDraftSchematicObjectTemplate::_SchematicAttribute::load(Iff &file) //---------------------------------------------------------------------- -const StringId SharedDraftSchematicObjectTemplate::getCraftedName() const +const StringId SharedDraftSchematicObjectTemplate::getCraftedName () const { - StringId sid = getObjectName(); + StringId sid = getObjectName (); - if (sid.isInvalid()) + if (sid.isInvalid ()) { - const SharedObjectTemplate * const sot = fetchCraftedSharedObjectTemplate(); + const SharedObjectTemplate * const sot = fetchCraftedSharedObjectTemplate (); if (sot) { - sid = sot->getObjectName(); - sot->releaseReference(); + sid = sot->getObjectName (); + sot->releaseReference (); } } @@ -997,17 +1156,17 @@ const StringId SharedDraftSchematicObjectTemplate::getCraftedName() const //---------------------------------------------------------------------- -const StringId SharedDraftSchematicObjectTemplate::getCraftedDetailedDescription() const +const StringId SharedDraftSchematicObjectTemplate::getCraftedDetailedDescription () const { - StringId sid = getDetailedDescription(); + StringId sid = getDetailedDescription (); - if (sid.isInvalid()) + if (sid.isInvalid ()) { - const SharedObjectTemplate * const sot = fetchCraftedSharedObjectTemplate(); + const SharedObjectTemplate * const sot = fetchCraftedSharedObjectTemplate (); if (sot) { - sid = sot->getDetailedDescription(); - sot->releaseReference(); + sid = sot->getDetailedDescription (); + sot->releaseReference (); } } @@ -1016,17 +1175,17 @@ const StringId SharedDraftSchematicObjectTemplate::getCraftedDetailedDescription //---------------------------------------------------------------------- -const StringId SharedDraftSchematicObjectTemplate::getCraftedLookAtText() const +const StringId SharedDraftSchematicObjectTemplate::getCraftedLookAtText () const { - StringId sid = getLookAtText(); + StringId sid = getLookAtText (); - if (sid.isInvalid()) + if (sid.isInvalid ()) { - const SharedObjectTemplate * const sot = fetchCraftedSharedObjectTemplate(); + const SharedObjectTemplate * const sot = fetchCraftedSharedObjectTemplate (); if (sot) { - sid = sot->getLookAtText(); - sot->releaseReference(); + sid = sot->getLookAtText (); + sot->releaseReference (); } } @@ -1035,17 +1194,17 @@ const StringId SharedDraftSchematicObjectTemplate::getCraftedLookAtText() const //---------------------------------------------------------------------- -const std::string SharedDraftSchematicObjectTemplate::getCraftedAppearanceFilename() const +const std::string SharedDraftSchematicObjectTemplate::getCraftedAppearanceFilename () const { - const std::string & app = getAppearanceFilename(); + const std::string & app = getAppearanceFilename (); - if (app.empty()) + if (app.empty ()) { - const SharedObjectTemplate * const sot = fetchCraftedSharedObjectTemplate(); + const SharedObjectTemplate * const sot = fetchCraftedSharedObjectTemplate (); if (sot) { - const std::string capp = sot->getAppearanceFilename(); - sot->releaseReference(); + const std::string capp = sot->getAppearanceFilename (); + sot->releaseReference (); return capp; } } @@ -1055,18 +1214,19 @@ const std::string SharedDraftSchematicObjectTemplate::getCraftedAppearanceFilena //---------------------------------------------------------------------- -const SharedObjectTemplate * SharedDraftSchematicObjectTemplate::fetchCraftedSharedObjectTemplate() const +const SharedObjectTemplate * SharedDraftSchematicObjectTemplate::fetchCraftedSharedObjectTemplate () const { - const std::string & sotName = getCraftedSharedTemplate(); - const SharedObjectTemplate * const sot = safe_cast(ObjectTemplateList::fetch(sotName.c_str())); + const std::string & sotName = getCraftedSharedTemplate (); + const SharedObjectTemplate * const sot = safe_cast(ObjectTemplateList::fetch (sotName.c_str ())); if (!sot) { - const char * const draftName = this->DataResource::getName(); - WARNING(true, ("SharedDraftSchematicObjectTemplate [%s] could not load craftedSharedTemplate [%s]", draftName ? draftName : "", sotName.c_str())); + const char * const draftName = this->DataResource::getName (); + WARNING (true, ("SharedDraftSchematicObjectTemplate [%s] could not load craftedSharedTemplate [%s]", draftName ? draftName : "", sotName.c_str ())); } return sot; } -//---------------------------------------------------------------------- \ No newline at end of file +//---------------------------------------------------------------------- + diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedDraftSchematicObjectTemplate.h b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedDraftSchematicObjectTemplate.h old mode 100755 new mode 100644 index 9d312500..a4b2fc1a --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedDraftSchematicObjectTemplate.h +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedDraftSchematicObjectTemplate.h @@ -61,7 +61,6 @@ public: enum DamageType { - DT_none = 0x00000000, DT_kinetic = 0x00000001, DT_energy = 0x00000002, DT_blast = 0x00000004, @@ -109,9 +108,14 @@ protected: virtual Tag getId(void) const; public: - const StringId getName(bool versionOk) const; - const std::string & getHardpoint(bool versionOk) const; + const StringId getName(bool versionOk, bool testData = false) const; + const std::string & getHardpoint(bool versionOk, bool testData = false) const; +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); @@ -144,12 +148,17 @@ private: virtual Tag getId(void) const; public: - const StringId getName(bool versionOk) const; - const StringId getExperiment(bool versionOk) const; - int getValue(bool versionOk) const; - int getValueMin(bool versionOk) const; - int getValueMax(bool versionOk) const; + const StringId getName(bool versionOk, bool testData = false) const; + const StringId getExperiment(bool versionOk, bool testData = false) const; + int getValue(bool versionOk, bool testData = false) const; + int getValueMin(bool versionOk, bool testData = false) const; + int getValueMax(bool versionOk, bool testData = false) const; +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); @@ -176,8 +185,13 @@ public: void getAttributesMin(SchematicAttribute &data, int index) const; void getAttributesMax(SchematicAttribute &data, int index) const; size_t getAttributesCount(void) const; - const std::string & getCraftedSharedTemplate() const; + const std::string & getCraftedSharedTemplate(bool testData = false) const; +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedFactoryObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedFactoryObjectTemplate.cpp old mode 100755 new mode 100644 index e7d9e1f7..4a7e73fa --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedFactoryObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedFactoryObjectTemplate.cpp @@ -23,20 +23,20 @@ const std::string DefaultString(""); const StringId DefaultStringId("", 0); -const Vector DefaultVector(0, 0, 0); +const Vector DefaultVector(0,0,0); const TriggerVolumeData DefaultTriggerVolumeData; bool SharedFactoryObjectTemplate::ms_allowDefaultTemplateParams = true; + /** * Class constructor. */ SharedFactoryObjectTemplate::SharedFactoryObjectTemplate(const std::string & filename) //@BEGIN TFD INIT : SharedTangibleObjectTemplate(filename) - , m_versionOk(true) - , m_templateVersion(0) - //@END TFD INIT + ,m_versionOk(true) +//@END TFD INIT { } // SharedFactoryObjectTemplate::SharedFactoryObjectTemplate @@ -45,8 +45,8 @@ SharedFactoryObjectTemplate::SharedFactoryObjectTemplate(const std::string & fil */ SharedFactoryObjectTemplate::~SharedFactoryObjectTemplate() { - //@BEGIN TFD CLEANUP - //@END TFD CLEANUP +//@BEGIN TFD CLEANUP +//@END TFD CLEANUP } // SharedFactoryObjectTemplate::~SharedFactoryObjectTemplate /** @@ -103,6 +103,15 @@ Tag SharedFactoryObjectTemplate::getHighestTemplateVersion(void) const } // SharedFactoryObjectTemplate::getHighestTemplateVersion //@BEGIN TFD +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void SharedFactoryObjectTemplate::testValues(void) const +{ + SharedTangibleObjectTemplate::testValues(); +} // SharedFactoryObjectTemplate::testValues +#endif /** * Loads the template data from an iff file. We should already be in the form @@ -112,8 +121,8 @@ Tag SharedFactoryObjectTemplate::getHighestTemplateVersion(void) const */ void SharedFactoryObjectTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != SharedFactoryObjectTemplate_tag) { @@ -123,7 +132,7 @@ void SharedFactoryObjectTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -143,8 +152,10 @@ void SharedFactoryObjectTemplate::load(Iff &file) file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 0, 0)) + if (getHighestTemplateVersion() != TAG(0,0,0,0)) { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); m_versionOk = false; } @@ -162,4 +173,4 @@ void SharedFactoryObjectTemplate::load(Iff &file) return; } // SharedFactoryObjectTemplate::load -//@END TFD \ No newline at end of file +//@END TFD diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedFactoryObjectTemplate.h b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedFactoryObjectTemplate.h old mode 100755 new mode 100644 index 9333931b..3bab50b6 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedFactoryObjectTemplate.h +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedFactoryObjectTemplate.h @@ -45,6 +45,11 @@ public: //@BEGIN TFD public: +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedGroupObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedGroupObjectTemplate.cpp old mode 100755 new mode 100644 index 87dc2c57..d3c1d6d0 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedGroupObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedGroupObjectTemplate.cpp @@ -23,20 +23,20 @@ const std::string DefaultString(""); const StringId DefaultStringId("", 0); -const Vector DefaultVector(0, 0, 0); +const Vector DefaultVector(0,0,0); const TriggerVolumeData DefaultTriggerVolumeData; bool SharedGroupObjectTemplate::ms_allowDefaultTemplateParams = true; + /** * Class constructor. */ SharedGroupObjectTemplate::SharedGroupObjectTemplate(const std::string & filename) //@BEGIN TFD INIT : SharedUniverseObjectTemplate(filename) - , m_versionOk(true) - , m_templateVersion(0) - //@END TFD INIT + ,m_versionOk(true) +//@END TFD INIT { } // SharedGroupObjectTemplate::SharedGroupObjectTemplate @@ -45,8 +45,8 @@ SharedGroupObjectTemplate::SharedGroupObjectTemplate(const std::string & filenam */ SharedGroupObjectTemplate::~SharedGroupObjectTemplate() { - //@BEGIN TFD CLEANUP - //@END TFD CLEANUP +//@BEGIN TFD CLEANUP +//@END TFD CLEANUP } // SharedGroupObjectTemplate::~SharedGroupObjectTemplate /** @@ -103,6 +103,15 @@ Tag SharedGroupObjectTemplate::getHighestTemplateVersion(void) const } // SharedGroupObjectTemplate::getHighestTemplateVersion //@BEGIN TFD +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void SharedGroupObjectTemplate::testValues(void) const +{ + SharedUniverseObjectTemplate::testValues(); +} // SharedGroupObjectTemplate::testValues +#endif /** * Loads the template data from an iff file. We should already be in the form @@ -112,8 +121,8 @@ Tag SharedGroupObjectTemplate::getHighestTemplateVersion(void) const */ void SharedGroupObjectTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != SharedGroupObjectTemplate_tag) { @@ -123,7 +132,7 @@ void SharedGroupObjectTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -143,8 +152,10 @@ void SharedGroupObjectTemplate::load(Iff &file) file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 0, 0)) + if (getHighestTemplateVersion() != TAG(0,0,0,0)) { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); m_versionOk = false; } @@ -162,4 +173,4 @@ void SharedGroupObjectTemplate::load(Iff &file) return; } // SharedGroupObjectTemplate::load -//@END TFD \ No newline at end of file +//@END TFD diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedGroupObjectTemplate.h b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedGroupObjectTemplate.h old mode 100755 new mode 100644 index 97298566..a114b920 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedGroupObjectTemplate.h +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedGroupObjectTemplate.h @@ -45,6 +45,11 @@ public: //@BEGIN TFD public: +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedGuildObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedGuildObjectTemplate.cpp old mode 100755 new mode 100644 index 03650c6b..e57241db --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedGuildObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedGuildObjectTemplate.cpp @@ -23,20 +23,20 @@ const std::string DefaultString(""); const StringId DefaultStringId("", 0); -const Vector DefaultVector(0, 0, 0); +const Vector DefaultVector(0,0,0); const TriggerVolumeData DefaultTriggerVolumeData; bool SharedGuildObjectTemplate::ms_allowDefaultTemplateParams = true; + /** * Class constructor. */ SharedGuildObjectTemplate::SharedGuildObjectTemplate(const std::string & filename) //@BEGIN TFD INIT : SharedUniverseObjectTemplate(filename) - , m_versionOk(true) - , m_templateVersion(0) - //@END TFD INIT + ,m_versionOk(true) +//@END TFD INIT { } // SharedGuildObjectTemplate::SharedGuildObjectTemplate @@ -45,8 +45,8 @@ SharedGuildObjectTemplate::SharedGuildObjectTemplate(const std::string & filenam */ SharedGuildObjectTemplate::~SharedGuildObjectTemplate() { - //@BEGIN TFD CLEANUP - //@END TFD CLEANUP +//@BEGIN TFD CLEANUP +//@END TFD CLEANUP } // SharedGuildObjectTemplate::~SharedGuildObjectTemplate /** @@ -103,6 +103,15 @@ Tag SharedGuildObjectTemplate::getHighestTemplateVersion(void) const } // SharedGuildObjectTemplate::getHighestTemplateVersion //@BEGIN TFD +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void SharedGuildObjectTemplate::testValues(void) const +{ + SharedUniverseObjectTemplate::testValues(); +} // SharedGuildObjectTemplate::testValues +#endif /** * Loads the template data from an iff file. We should already be in the form @@ -112,8 +121,8 @@ Tag SharedGuildObjectTemplate::getHighestTemplateVersion(void) const */ void SharedGuildObjectTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != SharedGuildObjectTemplate_tag) { @@ -123,7 +132,7 @@ void SharedGuildObjectTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -143,8 +152,10 @@ void SharedGuildObjectTemplate::load(Iff &file) file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 0, 0)) + if (getHighestTemplateVersion() != TAG(0,0,0,0)) { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); m_versionOk = false; } @@ -162,4 +173,4 @@ void SharedGuildObjectTemplate::load(Iff &file) return; } // SharedGuildObjectTemplate::load -//@END TFD \ No newline at end of file +//@END TFD diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedGuildObjectTemplate.h b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedGuildObjectTemplate.h old mode 100755 new mode 100644 index b69a4dcc..43a7c2d3 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedGuildObjectTemplate.h +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedGuildObjectTemplate.h @@ -45,6 +45,11 @@ public: //@BEGIN TFD public: +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedInstallationObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedInstallationObjectTemplate.cpp old mode 100755 new mode 100644 index 4e0e5c1b..5e66bbf1 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedInstallationObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedInstallationObjectTemplate.cpp @@ -23,20 +23,20 @@ const std::string DefaultString(""); const StringId DefaultStringId("", 0); -const Vector DefaultVector(0, 0, 0); +const Vector DefaultVector(0,0,0); const TriggerVolumeData DefaultTriggerVolumeData; bool SharedInstallationObjectTemplate::ms_allowDefaultTemplateParams = true; + /** * Class constructor. */ SharedInstallationObjectTemplate::SharedInstallationObjectTemplate(const std::string & filename) //@BEGIN TFD INIT : SharedTangibleObjectTemplate(filename) - , m_versionOk(true) - , m_templateVersion(0) - //@END TFD INIT + ,m_versionOk(true) +//@END TFD INIT { } // SharedInstallationObjectTemplate::SharedInstallationObjectTemplate @@ -45,8 +45,8 @@ SharedInstallationObjectTemplate::SharedInstallationObjectTemplate(const std::st */ SharedInstallationObjectTemplate::~SharedInstallationObjectTemplate() { - //@BEGIN TFD CLEANUP - //@END TFD CLEANUP +//@BEGIN TFD CLEANUP +//@END TFD CLEANUP } // SharedInstallationObjectTemplate::~SharedInstallationObjectTemplate /** @@ -103,6 +103,15 @@ Tag SharedInstallationObjectTemplate::getHighestTemplateVersion(void) const } // SharedInstallationObjectTemplate::getHighestTemplateVersion //@BEGIN TFD +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void SharedInstallationObjectTemplate::testValues(void) const +{ + SharedTangibleObjectTemplate::testValues(); +} // SharedInstallationObjectTemplate::testValues +#endif /** * Loads the template data from an iff file. We should already be in the form @@ -112,8 +121,8 @@ Tag SharedInstallationObjectTemplate::getHighestTemplateVersion(void) const */ void SharedInstallationObjectTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != SharedInstallationObjectTemplate_tag) { @@ -123,7 +132,7 @@ void SharedInstallationObjectTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -143,8 +152,10 @@ void SharedInstallationObjectTemplate::load(Iff &file) file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 0, 0)) + if (getHighestTemplateVersion() != TAG(0,0,0,0)) { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); m_versionOk = false; } @@ -162,4 +173,4 @@ void SharedInstallationObjectTemplate::load(Iff &file) return; } // SharedInstallationObjectTemplate::load -//@END TFD \ No newline at end of file +//@END TFD diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedInstallationObjectTemplate.h b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedInstallationObjectTemplate.h old mode 100755 new mode 100644 index 528b98b5..36e3aabe --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedInstallationObjectTemplate.h +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedInstallationObjectTemplate.h @@ -45,6 +45,11 @@ public: //@BEGIN TFD public: +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedIntangibleObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedIntangibleObjectTemplate.cpp old mode 100755 new mode 100644 index ba2ef96f..4934dd40 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedIntangibleObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedIntangibleObjectTemplate.cpp @@ -23,20 +23,20 @@ const std::string DefaultString(""); const StringId DefaultStringId("", 0); -const Vector DefaultVector(0, 0, 0); +const Vector DefaultVector(0,0,0); const TriggerVolumeData DefaultTriggerVolumeData; bool SharedIntangibleObjectTemplate::ms_allowDefaultTemplateParams = true; + /** * Class constructor. */ SharedIntangibleObjectTemplate::SharedIntangibleObjectTemplate(const std::string & filename) //@BEGIN TFD INIT : SharedObjectTemplate(filename) - , m_versionOk(true) - , m_templateVersion(0) - //@END TFD INIT + ,m_versionOk(true) +//@END TFD INIT { } // SharedIntangibleObjectTemplate::SharedIntangibleObjectTemplate @@ -45,8 +45,8 @@ SharedIntangibleObjectTemplate::SharedIntangibleObjectTemplate(const std::string */ SharedIntangibleObjectTemplate::~SharedIntangibleObjectTemplate() { - //@BEGIN TFD CLEANUP - //@END TFD CLEANUP +//@BEGIN TFD CLEANUP +//@END TFD CLEANUP } // SharedIntangibleObjectTemplate::~SharedIntangibleObjectTemplate /** @@ -103,6 +103,15 @@ Tag SharedIntangibleObjectTemplate::getHighestTemplateVersion(void) const } // SharedIntangibleObjectTemplate::getHighestTemplateVersion //@BEGIN TFD +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void SharedIntangibleObjectTemplate::testValues(void) const +{ + SharedObjectTemplate::testValues(); +} // SharedIntangibleObjectTemplate::testValues +#endif /** * Loads the template data from an iff file. We should already be in the form @@ -112,8 +121,8 @@ Tag SharedIntangibleObjectTemplate::getHighestTemplateVersion(void) const */ void SharedIntangibleObjectTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != SharedIntangibleObjectTemplate_tag) { @@ -123,7 +132,7 @@ void SharedIntangibleObjectTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -143,8 +152,10 @@ void SharedIntangibleObjectTemplate::load(Iff &file) file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 0, 0)) + if (getHighestTemplateVersion() != TAG(0,0,0,0)) { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); m_versionOk = false; } @@ -162,4 +173,4 @@ void SharedIntangibleObjectTemplate::load(Iff &file) return; } // SharedIntangibleObjectTemplate::load -//@END TFD \ No newline at end of file +//@END TFD diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedIntangibleObjectTemplate.h b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedIntangibleObjectTemplate.h old mode 100755 new mode 100644 index 4d7d15e7..bf0ae9d3 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedIntangibleObjectTemplate.h +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedIntangibleObjectTemplate.h @@ -45,6 +45,11 @@ public: //@BEGIN TFD public: +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedJediManagerObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedJediManagerObjectTemplate.cpp old mode 100755 new mode 100644 index 3d1387bc..3c8ad274 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedJediManagerObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedJediManagerObjectTemplate.cpp @@ -12,7 +12,7 @@ #include "sharedGame/FirstSharedGame.h" #include "SharedJediManagerObjectTemplate.h" - +#include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedMath/Vector.h" #include "sharedObject/ObjectTemplate.h" @@ -24,20 +24,20 @@ const std::string DefaultString(""); const StringId DefaultStringId("", 0); -const Vector DefaultVector(0, 0, 0); +const Vector DefaultVector(0,0,0); const TriggerVolumeData DefaultTriggerVolumeData; bool SharedJediManagerObjectTemplate::ms_allowDefaultTemplateParams = true; + /** * Class constructor. */ SharedJediManagerObjectTemplate::SharedJediManagerObjectTemplate(const std::string & filename) //@BEGIN TFD INIT : SharedUniverseObjectTemplate(filename) - , m_versionOk(true) - , m_templateVersion(0) - //@END TFD INIT + ,m_versionOk(true) +//@END TFD INIT { } // SharedJediManagerObjectTemplate::SharedJediManagerObjectTemplate @@ -46,8 +46,8 @@ SharedJediManagerObjectTemplate::SharedJediManagerObjectTemplate(const std::stri */ SharedJediManagerObjectTemplate::~SharedJediManagerObjectTemplate() { - //@BEGIN TFD CLEANUP - //@END TFD CLEANUP +//@BEGIN TFD CLEANUP +//@END TFD CLEANUP } // SharedJediManagerObjectTemplate::~SharedJediManagerObjectTemplate /** @@ -104,6 +104,15 @@ Tag SharedJediManagerObjectTemplate::getHighestTemplateVersion(void) const } // SharedJediManagerObjectTemplate::getHighestTemplateVersion //@BEGIN TFD +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void SharedJediManagerObjectTemplate::testValues(void) const +{ + SharedUniverseObjectTemplate::testValues(); +} // SharedJediManagerObjectTemplate::testValues +#endif /** * Loads the template data from an iff file. We should already be in the form @@ -113,8 +122,8 @@ Tag SharedJediManagerObjectTemplate::getHighestTemplateVersion(void) const */ void SharedJediManagerObjectTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != SharedJediManagerObjectTemplate_tag) { @@ -124,7 +133,7 @@ void SharedJediManagerObjectTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -144,8 +153,10 @@ void SharedJediManagerObjectTemplate::load(Iff &file) file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 0, 0)) + if (getHighestTemplateVersion() != TAG(0,0,0,0)) { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); m_versionOk = false; } @@ -163,4 +174,4 @@ void SharedJediManagerObjectTemplate::load(Iff &file) return; } // SharedJediManagerObjectTemplate::load -//@END TFD \ No newline at end of file +//@END TFD diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedJediManagerObjectTemplate.h b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedJediManagerObjectTemplate.h old mode 100755 new mode 100644 index 91b5d4ef..b2be5b14 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedJediManagerObjectTemplate.h +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedJediManagerObjectTemplate.h @@ -45,6 +45,11 @@ public: //@BEGIN TFD public: +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedManufactureSchematicObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedManufactureSchematicObjectTemplate.cpp old mode 100755 new mode 100644 index 2f637eae..de9c8b4d --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedManufactureSchematicObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedManufactureSchematicObjectTemplate.cpp @@ -23,20 +23,20 @@ const std::string DefaultString(""); const StringId DefaultStringId("", 0); -const Vector DefaultVector(0, 0, 0); +const Vector DefaultVector(0,0,0); const TriggerVolumeData DefaultTriggerVolumeData; bool SharedManufactureSchematicObjectTemplate::ms_allowDefaultTemplateParams = true; + /** * Class constructor. */ SharedManufactureSchematicObjectTemplate::SharedManufactureSchematicObjectTemplate(const std::string & filename) //@BEGIN TFD INIT : SharedIntangibleObjectTemplate(filename) - , m_versionOk(true) - , m_templateVersion(0) - //@END TFD INIT + ,m_versionOk(true) +//@END TFD INIT { } // SharedManufactureSchematicObjectTemplate::SharedManufactureSchematicObjectTemplate @@ -45,8 +45,8 @@ SharedManufactureSchematicObjectTemplate::SharedManufactureSchematicObjectTempla */ SharedManufactureSchematicObjectTemplate::~SharedManufactureSchematicObjectTemplate() { - //@BEGIN TFD CLEANUP - //@END TFD CLEANUP +//@BEGIN TFD CLEANUP +//@END TFD CLEANUP } // SharedManufactureSchematicObjectTemplate::~SharedManufactureSchematicObjectTemplate /** @@ -103,6 +103,15 @@ Tag SharedManufactureSchematicObjectTemplate::getHighestTemplateVersion(void) co } // SharedManufactureSchematicObjectTemplate::getHighestTemplateVersion //@BEGIN TFD +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void SharedManufactureSchematicObjectTemplate::testValues(void) const +{ + SharedIntangibleObjectTemplate::testValues(); +} // SharedManufactureSchematicObjectTemplate::testValues +#endif /** * Loads the template data from an iff file. We should already be in the form @@ -112,8 +121,8 @@ Tag SharedManufactureSchematicObjectTemplate::getHighestTemplateVersion(void) co */ void SharedManufactureSchematicObjectTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != SharedManufactureSchematicObjectTemplate_tag) { @@ -123,7 +132,7 @@ void SharedManufactureSchematicObjectTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -143,8 +152,10 @@ void SharedManufactureSchematicObjectTemplate::load(Iff &file) file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 0, 0)) + if (getHighestTemplateVersion() != TAG(0,0,0,0)) { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); m_versionOk = false; } @@ -162,4 +173,4 @@ void SharedManufactureSchematicObjectTemplate::load(Iff &file) return; } // SharedManufactureSchematicObjectTemplate::load -//@END TFD \ No newline at end of file +//@END TFD diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedManufactureSchematicObjectTemplate.h b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedManufactureSchematicObjectTemplate.h old mode 100755 new mode 100644 index fc80e58d..71a6c26e --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedManufactureSchematicObjectTemplate.h +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedManufactureSchematicObjectTemplate.h @@ -45,6 +45,11 @@ public: //@BEGIN TFD public: +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedMissionDataObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedMissionDataObjectTemplate.cpp new file mode 100644 index 00000000..eba86734 --- /dev/null +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedMissionDataObjectTemplate.cpp @@ -0,0 +1,176 @@ +//======================================================================== +// +// SharedMissionDataObjectTemplate.cpp +// +//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be +//overwritten the next time the template definition is compiled. Do not +//make changes to code inside these blocks. +// +// copyright 2001 Sony Online Entertainment +// +//======================================================================== + +#include "sharedGame/FirstSharedGame.h" +#include "SharedMissionDataObjectTemplate.h" +#include "sharedDebug/DataLint.h" +#include "sharedFile/Iff.h" +#include "sharedObject/ObjectTemplate.h" +#include "sharedObject/ObjectTemplateList.h" +#include "sharedMath/Vector.h" +//@BEGIN TFD TEMPLATE REFS +//@END TFD TEMPLATE REFS +#include + +const std::string DefaultString(""); +const StringId DefaultStringId("", 0); +const Vector DefaultVector(0,0,0); +const TriggerVolumeData DefaultTriggerVolumeData; + +bool SharedMissionDataObjectTemplate::ms_allowDefaultTemplateParams = true; + + +/** + * Class constructor. + */ +SharedMissionDataObjectTemplate::SharedMissionDataObjectTemplate(const std::string & filename) +//@BEGIN TFD INIT + : SharedIntangibleObjectTemplate(filename) + ,m_versionOk(true) +//@END TFD INIT +{ +} // SharedMissionDataObjectTemplate::SharedMissionDataObjectTemplate + +/** + * Class destructor. + */ +SharedMissionDataObjectTemplate::~SharedMissionDataObjectTemplate() +{ +//@BEGIN TFD CLEANUP +//@END TFD CLEANUP +} // SharedMissionDataObjectTemplate::~SharedMissionDataObjectTemplate + +/** + * Static function used to register this template. + */ +void SharedMissionDataObjectTemplate::registerMe(void) +{ + ObjectTemplateList::registerTemplate(SharedMissionDataObjectTemplate_tag, create); +} // SharedMissionDataObjectTemplate::registerMe + +/** + * Creates a SharedMissionDataObjectTemplate template. + * + * @return a new instance of the template + */ +ObjectTemplate * SharedMissionDataObjectTemplate::create(const std::string & filename) +{ + return new SharedMissionDataObjectTemplate(filename); +} // SharedMissionDataObjectTemplate::create + +/** + * Returns the template id. + * + * @return the template id + */ +Tag SharedMissionDataObjectTemplate::getId(void) const +{ + return SharedMissionDataObjectTemplate_tag; +} // SharedMissionDataObjectTemplate::getId + +/** + * Returns this template's version. + * + * @return the version + */ +Tag SharedMissionDataObjectTemplate::getTemplateVersion(void) const +{ + return m_templateVersion; +} // SharedMissionDataObjectTemplate::getTemplateVersion + +/** + * Returns the highest version of this template or it's base templates. + * + * @return the highest version + */ +Tag SharedMissionDataObjectTemplate::getHighestTemplateVersion(void) const +{ + if (m_baseData == nullptr) + return m_templateVersion; + const SharedMissionDataObjectTemplate * base = dynamic_cast(m_baseData); + if (base == nullptr) + return m_templateVersion; + return std::max(m_templateVersion, base->getHighestTemplateVersion()); +} // SharedMissionDataObjectTemplate::getHighestTemplateVersion + +//@BEGIN TFD +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void SharedMissionDataObjectTemplate::testValues(void) const +{ + SharedIntangibleObjectTemplate::testValues(); +} // SharedMissionDataObjectTemplate::testValues +#endif + +/** + * Loads the template data from an iff file. We should already be in the form + * for this template. + * + * @param file file to load from + */ +void SharedMissionDataObjectTemplate::load(Iff &file) +{ +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; + + if (file.getCurrentName() != SharedMissionDataObjectTemplate_tag) + { + SharedIntangibleObjectTemplate::load(file); + return; + } + + file.enterForm(); + m_templateVersion = file.getCurrentName(); + if (m_templateVersion == TAG(D,E,R,V)) + { + file.enterForm(); + file.enterChunk(); + std::string baseFilename; + file.read_string(baseFilename); + file.exitChunk(); + const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) + base->releaseReference(); + else + { + if (m_baseData != nullptr) + m_baseData->releaseReference(); + m_baseData = base; + } + file.exitForm(); + m_templateVersion = file.getCurrentName(); + } + if (getHighestTemplateVersion() != TAG(0,0,0,0)) + { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); + m_versionOk = false; + } + + file.enterForm(); + + file.enterChunk(); + int paramCount = file.read_int32(); + file.exitChunk(); + UNREF(paramName); + UNREF(paramCount); + + file.exitForm(); + SharedIntangibleObjectTemplate::load(file); + file.exitForm(); + return; +} // SharedMissionDataObjectTemplate::load + +//@END TFD diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedMissionDataObjectTemplate.h b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedMissionDataObjectTemplate.h new file mode 100644 index 00000000..d1a796fb --- /dev/null +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedMissionDataObjectTemplate.h @@ -0,0 +1,83 @@ +//======================================================================== +// +// SharedMissionDataObjectTemplate.h +// +//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be +//overwritten the next time the template definition is compiled. Do not +//make changes to code inside these blocks. +// +// copyright 2001 Sony Online Entertainment +// +//======================================================================== + +#ifndef _INCLUDED_SharedMissionDataObjectTemplate_H +#define _INCLUDED_SharedMissionDataObjectTemplate_H + +#include "SharedIntangibleObjectTemplate.h" +#include "sharedFoundation/DynamicVariable.h" +#include "sharedUtility/TemplateParameter.h" + + +class Vector; +typedef StructParam StructParamOT; +//@BEGIN TFD TEMPLATE REFS +//@END TFD TEMPLATE REFS + + +class SharedMissionDataObjectTemplate : public SharedIntangibleObjectTemplate +{ +public: +//@BEGIN TFD ID + enum + { + SharedMissionDataObjectTemplate_tag = TAG(S,M,S,D) + }; +//@END TFD ID +public: + SharedMissionDataObjectTemplate(const std::string & filename); + virtual ~SharedMissionDataObjectTemplate(); + + virtual Tag getId(void) const; + virtual Tag getTemplateVersion(void) const; + virtual Tag getHighestTemplateVersion(void) const; + static void install(bool allowDefaultTemplateParams = true); + +//@BEGIN TFD +public: + +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif + +protected: + virtual void load(Iff &file); + +private: +//@END TFD + +private: + Tag m_templateVersion; // the template version + bool m_versionOk; // flag that the template version loaded is the one we expect + static bool ms_allowDefaultTemplateParams; // flag to allow defaut params instead of fataling + + static void registerMe(void); + static ObjectTemplate * create(const std::string & filename); + + // no copying + SharedMissionDataObjectTemplate(const SharedMissionDataObjectTemplate &); + SharedMissionDataObjectTemplate & operator =(const SharedMissionDataObjectTemplate &); +}; + + +inline void SharedMissionDataObjectTemplate::install(bool allowDefaultTemplateParams) +{ + ms_allowDefaultTemplateParams = allowDefaultTemplateParams; +//@BEGIN TFD INSTALL + SharedMissionDataObjectTemplate::registerMe(); +//@END TFD INSTALL +} + + +#endif // _INCLUDED_SharedMissionDataObjectTemplate_H diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedMissionListEntryObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedMissionListEntryObjectTemplate.cpp new file mode 100644 index 00000000..a9e87da5 --- /dev/null +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedMissionListEntryObjectTemplate.cpp @@ -0,0 +1,176 @@ +//======================================================================== +// +// SharedMissionListEntryObjectTemplate.cpp +// +//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be +//overwritten the next time the template definition is compiled. Do not +//make changes to code inside these blocks. +// +// copyright 2001 Sony Online Entertainment +// +//======================================================================== + +#include "sharedGame/FirstSharedGame.h" +#include "SharedMissionListEntryObjectTemplate.h" +#include "sharedDebug/DataLint.h" +#include "sharedFile/Iff.h" +#include "sharedObject/ObjectTemplate.h" +#include "sharedObject/ObjectTemplateList.h" +#include "sharedMath/Vector.h" +//@BEGIN TFD TEMPLATE REFS +//@END TFD TEMPLATE REFS +#include + +const std::string DefaultString(""); +const StringId DefaultStringId("", 0); +const Vector DefaultVector(0,0,0); +const TriggerVolumeData DefaultTriggerVolumeData; + +bool SharedMissionListEntryObjectTemplate::ms_allowDefaultTemplateParams = true; + + +/** + * Class constructor. + */ +SharedMissionListEntryObjectTemplate::SharedMissionListEntryObjectTemplate(const std::string & filename) +//@BEGIN TFD INIT + : SharedIntangibleObjectTemplate(filename) + ,m_versionOk(true) +//@END TFD INIT +{ +} // SharedMissionListEntryObjectTemplate::SharedMissionListEntryObjectTemplate + +/** + * Class destructor. + */ +SharedMissionListEntryObjectTemplate::~SharedMissionListEntryObjectTemplate() +{ +//@BEGIN TFD CLEANUP +//@END TFD CLEANUP +} // SharedMissionListEntryObjectTemplate::~SharedMissionListEntryObjectTemplate + +/** + * Static function used to register this template. + */ +void SharedMissionListEntryObjectTemplate::registerMe(void) +{ + ObjectTemplateList::registerTemplate(SharedMissionListEntryObjectTemplate_tag, create); +} // SharedMissionListEntryObjectTemplate::registerMe + +/** + * Creates a SharedMissionListEntryObjectTemplate template. + * + * @return a new instance of the template + */ +ObjectTemplate * SharedMissionListEntryObjectTemplate::create(const std::string & filename) +{ + return new SharedMissionListEntryObjectTemplate(filename); +} // SharedMissionListEntryObjectTemplate::create + +/** + * Returns the template id. + * + * @return the template id + */ +Tag SharedMissionListEntryObjectTemplate::getId(void) const +{ + return SharedMissionListEntryObjectTemplate_tag; +} // SharedMissionListEntryObjectTemplate::getId + +/** + * Returns this template's version. + * + * @return the version + */ +Tag SharedMissionListEntryObjectTemplate::getTemplateVersion(void) const +{ + return m_templateVersion; +} // SharedMissionListEntryObjectTemplate::getTemplateVersion + +/** + * Returns the highest version of this template or it's base templates. + * + * @return the highest version + */ +Tag SharedMissionListEntryObjectTemplate::getHighestTemplateVersion(void) const +{ + if (m_baseData == nullptr) + return m_templateVersion; + const SharedMissionListEntryObjectTemplate * base = dynamic_cast(m_baseData); + if (base == nullptr) + return m_templateVersion; + return std::max(m_templateVersion, base->getHighestTemplateVersion()); +} // SharedMissionListEntryObjectTemplate::getHighestTemplateVersion + +//@BEGIN TFD +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void SharedMissionListEntryObjectTemplate::testValues(void) const +{ + SharedIntangibleObjectTemplate::testValues(); +} // SharedMissionListEntryObjectTemplate::testValues +#endif + +/** + * Loads the template data from an iff file. We should already be in the form + * for this template. + * + * @param file file to load from + */ +void SharedMissionListEntryObjectTemplate::load(Iff &file) +{ +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; + + if (file.getCurrentName() != SharedMissionListEntryObjectTemplate_tag) + { + SharedIntangibleObjectTemplate::load(file); + return; + } + + file.enterForm(); + m_templateVersion = file.getCurrentName(); + if (m_templateVersion == TAG(D,E,R,V)) + { + file.enterForm(); + file.enterChunk(); + std::string baseFilename; + file.read_string(baseFilename); + file.exitChunk(); + const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) + base->releaseReference(); + else + { + if (m_baseData != nullptr) + m_baseData->releaseReference(); + m_baseData = base; + } + file.exitForm(); + m_templateVersion = file.getCurrentName(); + } + if (getHighestTemplateVersion() != TAG(0,0,0,0)) + { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); + m_versionOk = false; + } + + file.enterForm(); + + file.enterChunk(); + int paramCount = file.read_int32(); + file.exitChunk(); + UNREF(paramName); + UNREF(paramCount); + + file.exitForm(); + SharedIntangibleObjectTemplate::load(file); + file.exitForm(); + return; +} // SharedMissionListEntryObjectTemplate::load + +//@END TFD diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedMissionListEntryObjectTemplate.h b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedMissionListEntryObjectTemplate.h new file mode 100644 index 00000000..85cc965b --- /dev/null +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedMissionListEntryObjectTemplate.h @@ -0,0 +1,83 @@ +//======================================================================== +// +// SharedMissionListEntryObjectTemplate.h +// +//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be +//overwritten the next time the template definition is compiled. Do not +//make changes to code inside these blocks. +// +// copyright 2001 Sony Online Entertainment +// +//======================================================================== + +#ifndef _INCLUDED_SharedMissionListEntryObjectTemplate_H +#define _INCLUDED_SharedMissionListEntryObjectTemplate_H + +#include "SharedIntangibleObjectTemplate.h" +#include "sharedFoundation/DynamicVariable.h" +#include "sharedUtility/TemplateParameter.h" + + +class Vector; +typedef StructParam StructParamOT; +//@BEGIN TFD TEMPLATE REFS +//@END TFD TEMPLATE REFS + + +class SharedMissionListEntryObjectTemplate : public SharedIntangibleObjectTemplate +{ +public: +//@BEGIN TFD ID + enum + { + SharedMissionListEntryObjectTemplate_tag = TAG(S,M,L,E) + }; +//@END TFD ID +public: + SharedMissionListEntryObjectTemplate(const std::string & filename); + virtual ~SharedMissionListEntryObjectTemplate(); + + virtual Tag getId(void) const; + virtual Tag getTemplateVersion(void) const; + virtual Tag getHighestTemplateVersion(void) const; + static void install(bool allowDefaultTemplateParams = true); + +//@BEGIN TFD +public: + +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif + +protected: + virtual void load(Iff &file); + +private: +//@END TFD + +private: + Tag m_templateVersion; // the template version + bool m_versionOk; // flag that the template version loaded is the one we expect + static bool ms_allowDefaultTemplateParams; // flag to allow defaut params instead of fataling + + static void registerMe(void); + static ObjectTemplate * create(const std::string & filename); + + // no copying + SharedMissionListEntryObjectTemplate(const SharedMissionListEntryObjectTemplate &); + SharedMissionListEntryObjectTemplate & operator =(const SharedMissionListEntryObjectTemplate &); +}; + + +inline void SharedMissionListEntryObjectTemplate::install(bool allowDefaultTemplateParams) +{ + ms_allowDefaultTemplateParams = allowDefaultTemplateParams; +//@BEGIN TFD INSTALL + SharedMissionListEntryObjectTemplate::registerMe(); +//@END TFD INSTALL +} + + +#endif // _INCLUDED_SharedMissionListEntryObjectTemplate_H diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedMissionObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedMissionObjectTemplate.cpp old mode 100755 new mode 100644 index 29fbcc08..10eaba74 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedMissionObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedMissionObjectTemplate.cpp @@ -23,20 +23,20 @@ const std::string DefaultString(""); const StringId DefaultStringId("", 0); -const Vector DefaultVector(0, 0, 0); +const Vector DefaultVector(0,0,0); const TriggerVolumeData DefaultTriggerVolumeData; bool SharedMissionObjectTemplate::ms_allowDefaultTemplateParams = true; + /** * Class constructor. */ SharedMissionObjectTemplate::SharedMissionObjectTemplate(const std::string & filename) //@BEGIN TFD INIT : SharedIntangibleObjectTemplate(filename) - , m_versionOk(true) - , m_templateVersion(0) - //@END TFD INIT + ,m_versionOk(true) +//@END TFD INIT { } // SharedMissionObjectTemplate::SharedMissionObjectTemplate @@ -45,8 +45,8 @@ SharedMissionObjectTemplate::SharedMissionObjectTemplate(const std::string & fil */ SharedMissionObjectTemplate::~SharedMissionObjectTemplate() { - //@BEGIN TFD CLEANUP - //@END TFD CLEANUP +//@BEGIN TFD CLEANUP +//@END TFD CLEANUP } // SharedMissionObjectTemplate::~SharedMissionObjectTemplate /** @@ -103,6 +103,15 @@ Tag SharedMissionObjectTemplate::getHighestTemplateVersion(void) const } // SharedMissionObjectTemplate::getHighestTemplateVersion //@BEGIN TFD +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void SharedMissionObjectTemplate::testValues(void) const +{ + SharedIntangibleObjectTemplate::testValues(); +} // SharedMissionObjectTemplate::testValues +#endif /** * Loads the template data from an iff file. We should already be in the form @@ -112,8 +121,8 @@ Tag SharedMissionObjectTemplate::getHighestTemplateVersion(void) const */ void SharedMissionObjectTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != SharedMissionObjectTemplate_tag) { @@ -123,7 +132,7 @@ void SharedMissionObjectTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -143,8 +152,10 @@ void SharedMissionObjectTemplate::load(Iff &file) file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 0, 0)) + if (getHighestTemplateVersion() != TAG(0,0,0,0)) { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); m_versionOk = false; } @@ -162,4 +173,4 @@ void SharedMissionObjectTemplate::load(Iff &file) return; } // SharedMissionObjectTemplate::load -//@END TFD \ No newline at end of file +//@END TFD diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedMissionObjectTemplate.h b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedMissionObjectTemplate.h old mode 100755 new mode 100644 index 554ebadc..7830dc89 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedMissionObjectTemplate.h +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedMissionObjectTemplate.h @@ -45,6 +45,11 @@ public: //@BEGIN TFD public: +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedObjectTemplate.cpp old mode 100755 new mode 100644 index 4fa1374b..dc0fe57a --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedObjectTemplate.cpp @@ -33,7 +33,7 @@ const std::string DefaultString(""); const StringId DefaultStringId("", 0); -const Vector DefaultVector(0, 0, 0); +const Vector DefaultVector(0,0,0); const TriggerVolumeData DefaultTriggerVolumeData; bool SharedObjectTemplate::ms_allowDefaultTemplateParams = true; @@ -46,13 +46,13 @@ class SharedObjectTemplate::PreloadManager { public: - explicit PreloadManager(const SharedObjectTemplate* sharedObjectTemplate); - ~PreloadManager(); + explicit PreloadManager (const SharedObjectTemplate* sharedObjectTemplate); + ~PreloadManager (); private: - - PreloadManager(); - PreloadManager(const PreloadManager&); + + PreloadManager (); + PreloadManager (const PreloadManager&); PreloadManager& operator= (const PreloadManager&); private: @@ -63,40 +63,40 @@ private: // ---------------------------------------------------------------------- -SharedObjectTemplate::PreloadManager::PreloadManager(const SharedObjectTemplate* const sharedObjectTemplate) : - m_preloadAppearanceTemplate(0), - m_preloadPortalPropertyTemplate(0) +SharedObjectTemplate::PreloadManager::PreloadManager (const SharedObjectTemplate* const sharedObjectTemplate) : +m_preloadAppearanceTemplate (0), +m_preloadPortalPropertyTemplate (0) { NOT_NULL(sharedObjectTemplate); - const std::string& appearanceFileName = sharedObjectTemplate->getAppearanceFilename(); - if (!appearanceFileName.empty()) + const std::string& appearanceFileName = sharedObjectTemplate->getAppearanceFilename (); + if (!appearanceFileName.empty ()) { bool found = false; - m_preloadAppearanceTemplate = AppearanceTemplateList::fetch(appearanceFileName.c_str(), found); + m_preloadAppearanceTemplate = AppearanceTemplateList::fetch (appearanceFileName.c_str (), found); WARNING(!found, ("SharedObjectTemplate [%s] unable to load appearance [%s]", sharedObjectTemplate->getName(), appearanceFileName.c_str())); - m_preloadAppearanceTemplate->preloadAssets(); + m_preloadAppearanceTemplate->preloadAssets (); } - const std::string& portalLayoutFilename = sharedObjectTemplate->getPortalLayoutFilename(); - if (!portalLayoutFilename.empty()) + const std::string& portalLayoutFilename = sharedObjectTemplate->getPortalLayoutFilename (); + if (!portalLayoutFilename.empty ()) { - m_preloadPortalPropertyTemplate = PortalPropertyTemplateList::fetch(TemporaryCrcString(portalLayoutFilename.c_str(), true)); - m_preloadPortalPropertyTemplate->preloadAssets(); + m_preloadPortalPropertyTemplate = PortalPropertyTemplateList::fetch (TemporaryCrcString (portalLayoutFilename.c_str (), true)); + m_preloadPortalPropertyTemplate->preloadAssets (); } if (sharedObjectTemplate->m_clientData) - sharedObjectTemplate->m_clientData->preloadAssets(); + sharedObjectTemplate->m_clientData->preloadAssets (); } // ---------------------------------------------------------------------- -SharedObjectTemplate::PreloadManager::~PreloadManager() +SharedObjectTemplate::PreloadManager::~PreloadManager () { if (m_preloadAppearanceTemplate) - AppearanceTemplateList::release(m_preloadAppearanceTemplate); + AppearanceTemplateList::release (m_preloadAppearanceTemplate); if (m_preloadPortalPropertyTemplate) - m_preloadPortalPropertyTemplate->release(); + m_preloadPortalPropertyTemplate->release (); } // ====================================================================== @@ -107,13 +107,12 @@ SharedObjectTemplate::PreloadManager::~PreloadManager() SharedObjectTemplate::SharedObjectTemplate(const std::string & filename) //@BEGIN TFD INIT : ObjectTemplate(filename) - , m_versionOk(true) - , m_templateVersion(0) - //@END TFD INIT + ,m_versionOk(true) +//@END TFD INIT , m_slotDescriptor(nullptr) , m_arrangementDescriptor(nullptr) - , m_clientData(0) - , m_preloadManager(0) + , m_clientData (0) + , m_preloadManager (0) { } // SharedObjectTemplate::SharedObjectTemplate @@ -122,10 +121,10 @@ SharedObjectTemplate::SharedObjectTemplate(const std::string & filename) */ SharedObjectTemplate::~SharedObjectTemplate() { - //@BEGIN TFD CLEANUP - //@END TFD CLEANUP +//@BEGIN TFD CLEANUP +//@END TFD CLEANUP - //-- Release ArrangementDescriptor resource. + //-- Release ArrangementDescriptor resource. if (m_arrangementDescriptor) { m_arrangementDescriptor->release(); @@ -141,7 +140,7 @@ SharedObjectTemplate::~SharedObjectTemplate() //-- delete client data if (m_clientData) - m_clientData->releaseReference(); + m_clientData->releaseReference (); //-- delete preloadmanager if (m_preloadManager) @@ -185,17 +184,18 @@ ObjectTemplate * SharedObjectTemplate::create(const std::string & filename) return new SharedObjectTemplate(filename); } // SharedObjectTemplate::create -void SharedObjectTemplate::preloadAssets() const + +void SharedObjectTemplate::preloadAssets () const { - ObjectTemplate::preloadAssets(); + ObjectTemplate::preloadAssets (); if (!m_preloadManager) - m_preloadManager = new PreloadManager(this); + m_preloadManager = new PreloadManager (this); } -void SharedObjectTemplate::garbageCollect() const +void SharedObjectTemplate::garbageCollect () const { - ObjectTemplate::garbageCollect(); + ObjectTemplate::garbageCollect (); if (m_preloadManager) { @@ -204,6 +204,7 @@ void SharedObjectTemplate::garbageCollect() const } } + /** * Returns the template id. * @@ -257,20 +258,30 @@ void SharedObjectTemplate::postLoad(void) //-- load the client data file if (ms_createClientDataFunction) { - const std::string& clientDataFile = getClientDataFile(); + const std::string& clientDataFile = getClientDataFile (); - if (!clientDataFile.empty()) - m_clientData = ms_createClientDataFunction(clientDataFile.c_str()); + if (!clientDataFile.empty ()) + m_clientData = ms_createClientDataFunction (clientDataFile.c_str ()); } } // SharedObjectTemplate::postLoad //@BEGIN TFD -const StringId SharedObjectTemplate::getObjectName() const +const StringId SharedObjectTemplate::getObjectName(bool testData) const { +#ifdef _DEBUG +StringId testDataValue = DefaultStringId; +#else +UNREF(testData); +#endif + const SharedObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getObjectName(true); +#endif } if (!m_objectName.isLoaded()) @@ -288,16 +299,31 @@ const StringId SharedObjectTemplate::getObjectName() const } const StringId value = m_objectName.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedObjectTemplate::getObjectName -const StringId SharedObjectTemplate::getDetailedDescription() const +const StringId SharedObjectTemplate::getDetailedDescription(bool testData) const { +#ifdef _DEBUG +StringId testDataValue = DefaultStringId; +#else +UNREF(testData); +#endif + const SharedObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getDetailedDescription(true); +#endif } if (!m_detailedDescription.isLoaded()) @@ -315,16 +341,31 @@ const StringId SharedObjectTemplate::getDetailedDescription() const } const StringId value = m_detailedDescription.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedObjectTemplate::getDetailedDescription -const StringId SharedObjectTemplate::getLookAtText() const +const StringId SharedObjectTemplate::getLookAtText(bool testData) const { +#ifdef _DEBUG +StringId testDataValue = DefaultStringId; +#else +UNREF(testData); +#endif + const SharedObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getLookAtText(true); +#endif } if (!m_lookAtText.isLoaded()) @@ -342,16 +383,31 @@ const StringId SharedObjectTemplate::getLookAtText() const } const StringId value = m_lookAtText.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedObjectTemplate::getLookAtText -bool SharedObjectTemplate::getSnapToTerrain() const +bool SharedObjectTemplate::getSnapToTerrain(bool testData) const { +#ifdef _DEBUG +bool testDataValue = false; +#else +UNREF(testData); +#endif + const SharedObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getSnapToTerrain(true); +#endif } if (!m_snapToTerrain.isLoaded()) @@ -369,16 +425,31 @@ bool SharedObjectTemplate::getSnapToTerrain() const } bool value = m_snapToTerrain.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedObjectTemplate::getSnapToTerrain -SharedObjectTemplate::ContainerType SharedObjectTemplate::getContainerType() const +SharedObjectTemplate::ContainerType SharedObjectTemplate::getContainerType(bool testData) const { +#ifdef _DEBUG +SharedObjectTemplate::ContainerType testDataValue = static_cast(0); +#else +UNREF(testData); +#endif + const SharedObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getContainerType(true); +#endif } if (!m_containerType.isLoaded()) @@ -396,16 +467,31 @@ SharedObjectTemplate::ContainerType SharedObjectTemplate::getContainerType() con } ContainerType value = static_cast(m_containerType.getValue()); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedObjectTemplate::getContainerType -int SharedObjectTemplate::getContainerVolumeLimit() const +int SharedObjectTemplate::getContainerVolumeLimit(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const SharedObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getContainerVolumeLimit(true); +#endif } if (!m_containerVolumeLimit.isLoaded()) @@ -445,16 +531,31 @@ int SharedObjectTemplate::getContainerVolumeLimit() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedObjectTemplate::getContainerVolumeLimit -int SharedObjectTemplate::getContainerVolumeLimitMin() const +int SharedObjectTemplate::getContainerVolumeLimitMin(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const SharedObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getContainerVolumeLimitMin(true); +#endif } if (!m_containerVolumeLimit.isLoaded()) @@ -494,16 +595,31 @@ int SharedObjectTemplate::getContainerVolumeLimitMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedObjectTemplate::getContainerVolumeLimitMin -int SharedObjectTemplate::getContainerVolumeLimitMax() const +int SharedObjectTemplate::getContainerVolumeLimitMax(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const SharedObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getContainerVolumeLimitMax(true); +#endif } if (!m_containerVolumeLimit.isLoaded()) @@ -543,16 +659,31 @@ int SharedObjectTemplate::getContainerVolumeLimitMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedObjectTemplate::getContainerVolumeLimitMax -const std::string & SharedObjectTemplate::getTintPalette() const +const std::string & SharedObjectTemplate::getTintPalette(bool testData) const { +#ifdef _DEBUG +std::string testDataValue = DefaultString; +#else +UNREF(testData); +#endif + const SharedObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getTintPalette(true); +#endif } if (!m_tintPalette.isLoaded()) @@ -570,16 +701,31 @@ const std::string & SharedObjectTemplate::getTintPalette() const } const std::string & value = m_tintPalette.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedObjectTemplate::getTintPalette -const std::string & SharedObjectTemplate::getSlotDescriptorFilename() const +const std::string & SharedObjectTemplate::getSlotDescriptorFilename(bool testData) const { +#ifdef _DEBUG +std::string testDataValue = DefaultString; +#else +UNREF(testData); +#endif + const SharedObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getSlotDescriptorFilename(true); +#endif } if (!m_slotDescriptorFilename.isLoaded()) @@ -597,16 +743,31 @@ const std::string & SharedObjectTemplate::getSlotDescriptorFilename() const } const std::string & value = m_slotDescriptorFilename.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedObjectTemplate::getSlotDescriptorFilename -const std::string & SharedObjectTemplate::getArrangementDescriptorFilename() const +const std::string & SharedObjectTemplate::getArrangementDescriptorFilename(bool testData) const { +#ifdef _DEBUG +std::string testDataValue = DefaultString; +#else +UNREF(testData); +#endif + const SharedObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getArrangementDescriptorFilename(true); +#endif } if (!m_arrangementDescriptorFilename.isLoaded()) @@ -624,16 +785,31 @@ const std::string & SharedObjectTemplate::getArrangementDescriptorFilename() con } const std::string & value = m_arrangementDescriptorFilename.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedObjectTemplate::getArrangementDescriptorFilename -const std::string & SharedObjectTemplate::getAppearanceFilename() const +const std::string & SharedObjectTemplate::getAppearanceFilename(bool testData) const { +#ifdef _DEBUG +std::string testDataValue = DefaultString; +#else +UNREF(testData); +#endif + const SharedObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getAppearanceFilename(true); +#endif } if (!m_appearanceFilename.isLoaded()) @@ -651,16 +827,31 @@ const std::string & SharedObjectTemplate::getAppearanceFilename() const } const std::string & value = m_appearanceFilename.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedObjectTemplate::getAppearanceFilename -const std::string & SharedObjectTemplate::getPortalLayoutFilename() const +const std::string & SharedObjectTemplate::getPortalLayoutFilename(bool testData) const { +#ifdef _DEBUG +std::string testDataValue = DefaultString; +#else +UNREF(testData); +#endif + const SharedObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getPortalLayoutFilename(true); +#endif } if (!m_portalLayoutFilename.isLoaded()) @@ -678,16 +869,31 @@ const std::string & SharedObjectTemplate::getPortalLayoutFilename() const } const std::string & value = m_portalLayoutFilename.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedObjectTemplate::getPortalLayoutFilename -const std::string & SharedObjectTemplate::getClientDataFile() const +const std::string & SharedObjectTemplate::getClientDataFile(bool testData) const { +#ifdef _DEBUG +std::string testDataValue = DefaultString; +#else +UNREF(testData); +#endif + const SharedObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getClientDataFile(true); +#endif } if (!m_clientDataFile.isLoaded()) @@ -705,16 +911,31 @@ const std::string & SharedObjectTemplate::getClientDataFile() const } const std::string & value = m_clientDataFile.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedObjectTemplate::getClientDataFile -float SharedObjectTemplate::getScale() const +float SharedObjectTemplate::getScale(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getScale(true); +#endif } if (!m_scale.isLoaded()) @@ -754,16 +975,31 @@ float SharedObjectTemplate::getScale() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedObjectTemplate::getScale -float SharedObjectTemplate::getScaleMin() const +float SharedObjectTemplate::getScaleMin(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getScaleMin(true); +#endif } if (!m_scale.isLoaded()) @@ -803,16 +1039,31 @@ float SharedObjectTemplate::getScaleMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedObjectTemplate::getScaleMin -float SharedObjectTemplate::getScaleMax() const +float SharedObjectTemplate::getScaleMax(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getScaleMax(true); +#endif } if (!m_scale.isLoaded()) @@ -852,16 +1103,31 @@ float SharedObjectTemplate::getScaleMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedObjectTemplate::getScaleMax -SharedObjectTemplate::GameObjectType SharedObjectTemplate::getGameObjectType() const +SharedObjectTemplate::GameObjectType SharedObjectTemplate::getGameObjectType(bool testData) const { +#ifdef _DEBUG +SharedObjectTemplate::GameObjectType testDataValue = static_cast(0); +#else +UNREF(testData); +#endif + const SharedObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getGameObjectType(true); +#endif } if (!m_gameObjectType.isLoaded()) @@ -879,16 +1145,31 @@ SharedObjectTemplate::GameObjectType SharedObjectTemplate::getGameObjectType() c } GameObjectType value = static_cast(m_gameObjectType.getValue()); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedObjectTemplate::getGameObjectType -bool SharedObjectTemplate::getSendToClient() const +bool SharedObjectTemplate::getSendToClient(bool testData) const { +#ifdef _DEBUG +bool testDataValue = false; +#else +UNREF(testData); +#endif + const SharedObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getSendToClient(true); +#endif } if (!m_sendToClient.isLoaded()) @@ -906,16 +1187,31 @@ bool SharedObjectTemplate::getSendToClient() const } bool value = m_sendToClient.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedObjectTemplate::getSendToClient -float SharedObjectTemplate::getScaleThresholdBeforeExtentTest() const +float SharedObjectTemplate::getScaleThresholdBeforeExtentTest(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getScaleThresholdBeforeExtentTest(true); +#endif } if (!m_scaleThresholdBeforeExtentTest.isLoaded()) @@ -955,16 +1251,31 @@ float SharedObjectTemplate::getScaleThresholdBeforeExtentTest() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedObjectTemplate::getScaleThresholdBeforeExtentTest -float SharedObjectTemplate::getScaleThresholdBeforeExtentTestMin() const +float SharedObjectTemplate::getScaleThresholdBeforeExtentTestMin(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getScaleThresholdBeforeExtentTestMin(true); +#endif } if (!m_scaleThresholdBeforeExtentTest.isLoaded()) @@ -1004,16 +1315,31 @@ float SharedObjectTemplate::getScaleThresholdBeforeExtentTestMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedObjectTemplate::getScaleThresholdBeforeExtentTestMin -float SharedObjectTemplate::getScaleThresholdBeforeExtentTestMax() const +float SharedObjectTemplate::getScaleThresholdBeforeExtentTestMax(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getScaleThresholdBeforeExtentTestMax(true); +#endif } if (!m_scaleThresholdBeforeExtentTest.isLoaded()) @@ -1053,16 +1379,31 @@ float SharedObjectTemplate::getScaleThresholdBeforeExtentTestMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedObjectTemplate::getScaleThresholdBeforeExtentTestMax -float SharedObjectTemplate::getClearFloraRadius() const +float SharedObjectTemplate::getClearFloraRadius(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getClearFloraRadius(true); +#endif } if (!m_clearFloraRadius.isLoaded()) @@ -1102,16 +1443,31 @@ float SharedObjectTemplate::getClearFloraRadius() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedObjectTemplate::getClearFloraRadius -float SharedObjectTemplate::getClearFloraRadiusMin() const +float SharedObjectTemplate::getClearFloraRadiusMin(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getClearFloraRadiusMin(true); +#endif } if (!m_clearFloraRadius.isLoaded()) @@ -1151,16 +1507,31 @@ float SharedObjectTemplate::getClearFloraRadiusMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedObjectTemplate::getClearFloraRadiusMin -float SharedObjectTemplate::getClearFloraRadiusMax() const +float SharedObjectTemplate::getClearFloraRadiusMax(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getClearFloraRadiusMax(true); +#endif } if (!m_clearFloraRadius.isLoaded()) @@ -1200,16 +1571,31 @@ float SharedObjectTemplate::getClearFloraRadiusMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedObjectTemplate::getClearFloraRadiusMax -SharedObjectTemplate::SurfaceType SharedObjectTemplate::getSurfaceType() const +SharedObjectTemplate::SurfaceType SharedObjectTemplate::getSurfaceType(bool testData) const { +#ifdef _DEBUG +SharedObjectTemplate::SurfaceType testDataValue = static_cast(0); +#else +UNREF(testData); +#endif + const SharedObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getSurfaceType(true); +#endif } if (!m_surfaceType.isLoaded()) @@ -1227,16 +1613,31 @@ SharedObjectTemplate::SurfaceType SharedObjectTemplate::getSurfaceType() const } SurfaceType value = static_cast(m_surfaceType.getValue()); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedObjectTemplate::getSurfaceType -float SharedObjectTemplate::getNoBuildRadius() const +float SharedObjectTemplate::getNoBuildRadius(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getNoBuildRadius(true); +#endif } if (!m_noBuildRadius.isLoaded()) @@ -1276,16 +1677,31 @@ float SharedObjectTemplate::getNoBuildRadius() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedObjectTemplate::getNoBuildRadius -float SharedObjectTemplate::getNoBuildRadiusMin() const +float SharedObjectTemplate::getNoBuildRadiusMin(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getNoBuildRadiusMin(true); +#endif } if (!m_noBuildRadius.isLoaded()) @@ -1325,16 +1741,31 @@ float SharedObjectTemplate::getNoBuildRadiusMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedObjectTemplate::getNoBuildRadiusMin -float SharedObjectTemplate::getNoBuildRadiusMax() const +float SharedObjectTemplate::getNoBuildRadiusMax(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getNoBuildRadiusMax(true); +#endif } if (!m_noBuildRadius.isLoaded()) @@ -1374,16 +1805,31 @@ float SharedObjectTemplate::getNoBuildRadiusMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedObjectTemplate::getNoBuildRadiusMax -bool SharedObjectTemplate::getOnlyVisibleInTools() const +bool SharedObjectTemplate::getOnlyVisibleInTools(bool testData) const { +#ifdef _DEBUG +bool testDataValue = false; +#else +UNREF(testData); +#endif + const SharedObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getOnlyVisibleInTools(true); +#endif } if (!m_onlyVisibleInTools.isLoaded()) @@ -1401,16 +1847,31 @@ bool SharedObjectTemplate::getOnlyVisibleInTools() const } bool value = m_onlyVisibleInTools.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedObjectTemplate::getOnlyVisibleInTools -float SharedObjectTemplate::getLocationReservationRadius() const +float SharedObjectTemplate::getLocationReservationRadius(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getLocationReservationRadius(true); +#endif } if (!m_locationReservationRadius.isLoaded()) @@ -1450,16 +1911,31 @@ float SharedObjectTemplate::getLocationReservationRadius() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedObjectTemplate::getLocationReservationRadius -float SharedObjectTemplate::getLocationReservationRadiusMin() const +float SharedObjectTemplate::getLocationReservationRadiusMin(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getLocationReservationRadiusMin(true); +#endif } if (!m_locationReservationRadius.isLoaded()) @@ -1499,16 +1975,31 @@ float SharedObjectTemplate::getLocationReservationRadiusMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedObjectTemplate::getLocationReservationRadiusMin -float SharedObjectTemplate::getLocationReservationRadiusMax() const +float SharedObjectTemplate::getLocationReservationRadiusMax(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getLocationReservationRadiusMax(true); +#endif } if (!m_locationReservationRadius.isLoaded()) @@ -1548,16 +2039,31 @@ float SharedObjectTemplate::getLocationReservationRadiusMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedObjectTemplate::getLocationReservationRadiusMax -bool SharedObjectTemplate::getForceNoCollision() const +bool SharedObjectTemplate::getForceNoCollision(bool testData) const { +#ifdef _DEBUG +bool testDataValue = false; +#else +UNREF(testData); +#endif + const SharedObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getForceNoCollision(true); +#endif } if (!m_forceNoCollision.isLoaded()) @@ -1575,10 +2081,52 @@ bool SharedObjectTemplate::getForceNoCollision() const } bool value = m_forceNoCollision.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedObjectTemplate::getForceNoCollision +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void SharedObjectTemplate::testValues(void) const +{ + IGNORE_RETURN(getObjectName(true)); + IGNORE_RETURN(getDetailedDescription(true)); + IGNORE_RETURN(getLookAtText(true)); + IGNORE_RETURN(getSnapToTerrain(true)); + IGNORE_RETURN(getContainerType(true)); + IGNORE_RETURN(getContainerVolumeLimitMin(true)); + IGNORE_RETURN(getContainerVolumeLimitMax(true)); + IGNORE_RETURN(getTintPalette(true)); + IGNORE_RETURN(getSlotDescriptorFilename(true)); + IGNORE_RETURN(getArrangementDescriptorFilename(true)); + IGNORE_RETURN(getAppearanceFilename(true)); + IGNORE_RETURN(getPortalLayoutFilename(true)); + IGNORE_RETURN(getClientDataFile(true)); + IGNORE_RETURN(getScaleMin(true)); + IGNORE_RETURN(getScaleMax(true)); + IGNORE_RETURN(getGameObjectType(true)); + IGNORE_RETURN(getSendToClient(true)); + IGNORE_RETURN(getScaleThresholdBeforeExtentTestMin(true)); + IGNORE_RETURN(getScaleThresholdBeforeExtentTestMax(true)); + IGNORE_RETURN(getClearFloraRadiusMin(true)); + IGNORE_RETURN(getClearFloraRadiusMax(true)); + IGNORE_RETURN(getSurfaceType(true)); + IGNORE_RETURN(getNoBuildRadiusMin(true)); + IGNORE_RETURN(getNoBuildRadiusMax(true)); + IGNORE_RETURN(getOnlyVisibleInTools(true)); + IGNORE_RETURN(getLocationReservationRadiusMin(true)); + IGNORE_RETURN(getLocationReservationRadiusMax(true)); + IGNORE_RETURN(getForceNoCollision(true)); +} // SharedObjectTemplate::testValues +#endif + /** * Loads the template data from an iff file. We should already be in the form * for this template. @@ -1587,8 +2135,8 @@ bool SharedObjectTemplate::getForceNoCollision() const */ void SharedObjectTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != SharedObjectTemplate_tag) { @@ -1597,7 +2145,7 @@ void SharedObjectTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -1617,8 +2165,10 @@ void SharedObjectTemplate::load(Iff &file) file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 1, 0)) + if (getHighestTemplateVersion() != TAG(0,0,1,0)) { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); m_versionOk = false; } @@ -1688,7 +2238,7 @@ void SharedObjectTemplate::load(Iff &file) // PUBLIC STATIC SharedObjectTemplate //=================================================================== -void SharedObjectTemplate::setCreateClientDataFunction(SharedObjectTemplate::CreateClientDataFunction createClientDataFunction) +void SharedObjectTemplate::setCreateClientDataFunction (SharedObjectTemplate::CreateClientDataFunction createClientDataFunction) { ms_createClientDataFunction = createClientDataFunction; } @@ -1697,7 +2247,7 @@ void SharedObjectTemplate::setCreateClientDataFunction(SharedObjectTemplate::Cre // PUBLIC SharedObjectTemplate //=================================================================== -const SharedObjectTemplateClientData* SharedObjectTemplate::getClientData() const +const SharedObjectTemplateClientData* SharedObjectTemplate::getClientData () const { return m_clientData; } @@ -1708,4 +2258,4 @@ const SharedObjectTemplateClientData* SharedObjectTemplate::getClientData() cons SharedObjectTemplate::CreateClientDataFunction SharedObjectTemplate::ms_createClientDataFunction; -//=================================================================== \ No newline at end of file +//=================================================================== diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedObjectTemplate.h b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedObjectTemplate.h old mode 100755 new mode 100644 index 6eecadac..5fc7686f --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedObjectTemplate.h +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedObjectTemplate.h @@ -339,41 +339,46 @@ public: }; public: - const StringId getObjectName() const; - const StringId getDetailedDescription() const; - const StringId getLookAtText() const; - bool getSnapToTerrain() const; - ContainerType getContainerType() const; - int getContainerVolumeLimit() const; - int getContainerVolumeLimitMin() const; - int getContainerVolumeLimitMax() const; - const std::string & getTintPalette() const; - const std::string & getSlotDescriptorFilename() const; - const std::string & getArrangementDescriptorFilename() const; - const std::string & getAppearanceFilename() const; - const std::string & getPortalLayoutFilename() const; - const std::string & getClientDataFile() const; - float getScale() const; - float getScaleMin() const; - float getScaleMax() const; - GameObjectType getGameObjectType() const; - bool getSendToClient() const; - float getScaleThresholdBeforeExtentTest() const; - float getScaleThresholdBeforeExtentTestMin() const; - float getScaleThresholdBeforeExtentTestMax() const; - float getClearFloraRadius() const; - float getClearFloraRadiusMin() const; - float getClearFloraRadiusMax() const; - SurfaceType getSurfaceType() const; - float getNoBuildRadius() const; - float getNoBuildRadiusMin() const; - float getNoBuildRadiusMax() const; - bool getOnlyVisibleInTools() const; - float getLocationReservationRadius() const; - float getLocationReservationRadiusMin() const; - float getLocationReservationRadiusMax() const; - bool getForceNoCollision() const; + const StringId getObjectName(bool testData = false) const; + const StringId getDetailedDescription(bool testData = false) const; + const StringId getLookAtText(bool testData = false) const; + bool getSnapToTerrain(bool testData = false) const; + ContainerType getContainerType(bool testData = false) const; + int getContainerVolumeLimit(bool testData = false) const; + int getContainerVolumeLimitMin(bool testData = false) const; + int getContainerVolumeLimitMax(bool testData = false) const; + const std::string & getTintPalette(bool testData = false) const; + const std::string & getSlotDescriptorFilename(bool testData = false) const; + const std::string & getArrangementDescriptorFilename(bool testData = false) const; + const std::string & getAppearanceFilename(bool testData = false) const; + const std::string & getPortalLayoutFilename(bool testData = false) const; + const std::string & getClientDataFile(bool testData = false) const; + float getScale(bool testData = false) const; + float getScaleMin(bool testData = false) const; + float getScaleMax(bool testData = false) const; + GameObjectType getGameObjectType(bool testData = false) const; + bool getSendToClient(bool testData = false) const; + float getScaleThresholdBeforeExtentTest(bool testData = false) const; + float getScaleThresholdBeforeExtentTestMin(bool testData = false) const; + float getScaleThresholdBeforeExtentTestMax(bool testData = false) const; + float getClearFloraRadius(bool testData = false) const; + float getClearFloraRadiusMin(bool testData = false) const; + float getClearFloraRadiusMax(bool testData = false) const; + SurfaceType getSurfaceType(bool testData = false) const; + float getNoBuildRadius(bool testData = false) const; + float getNoBuildRadiusMin(bool testData = false) const; + float getNoBuildRadiusMax(bool testData = false) const; + bool getOnlyVisibleInTools(bool testData = false) const; + float getLocationReservationRadius(bool testData = false) const; + float getLocationReservationRadiusMin(bool testData = false) const; + float getLocationReservationRadiusMax(bool testData = false) const; + bool getForceNoCollision(bool testData = false) const; +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedPlayerObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedPlayerObjectTemplate.cpp old mode 100755 new mode 100644 index 0d49d170..7d020a59 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedPlayerObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedPlayerObjectTemplate.cpp @@ -12,7 +12,7 @@ #include "sharedGame/FirstSharedGame.h" #include "SharedPlayerObjectTemplate.h" - +#include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedMath/Vector.h" #include "sharedObject/ObjectTemplate.h" @@ -24,20 +24,20 @@ const std::string DefaultString(""); const StringId DefaultStringId("", 0); -const Vector DefaultVector(0, 0, 0); +const Vector DefaultVector(0,0,0); const TriggerVolumeData DefaultTriggerVolumeData; bool SharedPlayerObjectTemplate::ms_allowDefaultTemplateParams = true; + /** * Class constructor. */ SharedPlayerObjectTemplate::SharedPlayerObjectTemplate(const std::string & filename) //@BEGIN TFD INIT : SharedIntangibleObjectTemplate(filename) - , m_versionOk(true) - , m_templateVersion(0) - //@END TFD INIT + ,m_versionOk(true) +//@END TFD INIT { } // SharedPlayerObjectTemplate::SharedPlayerObjectTemplate @@ -46,8 +46,8 @@ SharedPlayerObjectTemplate::SharedPlayerObjectTemplate(const std::string & filen */ SharedPlayerObjectTemplate::~SharedPlayerObjectTemplate() { - //@BEGIN TFD CLEANUP - //@END TFD CLEANUP +//@BEGIN TFD CLEANUP +//@END TFD CLEANUP } // SharedPlayerObjectTemplate::~SharedPlayerObjectTemplate /** @@ -104,6 +104,15 @@ Tag SharedPlayerObjectTemplate::getHighestTemplateVersion(void) const } // SharedPlayerObjectTemplate::getHighestTemplateVersion //@BEGIN TFD +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void SharedPlayerObjectTemplate::testValues(void) const +{ + SharedIntangibleObjectTemplate::testValues(); +} // SharedPlayerObjectTemplate::testValues +#endif /** * Loads the template data from an iff file. We should already be in the form @@ -113,8 +122,8 @@ Tag SharedPlayerObjectTemplate::getHighestTemplateVersion(void) const */ void SharedPlayerObjectTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != SharedPlayerObjectTemplate_tag) { @@ -124,7 +133,7 @@ void SharedPlayerObjectTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -144,8 +153,10 @@ void SharedPlayerObjectTemplate::load(Iff &file) file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 0, 0)) + if (getHighestTemplateVersion() != TAG(0,0,0,0)) { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); m_versionOk = false; } @@ -163,4 +174,4 @@ void SharedPlayerObjectTemplate::load(Iff &file) return; } // SharedPlayerObjectTemplate::load -//@END TFD \ No newline at end of file +//@END TFD diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedPlayerObjectTemplate.h b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedPlayerObjectTemplate.h old mode 100755 new mode 100644 index 187e83b4..5b64f2f8 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedPlayerObjectTemplate.h +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedPlayerObjectTemplate.h @@ -45,6 +45,11 @@ public: //@BEGIN TFD public: +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedPlayerQuestObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedPlayerQuestObjectTemplate.cpp old mode 100755 new mode 100644 index 9f7b24d9..26380963 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedPlayerQuestObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedPlayerQuestObjectTemplate.cpp @@ -12,7 +12,7 @@ #include "sharedGame/FirstSharedGame.h" #include "SharedPlayerQuestObjectTemplate.h" - +#include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedMath/Vector.h" #include "sharedObject/ObjectTemplate.h" @@ -24,20 +24,20 @@ const std::string DefaultString(""); const StringId DefaultStringId("", 0); -const Vector DefaultVector(0, 0, 0); +const Vector DefaultVector(0,0,0); const TriggerVolumeData DefaultTriggerVolumeData; bool SharedPlayerQuestObjectTemplate::ms_allowDefaultTemplateParams = true; + /** * Class constructor. */ SharedPlayerQuestObjectTemplate::SharedPlayerQuestObjectTemplate(const std::string & filename) //@BEGIN TFD INIT : SharedTangibleObjectTemplate(filename) - , m_versionOk(true) - , m_templateVersion(0) - //@END TFD INIT + ,m_versionOk(true) +//@END TFD INIT { } // SharedPlayerQuestObjectTemplate::SharedPlayerQuestObjectTemplate @@ -46,8 +46,8 @@ SharedPlayerQuestObjectTemplate::SharedPlayerQuestObjectTemplate(const std::stri */ SharedPlayerQuestObjectTemplate::~SharedPlayerQuestObjectTemplate() { - //@BEGIN TFD CLEANUP - //@END TFD CLEANUP +//@BEGIN TFD CLEANUP +//@END TFD CLEANUP } // SharedPlayerQuestObjectTemplate::~SharedPlayerQuestObjectTemplate /** @@ -104,6 +104,15 @@ Tag SharedPlayerQuestObjectTemplate::getHighestTemplateVersion(void) const } // SharedPlayerQuestObjectTemplate::getHighestTemplateVersion //@BEGIN TFD +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void SharedPlayerQuestObjectTemplate::testValues(void) const +{ + SharedTangibleObjectTemplate::testValues(); +} // SharedPlayerQuestObjectTemplate::testValues +#endif /** * Loads the template data from an iff file. We should already be in the form @@ -113,8 +122,8 @@ Tag SharedPlayerQuestObjectTemplate::getHighestTemplateVersion(void) const */ void SharedPlayerQuestObjectTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != SharedPlayerQuestObjectTemplate_tag) { @@ -124,7 +133,7 @@ void SharedPlayerQuestObjectTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -144,8 +153,10 @@ void SharedPlayerQuestObjectTemplate::load(Iff &file) file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 0, 0)) + if (getHighestTemplateVersion() != TAG(0,0,0,0)) { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); m_versionOk = false; } @@ -163,4 +174,4 @@ void SharedPlayerQuestObjectTemplate::load(Iff &file) return; } // SharedPlayerQuestObjectTemplate::load -//@END TFD \ No newline at end of file +//@END TFD diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedPlayerQuestObjectTemplate.h b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedPlayerQuestObjectTemplate.h old mode 100755 new mode 100644 index c6b45a38..e5c9260c --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedPlayerQuestObjectTemplate.h +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedPlayerQuestObjectTemplate.h @@ -45,6 +45,11 @@ public: //@BEGIN TFD public: +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedResourceContainerObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedResourceContainerObjectTemplate.cpp old mode 100755 new mode 100644 index 70dde24a..dbb0635d --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedResourceContainerObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedResourceContainerObjectTemplate.cpp @@ -23,20 +23,20 @@ const std::string DefaultString(""); const StringId DefaultStringId("", 0); -const Vector DefaultVector(0, 0, 0); +const Vector DefaultVector(0,0,0); const TriggerVolumeData DefaultTriggerVolumeData; bool SharedResourceContainerObjectTemplate::ms_allowDefaultTemplateParams = true; + /** * Class constructor. */ SharedResourceContainerObjectTemplate::SharedResourceContainerObjectTemplate(const std::string & filename) //@BEGIN TFD INIT : SharedTangibleObjectTemplate(filename) - , m_versionOk(true) - , m_templateVersion(0) - //@END TFD INIT + ,m_versionOk(true) +//@END TFD INIT { } // SharedResourceContainerObjectTemplate::SharedResourceContainerObjectTemplate @@ -45,8 +45,8 @@ SharedResourceContainerObjectTemplate::SharedResourceContainerObjectTemplate(con */ SharedResourceContainerObjectTemplate::~SharedResourceContainerObjectTemplate() { - //@BEGIN TFD CLEANUP - //@END TFD CLEANUP +//@BEGIN TFD CLEANUP +//@END TFD CLEANUP } // SharedResourceContainerObjectTemplate::~SharedResourceContainerObjectTemplate /** @@ -103,6 +103,15 @@ Tag SharedResourceContainerObjectTemplate::getHighestTemplateVersion(void) const } // SharedResourceContainerObjectTemplate::getHighestTemplateVersion //@BEGIN TFD +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void SharedResourceContainerObjectTemplate::testValues(void) const +{ + SharedTangibleObjectTemplate::testValues(); +} // SharedResourceContainerObjectTemplate::testValues +#endif /** * Loads the template data from an iff file. We should already be in the form @@ -112,8 +121,8 @@ Tag SharedResourceContainerObjectTemplate::getHighestTemplateVersion(void) const */ void SharedResourceContainerObjectTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != SharedResourceContainerObjectTemplate_tag) { @@ -123,7 +132,7 @@ void SharedResourceContainerObjectTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -143,8 +152,10 @@ void SharedResourceContainerObjectTemplate::load(Iff &file) file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 0, 0)) + if (getHighestTemplateVersion() != TAG(0,0,0,0)) { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); m_versionOk = false; } @@ -162,4 +173,4 @@ void SharedResourceContainerObjectTemplate::load(Iff &file) return; } // SharedResourceContainerObjectTemplate::load -//@END TFD \ No newline at end of file +//@END TFD diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedResourceContainerObjectTemplate.h b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedResourceContainerObjectTemplate.h old mode 100755 new mode 100644 index 19f45dd7..86067879 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedResourceContainerObjectTemplate.h +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedResourceContainerObjectTemplate.h @@ -45,6 +45,11 @@ public: //@BEGIN TFD public: +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedShipObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedShipObjectTemplate.cpp old mode 100755 new mode 100644 index 7a22a942..e374302c --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedShipObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedShipObjectTemplate.cpp @@ -13,6 +13,7 @@ #include "sharedGame/FirstSharedGame.h" #include "sharedGame/SharedShipObjectTemplate.h" +#include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedGame/AssetCustomizationManager.h" #include "sharedMath/Vector.h" @@ -29,20 +30,20 @@ const std::string DefaultString(""); const StringId DefaultStringId("", 0); -const Vector DefaultVector(0, 0, 0); +const Vector DefaultVector(0,0,0); const TriggerVolumeData DefaultTriggerVolumeData; bool SharedShipObjectTemplate::ms_allowDefaultTemplateParams = true; + /** * Class constructor. */ SharedShipObjectTemplate::SharedShipObjectTemplate(const std::string & filename) //@BEGIN TFD INIT : SharedTangibleObjectTemplate(filename) - , m_versionOk(true) - , m_templateVersion(0) - //@END TFD INIT + ,m_versionOk(true) +//@END TFD INIT { } // SharedShipObjectTemplate::SharedShipObjectTemplate @@ -51,8 +52,8 @@ SharedShipObjectTemplate::SharedShipObjectTemplate(const std::string & filename) */ SharedShipObjectTemplate::~SharedShipObjectTemplate() { - //@BEGIN TFD CLEANUP - //@END TFD CLEANUP +//@BEGIN TFD CLEANUP +//@END TFD CLEANUP } // SharedShipObjectTemplate::~SharedShipObjectTemplate /** @@ -128,16 +129,16 @@ void SharedShipObjectTemplate::createCustomizationDataPropertyAsNeeded(Object &o // variables since we are a creature. The SharedTangibleObjectTemplate version of // this function sets it to true. bool const skipSharedOwnerVariables = false; - const std::string & appearanceFilename = getAppearanceFilename(); - if (!appearanceFilename.empty()) - { + const std::string & appearanceFilename = getAppearanceFilename(); + if(!appearanceFilename.empty()) + { AssetCustomizationManager::addCustomizationVariablesForAsset(TemporaryCrcString(appearanceFilename.c_str(), true), *customizationData, skipSharedOwnerVariables); } else { //Perhaps it's a POB ship, check the portalLayoutFilename const std::string & portalLayoutFilename = getPortalLayoutFilename(); - AssetCustomizationManager::addCustomizationVariablesForAsset(TemporaryCrcString(portalLayoutFilename.c_str(), true), *customizationData, skipSharedOwnerVariables); + AssetCustomizationManager::addCustomizationVariablesForAsset(TemporaryCrcString(portalLayoutFilename.c_str(), true), *customizationData, skipSharedOwnerVariables); } //-- release local reference to the CustomizationData instance @@ -146,12 +147,22 @@ void SharedShipObjectTemplate::createCustomizationDataPropertyAsNeeded(Object &o } //@BEGIN TFD -const std::string & SharedShipObjectTemplate::getCockpitFilename() const +const std::string & SharedShipObjectTemplate::getCockpitFilename(bool testData) const { +#ifdef _DEBUG +std::string testDataValue = DefaultString; +#else +UNREF(testData); +#endif + const SharedShipObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getCockpitFilename(true); +#endif } if (!m_cockpitFilename.isLoaded()) @@ -169,16 +180,31 @@ const std::string & SharedShipObjectTemplate::getCockpitFilename() const } const std::string & value = m_cockpitFilename.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedShipObjectTemplate::getCockpitFilename -bool SharedShipObjectTemplate::getHasWings() const +bool SharedShipObjectTemplate::getHasWings(bool testData) const { +#ifdef _DEBUG +bool testDataValue = false; +#else +UNREF(testData); +#endif + const SharedShipObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getHasWings(true); +#endif } if (!m_hasWings.isLoaded()) @@ -196,16 +222,31 @@ bool SharedShipObjectTemplate::getHasWings() const } bool value = m_hasWings.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedShipObjectTemplate::getHasWings -bool SharedShipObjectTemplate::getPlayerControlled() const +bool SharedShipObjectTemplate::getPlayerControlled(bool testData) const { +#ifdef _DEBUG +bool testDataValue = false; +#else +UNREF(testData); +#endif + const SharedShipObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getPlayerControlled(true); +#endif } if (!m_playerControlled.isLoaded()) @@ -223,16 +264,31 @@ bool SharedShipObjectTemplate::getPlayerControlled() const } bool value = m_playerControlled.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedShipObjectTemplate::getPlayerControlled -const std::string & SharedShipObjectTemplate::getInteriorLayoutFileName() const +const std::string & SharedShipObjectTemplate::getInteriorLayoutFileName(bool testData) const { +#ifdef _DEBUG +std::string testDataValue = DefaultString; +#else +UNREF(testData); +#endif + const SharedShipObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getInteriorLayoutFileName(true); +#endif } if (!m_interiorLayoutFileName.isLoaded()) @@ -250,10 +306,29 @@ const std::string & SharedShipObjectTemplate::getInteriorLayoutFileName() const } const std::string & value = m_interiorLayoutFileName.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedShipObjectTemplate::getInteriorLayoutFileName +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void SharedShipObjectTemplate::testValues(void) const +{ + IGNORE_RETURN(getCockpitFilename(true)); + IGNORE_RETURN(getHasWings(true)); + IGNORE_RETURN(getPlayerControlled(true)); + IGNORE_RETURN(getInteriorLayoutFileName(true)); + SharedTangibleObjectTemplate::testValues(); +} // SharedShipObjectTemplate::testValues +#endif + /** * Loads the template data from an iff file. We should already be in the form * for this template. @@ -262,8 +337,8 @@ const std::string & SharedShipObjectTemplate::getInteriorLayoutFileName() const */ void SharedShipObjectTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != SharedShipObjectTemplate_tag) { @@ -273,7 +348,7 @@ void SharedShipObjectTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -293,8 +368,10 @@ void SharedShipObjectTemplate::load(Iff &file) file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 0, 4)) + if (getHighestTemplateVersion() != TAG(0,0,0,4)) { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); m_versionOk = false; } @@ -324,4 +401,4 @@ void SharedShipObjectTemplate::load(Iff &file) return; } // SharedShipObjectTemplate::load -//@END TFD \ No newline at end of file +//@END TFD diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedShipObjectTemplate.h b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedShipObjectTemplate.h old mode 100755 new mode 100644 index d5621428..abbdb08e --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedShipObjectTemplate.h +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedShipObjectTemplate.h @@ -45,11 +45,16 @@ public: //@BEGIN TFD public: - const std::string & getCockpitFilename() const; - bool getHasWings() const; - bool getPlayerControlled() const; - const std::string & getInteriorLayoutFileName() const; + const std::string & getCockpitFilename(bool testData = false) const; + bool getHasWings(bool testData = false) const; + bool getPlayerControlled(bool testData = false) const; + const std::string & getInteriorLayoutFileName(bool testData = false) const; +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedStaticObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedStaticObjectTemplate.cpp old mode 100755 new mode 100644 index b00c7729..3de71cf2 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedStaticObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedStaticObjectTemplate.cpp @@ -23,20 +23,20 @@ const std::string DefaultString(""); const StringId DefaultStringId("", 0); -const Vector DefaultVector(0, 0, 0); +const Vector DefaultVector(0,0,0); const TriggerVolumeData DefaultTriggerVolumeData; bool SharedStaticObjectTemplate::ms_allowDefaultTemplateParams = true; + /** * Class constructor. */ SharedStaticObjectTemplate::SharedStaticObjectTemplate(const std::string & filename) //@BEGIN TFD INIT : SharedObjectTemplate(filename) - , m_versionOk(true) - , m_templateVersion(0) - //@END TFD INIT + ,m_versionOk(true) +//@END TFD INIT { } // SharedStaticObjectTemplate::SharedStaticObjectTemplate @@ -45,8 +45,8 @@ SharedStaticObjectTemplate::SharedStaticObjectTemplate(const std::string & filen */ SharedStaticObjectTemplate::~SharedStaticObjectTemplate() { - //@BEGIN TFD CLEANUP - //@END TFD CLEANUP +//@BEGIN TFD CLEANUP +//@END TFD CLEANUP } // SharedStaticObjectTemplate::~SharedStaticObjectTemplate /** @@ -103,6 +103,15 @@ Tag SharedStaticObjectTemplate::getHighestTemplateVersion(void) const } // SharedStaticObjectTemplate::getHighestTemplateVersion //@BEGIN TFD +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void SharedStaticObjectTemplate::testValues(void) const +{ + SharedObjectTemplate::testValues(); +} // SharedStaticObjectTemplate::testValues +#endif /** * Loads the template data from an iff file. We should already be in the form @@ -112,8 +121,8 @@ Tag SharedStaticObjectTemplate::getHighestTemplateVersion(void) const */ void SharedStaticObjectTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != SharedStaticObjectTemplate_tag) { @@ -123,7 +132,7 @@ void SharedStaticObjectTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -143,8 +152,10 @@ void SharedStaticObjectTemplate::load(Iff &file) file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 0, 0)) + if (getHighestTemplateVersion() != TAG(0,0,0,0)) { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); m_versionOk = false; } @@ -162,4 +173,4 @@ void SharedStaticObjectTemplate::load(Iff &file) return; } // SharedStaticObjectTemplate::load -//@END TFD \ No newline at end of file +//@END TFD diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedStaticObjectTemplate.h b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedStaticObjectTemplate.h old mode 100755 new mode 100644 index 6f76144f..cc22dc7e --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedStaticObjectTemplate.h +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedStaticObjectTemplate.h @@ -45,6 +45,11 @@ public: //@BEGIN TFD public: +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTangibleObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTangibleObjectTemplate.cpp old mode 100755 new mode 100644 index e0cae7f5..95742f60 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTangibleObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTangibleObjectTemplate.cpp @@ -32,33 +32,33 @@ const std::string DefaultString(""); const StringId DefaultStringId("", 0); -const Vector DefaultVector(0, 0, 0); +const Vector DefaultVector(0,0,0); const TriggerVolumeData DefaultTriggerVolumeData; bool SharedTangibleObjectTemplate::ms_allowDefaultTemplateParams = true; + /** * Class constructor. */ SharedTangibleObjectTemplate::SharedTangibleObjectTemplate(const std::string & filename) //@BEGIN TFD INIT : SharedObjectTemplate(filename) - , m_paletteColorCustomizationVariablesLoaded(false) - , m_paletteColorCustomizationVariablesAppend(false) - , m_rangedIntCustomizationVariablesLoaded(false) - , m_rangedIntCustomizationVariablesAppend(false) - , m_constStringCustomizationVariablesLoaded(false) - , m_constStringCustomizationVariablesAppend(false) - , m_socketDestinationsLoaded(false) - , m_socketDestinationsAppend(false) - , m_certificationsRequiredLoaded(false) - , m_certificationsRequiredAppend(false) - , m_customizationVariableMappingLoaded(false) - , m_customizationVariableMappingAppend(false) - , m_versionOk(true) - , m_templateVersion(0) - //@END TFD INIT - , m_structureFootprint(0) + ,m_paletteColorCustomizationVariablesLoaded(false) + ,m_paletteColorCustomizationVariablesAppend(false) + ,m_rangedIntCustomizationVariablesLoaded(false) + ,m_rangedIntCustomizationVariablesAppend(false) + ,m_constStringCustomizationVariablesLoaded(false) + ,m_constStringCustomizationVariablesAppend(false) + ,m_socketDestinationsLoaded(false) + ,m_socketDestinationsAppend(false) + ,m_certificationsRequiredLoaded(false) + ,m_certificationsRequiredAppend(false) + ,m_customizationVariableMappingLoaded(false) + ,m_customizationVariableMappingAppend(false) + ,m_versionOk(true) +//@END TFD INIT + ,m_structureFootprint (0) { } // SharedTangibleObjectTemplate::SharedTangibleObjectTemplate @@ -67,7 +67,7 @@ SharedTangibleObjectTemplate::SharedTangibleObjectTemplate(const std::string & f */ SharedTangibleObjectTemplate::~SharedTangibleObjectTemplate() { - //@BEGIN TFD CLEANUP +//@BEGIN TFD CLEANUP { std::vector::iterator iter; for (iter = m_paletteColorCustomizationVariables.begin(); iter != m_paletteColorCustomizationVariables.end(); ++iter) @@ -122,8 +122,8 @@ SharedTangibleObjectTemplate::~SharedTangibleObjectTemplate() } m_customizationVariableMapping.clear(); } - //@END TFD CLEANUP - +//@END TFD CLEANUP + if (m_structureFootprint) { delete m_structureFootprint; @@ -189,13 +189,13 @@ Tag SharedTangibleObjectTemplate::getHighestTemplateVersion(void) const */ void SharedTangibleObjectTemplate::postLoad() { - SharedObjectTemplate::postLoad(); + SharedObjectTemplate::postLoad (); //-- load the structure footprint - if (getStructureFootprintFileName().length() != 0) + if (getStructureFootprintFileName ().length () != 0) { - m_structureFootprint = new StructureFootprint(); - m_structureFootprint->load(getStructureFootprintFileName().c_str()); + m_structureFootprint = new StructureFootprint (); + m_structureFootprint->load (getStructureFootprintFileName ().c_str ()); } } @@ -204,7 +204,7 @@ void SharedTangibleObjectTemplate::postLoad() * * @return the structure footprint */ -const StructureFootprint* SharedTangibleObjectTemplate::getStructureFootprint() const +const StructureFootprint* SharedTangibleObjectTemplate::getStructureFootprint () const { return m_structureFootprint; } @@ -236,7 +236,8 @@ const StructureFootprint* SharedTangibleObjectTemplate::getStructureFootprint() */ void SharedTangibleObjectTemplate::createCustomizationDataPropertyAsNeeded(Object &object, bool /* forceCreation */) const { - //-- Properties cannot be added while an object is in the world. Some callers may be in the world, +#if 1 + //-- Properties cannot be added while an object is in the world. Some callers may be in the world, // so temporarily remove the object from the world if necessary. bool shouldBeInWorld = object.isInWorld(); if (shouldBeInWorld) @@ -260,9 +261,95 @@ void SharedTangibleObjectTemplate::createCustomizationDataPropertyAsNeeded(Objec bool const skipSharedOwnerVariables = true; AssetCustomizationManager::addCustomizationVariablesForAsset(TemporaryCrcString(getAppearanceFilename().c_str(), true), *customizationData, skipSharedOwnerVariables); + +#ifdef _DEBUG + //-- set up mappings for any variables which need dependent mappings + int numVariableMappings = getCustomizationVariableMappingCount(); + if(numVariableMappings != 0) + { + //If the object is a wearable, then the dependent variable, which is probably shared, will not exist at the moment the dependency + //is set up. For this reason, make sure that you're really doing what you want. + DEBUG_WARNING(true, ("Generally, CustomizationVariableMapping should not be set on Wearables or other non-Creature tangibles.")); + } +#endif + //-- release local reference to the CustomizationData instance customizationData->release(); } + +#else + // @todo -TRF- remove this code as soon as asset customization manager is working properly. + const size_t paletteColorCount = getPaletteColorCustomizationVariablesCount(); + const size_t rangedIntCount = getRangedIntCustomizationVariablesCount(); + + //-- Return if caller isn't forcing customization data creation and no customization variables are declared for the ObjectTemplate. + const bool makeCustomizationData = forceCreation || (paletteColorCount > 0) || (rangedIntCount > 0); + if (!makeCustomizationData) + return; + + //-- Properties cannot be added while an object is in the world. Some callers may be in the world, + // so temporarily remove the object from the world if necessary. + bool shouldBeInWorld = object.isInWorld(); + if (shouldBeInWorld) + object.removeFromWorld(); + + //-- create the CustomizationDataProperty, add to Object property collection + CustomizationDataProperty *const cdProperty = new CustomizationDataProperty(object); + object.addProperty(*cdProperty); + + //-- Put object back in world if it was originally there. + if (shouldBeInWorld) + object.addToWorld(); + + //-- fetch the CustomizationData instance + CustomizationData *const customizationData = cdProperty->fetchCustomizationData(); + + //-- create PaletteColorCustomizationVariable variables as specified + { + SharedTangibleObjectTemplate::PaletteColorCustomizationVariable variableData; + + for (int i = 0; i < static_cast(paletteColorCount); ++i) + { + //-- get the palette variable data + getPaletteColorCustomizationVariables(variableData, i); + + //-- fetch the palette + const PaletteArgb *const palette = PaletteArgbList::fetch(TemporaryCrcString(variableData.palettePathName.c_str(), true)); + if (!palette) + { + DEBUG_WARNING(true, ("failed to retrieve color palette [%s] for [%s], skipping variable [%s].\n", variableData.palettePathName.c_str(), getName (), variableData.variableName.c_str())); + continue; + } + + //-- create the variable, add to CustomizationData + ::PaletteColorCustomizationVariable * const palColorVar = new ::PaletteColorCustomizationVariable(palette, variableData.defaultPaletteIndex); + + if (variableData.defaultPaletteIndex != palColorVar->getValue ()) + DEBUG_WARNING (true, ("Error loading PaletteColorCustomizationVariable [%s] for [%s]", variableData.variableName.c_str(), getName ())); + + customizationData->addVariableTakeOwnership(variableData.variableName, palColorVar); + + //-- release local palette reference + palette->release(); + } + } + + //-- create BasicRangedIntCustomizationVariable variables as specified + { + SharedTangibleObjectTemplate::RangedIntCustomizationVariable variableData; + + for (int i = 0; i < static_cast(rangedIntCount); ++i) + { + //-- get the palette variable data + getRangedIntCustomizationVariables(variableData, i); + + //-- create the variable, add to CustomizationData + customizationData->addVariableTakeOwnership(variableData.variableName, new ::BasicRangedIntCustomizationVariable(variableData.minValueInclusive, variableData.defaultValue, variableData.maxValueExclusive)); + } + } + //-- release local reference to the CustomizationData instance + customizationData->release(); +#endif } //@BEGIN TFD @@ -279,7 +366,7 @@ void SharedTangibleObjectTemplate::getPaletteColorCustomizationVariables(Palette if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter paletteColorCustomizationVariables in template %s", DataResource::getName())); - return; + return ; } else { @@ -293,10 +380,10 @@ void SharedTangibleObjectTemplate::getPaletteColorCustomizationVariables(Palette { int baseCount = base->getPaletteColorCustomizationVariablesCount(); if (index < baseCount) - { - base->getPaletteColorCustomizationVariables(data, index); - return; - } + { + base->getPaletteColorCustomizationVariables(data, index); + return; + } index -= baseCount; } @@ -323,7 +410,7 @@ void SharedTangibleObjectTemplate::getPaletteColorCustomizationVariablesMin(Pale if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter paletteColorCustomizationVariables in template %s", DataResource::getName())); - return; + return ; } else { @@ -337,10 +424,10 @@ void SharedTangibleObjectTemplate::getPaletteColorCustomizationVariablesMin(Pale { int baseCount = base->getPaletteColorCustomizationVariablesCount(); if (index < baseCount) - { - base->getPaletteColorCustomizationVariablesMin(data, index); - return; - } + { + base->getPaletteColorCustomizationVariablesMin(data, index); + return; + } index -= baseCount; } @@ -367,7 +454,7 @@ void SharedTangibleObjectTemplate::getPaletteColorCustomizationVariablesMax(Pale if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter paletteColorCustomizationVariables in template %s", DataResource::getName())); - return; + return ; } else { @@ -381,10 +468,10 @@ void SharedTangibleObjectTemplate::getPaletteColorCustomizationVariablesMax(Pale { int baseCount = base->getPaletteColorCustomizationVariablesCount(); if (index < baseCount) - { - base->getPaletteColorCustomizationVariablesMax(data, index); - return; - } + { + base->getPaletteColorCustomizationVariablesMax(data, index); + return; + } index -= baseCount; } @@ -435,7 +522,7 @@ void SharedTangibleObjectTemplate::getRangedIntCustomizationVariables(RangedIntC if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter rangedIntCustomizationVariables in template %s", DataResource::getName())); - return; + return ; } else { @@ -449,10 +536,10 @@ void SharedTangibleObjectTemplate::getRangedIntCustomizationVariables(RangedIntC { int baseCount = base->getRangedIntCustomizationVariablesCount(); if (index < baseCount) - { - base->getRangedIntCustomizationVariables(data, index); - return; - } + { + base->getRangedIntCustomizationVariables(data, index); + return; + } index -= baseCount; } @@ -480,7 +567,7 @@ void SharedTangibleObjectTemplate::getRangedIntCustomizationVariablesMin(RangedI if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter rangedIntCustomizationVariables in template %s", DataResource::getName())); - return; + return ; } else { @@ -494,10 +581,10 @@ void SharedTangibleObjectTemplate::getRangedIntCustomizationVariablesMin(RangedI { int baseCount = base->getRangedIntCustomizationVariablesCount(); if (index < baseCount) - { - base->getRangedIntCustomizationVariablesMin(data, index); - return; - } + { + base->getRangedIntCustomizationVariablesMin(data, index); + return; + } index -= baseCount; } @@ -525,7 +612,7 @@ void SharedTangibleObjectTemplate::getRangedIntCustomizationVariablesMax(RangedI if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter rangedIntCustomizationVariables in template %s", DataResource::getName())); - return; + return ; } else { @@ -539,10 +626,10 @@ void SharedTangibleObjectTemplate::getRangedIntCustomizationVariablesMax(RangedI { int baseCount = base->getRangedIntCustomizationVariablesCount(); if (index < baseCount) - { - base->getRangedIntCustomizationVariablesMax(data, index); - return; - } + { + base->getRangedIntCustomizationVariablesMax(data, index); + return; + } index -= baseCount; } @@ -594,7 +681,7 @@ void SharedTangibleObjectTemplate::getConstStringCustomizationVariables(ConstStr if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter constStringCustomizationVariables in template %s", DataResource::getName())); - return; + return ; } else { @@ -608,10 +695,10 @@ void SharedTangibleObjectTemplate::getConstStringCustomizationVariables(ConstStr { int baseCount = base->getConstStringCustomizationVariablesCount(); if (index < baseCount) - { - base->getConstStringCustomizationVariables(data, index); - return; - } + { + base->getConstStringCustomizationVariables(data, index); + return; + } index -= baseCount; } @@ -637,7 +724,7 @@ void SharedTangibleObjectTemplate::getConstStringCustomizationVariablesMin(Const if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter constStringCustomizationVariables in template %s", DataResource::getName())); - return; + return ; } else { @@ -651,10 +738,10 @@ void SharedTangibleObjectTemplate::getConstStringCustomizationVariablesMin(Const { int baseCount = base->getConstStringCustomizationVariablesCount(); if (index < baseCount) - { - base->getConstStringCustomizationVariablesMin(data, index); - return; - } + { + base->getConstStringCustomizationVariablesMin(data, index); + return; + } index -= baseCount; } @@ -680,7 +767,7 @@ void SharedTangibleObjectTemplate::getConstStringCustomizationVariablesMax(Const if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter constStringCustomizationVariables in template %s", DataResource::getName())); - return; + return ; } else { @@ -694,10 +781,10 @@ void SharedTangibleObjectTemplate::getConstStringCustomizationVariablesMax(Const { int baseCount = base->getConstStringCustomizationVariablesCount(); if (index < baseCount) - { - base->getConstStringCustomizationVariablesMax(data, index); - return; - } + { + base->getConstStringCustomizationVariablesMax(data, index); + return; + } index -= baseCount; } @@ -792,12 +879,22 @@ size_t SharedTangibleObjectTemplate::getSocketDestinationsCount(void) const return count; } // SharedTangibleObjectTemplate::getSocketDestinationsCount -const std::string & SharedTangibleObjectTemplate::getStructureFootprintFileName() const +const std::string & SharedTangibleObjectTemplate::getStructureFootprintFileName(bool testData) const { +#ifdef _DEBUG +std::string testDataValue = DefaultString; +#else +UNREF(testData); +#endif + const SharedTangibleObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getStructureFootprintFileName(true); +#endif } if (!m_structureFootprintFileName.isLoaded()) @@ -815,16 +912,31 @@ const std::string & SharedTangibleObjectTemplate::getStructureFootprintFileName( } const std::string & value = m_structureFootprintFileName.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedTangibleObjectTemplate::getStructureFootprintFileName -bool SharedTangibleObjectTemplate::getUseStructureFootprintOutline() const +bool SharedTangibleObjectTemplate::getUseStructureFootprintOutline(bool testData) const { +#ifdef _DEBUG +bool testDataValue = false; +#else +UNREF(testData); +#endif + const SharedTangibleObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getUseStructureFootprintOutline(true); +#endif } if (!m_useStructureFootprintOutline.isLoaded()) @@ -842,16 +954,31 @@ bool SharedTangibleObjectTemplate::getUseStructureFootprintOutline() const } bool value = m_useStructureFootprintOutline.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedTangibleObjectTemplate::getUseStructureFootprintOutline -bool SharedTangibleObjectTemplate::getTargetable() const +bool SharedTangibleObjectTemplate::getTargetable(bool testData) const { +#ifdef _DEBUG +bool testDataValue = false; +#else +UNREF(testData); +#endif + const SharedTangibleObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getTargetable(true); +#endif } if (!m_targetable.isLoaded()) @@ -869,6 +996,11 @@ bool SharedTangibleObjectTemplate::getTargetable() const } bool value = m_targetable.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedTangibleObjectTemplate::getTargetable @@ -945,7 +1077,7 @@ void SharedTangibleObjectTemplate::getCustomizationVariableMapping(Customization if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter customizationVariableMapping in template %s", DataResource::getName())); - return; + return ; } else { @@ -959,10 +1091,10 @@ void SharedTangibleObjectTemplate::getCustomizationVariableMapping(Customization { int baseCount = base->getCustomizationVariableMappingCount(); if (index < baseCount) - { - base->getCustomizationVariableMapping(data, index); - return; - } + { + base->getCustomizationVariableMapping(data, index); + return; + } index -= baseCount; } @@ -988,7 +1120,7 @@ void SharedTangibleObjectTemplate::getCustomizationVariableMappingMin(Customizat if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter customizationVariableMapping in template %s", DataResource::getName())); - return; + return ; } else { @@ -1002,10 +1134,10 @@ void SharedTangibleObjectTemplate::getCustomizationVariableMappingMin(Customizat { int baseCount = base->getCustomizationVariableMappingCount(); if (index < baseCount) - { - base->getCustomizationVariableMappingMin(data, index); - return; - } + { + base->getCustomizationVariableMappingMin(data, index); + return; + } index -= baseCount; } @@ -1031,7 +1163,7 @@ void SharedTangibleObjectTemplate::getCustomizationVariableMappingMax(Customizat if (ms_allowDefaultTemplateParams && /*!m_versionOk &&*/ base == nullptr) { DEBUG_WARNING(true, ("Returning default value for missing parameter customizationVariableMapping in template %s", DataResource::getName())); - return; + return ; } else { @@ -1045,10 +1177,10 @@ void SharedTangibleObjectTemplate::getCustomizationVariableMappingMax(Customizat { int baseCount = base->getCustomizationVariableMappingCount(); if (index < baseCount) - { - base->getCustomizationVariableMappingMax(data, index); - return; - } + { + base->getCustomizationVariableMappingMax(data, index); + return; + } index -= baseCount; } @@ -1085,12 +1217,22 @@ size_t SharedTangibleObjectTemplate::getCustomizationVariableMappingCount(void) return count; } // SharedTangibleObjectTemplate::getCustomizationVariableMappingCount -SharedTangibleObjectTemplate::ClientVisabilityFlags SharedTangibleObjectTemplate::getClientVisabilityFlag() const +SharedTangibleObjectTemplate::ClientVisabilityFlags SharedTangibleObjectTemplate::getClientVisabilityFlag(bool testData) const { +#ifdef _DEBUG +SharedTangibleObjectTemplate::ClientVisabilityFlags testDataValue = static_cast(0); +#else +UNREF(testData); +#endif + const SharedTangibleObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getClientVisabilityFlag(true); +#endif } if (!m_clientVisabilityFlag.isLoaded()) @@ -1108,10 +1250,29 @@ SharedTangibleObjectTemplate::ClientVisabilityFlags SharedTangibleObjectTemplate } ClientVisabilityFlags value = static_cast(m_clientVisabilityFlag.getValue()); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedTangibleObjectTemplate::getClientVisabilityFlag +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void SharedTangibleObjectTemplate::testValues(void) const +{ + IGNORE_RETURN(getStructureFootprintFileName(true)); + IGNORE_RETURN(getUseStructureFootprintOutline(true)); + IGNORE_RETURN(getTargetable(true)); + IGNORE_RETURN(getClientVisabilityFlag(true)); + SharedObjectTemplate::testValues(); +} // SharedTangibleObjectTemplate::testValues +#endif + /** * Loads the template data from an iff file. We should already be in the form * for this template. @@ -1120,8 +1281,8 @@ SharedTangibleObjectTemplate::ClientVisabilityFlags SharedTangibleObjectTemplate */ void SharedTangibleObjectTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != SharedTangibleObjectTemplate_tag) { @@ -1131,7 +1292,7 @@ void SharedTangibleObjectTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -1151,8 +1312,10 @@ void SharedTangibleObjectTemplate::load(Iff &file) file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 1, 0)) + if (getHighestTemplateVersion() != TAG(0,0,1,0)) { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); m_versionOk = false; } @@ -1296,6 +1459,7 @@ void SharedTangibleObjectTemplate::load(Iff &file) return; } // SharedTangibleObjectTemplate::load + //============================================================================= // class SharedTangibleObjectTemplate::_ConstStringCustomizationVariable @@ -1342,12 +1506,22 @@ Tag SharedTangibleObjectTemplate::_ConstStringCustomizationVariable::getId(void) return _ConstStringCustomizationVariable_tag; } // SharedTangibleObjectTemplate::_ConstStringCustomizationVariable::getId -const std::string & SharedTangibleObjectTemplate::_ConstStringCustomizationVariable::getVariableName(bool versionOk) const +const std::string & SharedTangibleObjectTemplate::_ConstStringCustomizationVariable::getVariableName(bool versionOk, bool testData) const { +#ifdef _DEBUG +std::string testDataValue = DefaultString; +#else +UNREF(testData); +#endif + const SharedTangibleObjectTemplate::_ConstStringCustomizationVariable * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getVariableName(true); +#endif } if (!m_variableName.isLoaded()) @@ -1365,16 +1539,31 @@ const std::string & SharedTangibleObjectTemplate::_ConstStringCustomizationVaria } const std::string & value = m_variableName.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedTangibleObjectTemplate::_ConstStringCustomizationVariable::getVariableName -const std::string & SharedTangibleObjectTemplate::_ConstStringCustomizationVariable::getConstValue(bool versionOk) const +const std::string & SharedTangibleObjectTemplate::_ConstStringCustomizationVariable::getConstValue(bool versionOk, bool testData) const { +#ifdef _DEBUG +std::string testDataValue = DefaultString; +#else +UNREF(testData); +#endif + const SharedTangibleObjectTemplate::_ConstStringCustomizationVariable * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getConstValue(true); +#endif } if (!m_constValue.isLoaded()) @@ -1392,10 +1581,26 @@ const std::string & SharedTangibleObjectTemplate::_ConstStringCustomizationVaria } const std::string & value = m_constValue.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedTangibleObjectTemplate::_ConstStringCustomizationVariable::getConstValue +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void SharedTangibleObjectTemplate::_ConstStringCustomizationVariable::testValues(void) const +{ + IGNORE_RETURN(getVariableName(true)); + IGNORE_RETURN(getConstValue(true)); +} // SharedTangibleObjectTemplate::_ConstStringCustomizationVariable::testValues +#endif + /** * Loads the template data from an iff file. We should already be in the form * for this template. @@ -1404,8 +1609,8 @@ const std::string & SharedTangibleObjectTemplate::_ConstStringCustomizationVaria */ void SharedTangibleObjectTemplate::_ConstStringCustomizationVariable::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; file.enterForm(); @@ -1427,6 +1632,7 @@ void SharedTangibleObjectTemplate::_ConstStringCustomizationVariable::load(Iff & UNREF(file); } // SharedTangibleObjectTemplate::_ConstStringCustomizationVariable::load + //============================================================================= // class SharedTangibleObjectTemplate::_CustomizationVariableMapping @@ -1473,12 +1679,22 @@ Tag SharedTangibleObjectTemplate::_CustomizationVariableMapping::getId(void) con return _CustomizationVariableMapping_tag; } // SharedTangibleObjectTemplate::_CustomizationVariableMapping::getId -const std::string & SharedTangibleObjectTemplate::_CustomizationVariableMapping::getSourceVariable(bool versionOk) const +const std::string & SharedTangibleObjectTemplate::_CustomizationVariableMapping::getSourceVariable(bool versionOk, bool testData) const { +#ifdef _DEBUG +std::string testDataValue = DefaultString; +#else +UNREF(testData); +#endif + const SharedTangibleObjectTemplate::_CustomizationVariableMapping * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getSourceVariable(true); +#endif } if (!m_sourceVariable.isLoaded()) @@ -1496,16 +1712,31 @@ const std::string & SharedTangibleObjectTemplate::_CustomizationVariableMapping: } const std::string & value = m_sourceVariable.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedTangibleObjectTemplate::_CustomizationVariableMapping::getSourceVariable -const std::string & SharedTangibleObjectTemplate::_CustomizationVariableMapping::getDependentVariable(bool versionOk) const +const std::string & SharedTangibleObjectTemplate::_CustomizationVariableMapping::getDependentVariable(bool versionOk, bool testData) const { +#ifdef _DEBUG +std::string testDataValue = DefaultString; +#else +UNREF(testData); +#endif + const SharedTangibleObjectTemplate::_CustomizationVariableMapping * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getDependentVariable(true); +#endif } if (!m_dependentVariable.isLoaded()) @@ -1523,10 +1754,26 @@ const std::string & SharedTangibleObjectTemplate::_CustomizationVariableMapping: } const std::string & value = m_dependentVariable.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedTangibleObjectTemplate::_CustomizationVariableMapping::getDependentVariable +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void SharedTangibleObjectTemplate::_CustomizationVariableMapping::testValues(void) const +{ + IGNORE_RETURN(getSourceVariable(true)); + IGNORE_RETURN(getDependentVariable(true)); +} // SharedTangibleObjectTemplate::_CustomizationVariableMapping::testValues +#endif + /** * Loads the template data from an iff file. We should already be in the form * for this template. @@ -1535,8 +1782,8 @@ const std::string & SharedTangibleObjectTemplate::_CustomizationVariableMapping: */ void SharedTangibleObjectTemplate::_CustomizationVariableMapping::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; file.enterForm(); @@ -1558,6 +1805,7 @@ void SharedTangibleObjectTemplate::_CustomizationVariableMapping::load(Iff &file UNREF(file); } // SharedTangibleObjectTemplate::_CustomizationVariableMapping::load + //============================================================================= // class SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable @@ -1604,12 +1852,22 @@ Tag SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable::getId(void return _PaletteColorCustomizationVariable_tag; } // SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable::getId -const std::string & SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable::getVariableName(bool versionOk) const +const std::string & SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable::getVariableName(bool versionOk, bool testData) const { +#ifdef _DEBUG +std::string testDataValue = DefaultString; +#else +UNREF(testData); +#endif + const SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getVariableName(true); +#endif } if (!m_variableName.isLoaded()) @@ -1627,16 +1885,31 @@ const std::string & SharedTangibleObjectTemplate::_PaletteColorCustomizationVari } const std::string & value = m_variableName.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable::getVariableName -const std::string & SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable::getPalettePathName(bool versionOk) const +const std::string & SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable::getPalettePathName(bool versionOk, bool testData) const { +#ifdef _DEBUG +std::string testDataValue = DefaultString; +#else +UNREF(testData); +#endif + const SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getPalettePathName(true); +#endif } if (!m_palettePathName.isLoaded()) @@ -1654,16 +1927,31 @@ const std::string & SharedTangibleObjectTemplate::_PaletteColorCustomizationVari } const std::string & value = m_palettePathName.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable::getPalettePathName -int SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable::getDefaultPaletteIndex(bool versionOk) const +int SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable::getDefaultPaletteIndex(bool versionOk, bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getDefaultPaletteIndex(true); +#endif } if (!m_defaultPaletteIndex.isLoaded()) @@ -1703,16 +1991,31 @@ int SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable::getDefault else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable::getDefaultPaletteIndex -int SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable::getDefaultPaletteIndexMin(bool versionOk) const +int SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable::getDefaultPaletteIndexMin(bool versionOk, bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getDefaultPaletteIndexMin(true); +#endif } if (!m_defaultPaletteIndex.isLoaded()) @@ -1752,16 +2055,31 @@ int SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable::getDefault else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable::getDefaultPaletteIndexMin -int SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable::getDefaultPaletteIndexMax(bool versionOk) const +int SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable::getDefaultPaletteIndexMax(bool versionOk, bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getDefaultPaletteIndexMax(true); +#endif } if (!m_defaultPaletteIndex.isLoaded()) @@ -1801,10 +2119,28 @@ int SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable::getDefault else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable::getDefaultPaletteIndexMax +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable::testValues(void) const +{ + IGNORE_RETURN(getVariableName(true)); + IGNORE_RETURN(getPalettePathName(true)); + IGNORE_RETURN(getDefaultPaletteIndexMin(true)); + IGNORE_RETURN(getDefaultPaletteIndexMax(true)); +} // SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable::testValues +#endif + /** * Loads the template data from an iff file. We should already be in the form * for this template. @@ -1813,8 +2149,8 @@ int SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable::getDefault */ void SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; file.enterForm(); @@ -1838,6 +2174,7 @@ void SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable::load(Iff UNREF(file); } // SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable::load + //============================================================================= // class SharedTangibleObjectTemplate::_RangedIntCustomizationVariable @@ -1884,12 +2221,22 @@ Tag SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::getId(void) c return _RangedIntCustomizationVariable_tag; } // SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::getId -const std::string & SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::getVariableName(bool versionOk) const +const std::string & SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::getVariableName(bool versionOk, bool testData) const { +#ifdef _DEBUG +std::string testDataValue = DefaultString; +#else +UNREF(testData); +#endif + const SharedTangibleObjectTemplate::_RangedIntCustomizationVariable * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getVariableName(true); +#endif } if (!m_variableName.isLoaded()) @@ -1907,16 +2254,31 @@ const std::string & SharedTangibleObjectTemplate::_RangedIntCustomizationVariabl } const std::string & value = m_variableName.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::getVariableName -int SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::getMinValueInclusive(bool versionOk) const +int SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::getMinValueInclusive(bool versionOk, bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const SharedTangibleObjectTemplate::_RangedIntCustomizationVariable * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getMinValueInclusive(true); +#endif } if (!m_minValueInclusive.isLoaded()) @@ -1956,16 +2318,31 @@ int SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::getMinValueIn else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::getMinValueInclusive -int SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::getMinValueInclusiveMin(bool versionOk) const +int SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::getMinValueInclusiveMin(bool versionOk, bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const SharedTangibleObjectTemplate::_RangedIntCustomizationVariable * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getMinValueInclusiveMin(true); +#endif } if (!m_minValueInclusive.isLoaded()) @@ -2005,16 +2382,31 @@ int SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::getMinValueIn else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::getMinValueInclusiveMin -int SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::getMinValueInclusiveMax(bool versionOk) const +int SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::getMinValueInclusiveMax(bool versionOk, bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const SharedTangibleObjectTemplate::_RangedIntCustomizationVariable * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getMinValueInclusiveMax(true); +#endif } if (!m_minValueInclusive.isLoaded()) @@ -2054,16 +2446,31 @@ int SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::getMinValueIn else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::getMinValueInclusiveMax -int SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::getDefaultValue(bool versionOk) const +int SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::getDefaultValue(bool versionOk, bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const SharedTangibleObjectTemplate::_RangedIntCustomizationVariable * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getDefaultValue(true); +#endif } if (!m_defaultValue.isLoaded()) @@ -2103,16 +2510,31 @@ int SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::getDefaultVal else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::getDefaultValue -int SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::getDefaultValueMin(bool versionOk) const +int SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::getDefaultValueMin(bool versionOk, bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const SharedTangibleObjectTemplate::_RangedIntCustomizationVariable * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getDefaultValueMin(true); +#endif } if (!m_defaultValue.isLoaded()) @@ -2152,16 +2574,31 @@ int SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::getDefaultVal else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::getDefaultValueMin -int SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::getDefaultValueMax(bool versionOk) const +int SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::getDefaultValueMax(bool versionOk, bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const SharedTangibleObjectTemplate::_RangedIntCustomizationVariable * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getDefaultValueMax(true); +#endif } if (!m_defaultValue.isLoaded()) @@ -2201,16 +2638,31 @@ int SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::getDefaultVal else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::getDefaultValueMax -int SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::getMaxValueExclusive(bool versionOk) const +int SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::getMaxValueExclusive(bool versionOk, bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const SharedTangibleObjectTemplate::_RangedIntCustomizationVariable * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getMaxValueExclusive(true); +#endif } if (!m_maxValueExclusive.isLoaded()) @@ -2250,16 +2702,31 @@ int SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::getMaxValueEx else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::getMaxValueExclusive -int SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::getMaxValueExclusiveMin(bool versionOk) const +int SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::getMaxValueExclusiveMin(bool versionOk, bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const SharedTangibleObjectTemplate::_RangedIntCustomizationVariable * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getMaxValueExclusiveMin(true); +#endif } if (!m_maxValueExclusive.isLoaded()) @@ -2299,16 +2766,31 @@ int SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::getMaxValueEx else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::getMaxValueExclusiveMin -int SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::getMaxValueExclusiveMax(bool versionOk) const +int SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::getMaxValueExclusiveMax(bool versionOk, bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const SharedTangibleObjectTemplate::_RangedIntCustomizationVariable * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getMaxValueExclusiveMax(true); +#endif } if (!m_maxValueExclusive.isLoaded()) @@ -2348,10 +2830,31 @@ int SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::getMaxValueEx else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::getMaxValueExclusiveMax +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::testValues(void) const +{ + IGNORE_RETURN(getVariableName(true)); + IGNORE_RETURN(getMinValueInclusiveMin(true)); + IGNORE_RETURN(getMinValueInclusiveMax(true)); + IGNORE_RETURN(getDefaultValueMin(true)); + IGNORE_RETURN(getDefaultValueMax(true)); + IGNORE_RETURN(getMaxValueExclusiveMin(true)); + IGNORE_RETURN(getMaxValueExclusiveMax(true)); +} // SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::testValues +#endif + /** * Loads the template data from an iff file. We should already be in the form * for this template. @@ -2360,8 +2863,8 @@ int SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::getMaxValueEx */ void SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; file.enterForm(); @@ -2387,4 +2890,4 @@ void SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::load(Iff &fi UNREF(file); } // SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::load -//@END TFD \ No newline at end of file +//@END TFD diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTangibleObjectTemplate.h b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTangibleObjectTemplate.h old mode 100755 new mode 100644 index a90413ce..7cd54f53 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTangibleObjectTemplate.h +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTangibleObjectTemplate.h @@ -97,17 +97,22 @@ protected: virtual Tag getId(void) const; public: - const std::string & getVariableName(bool versionOk) const; - int getMinValueInclusive(bool versionOk) const; - int getMinValueInclusiveMin(bool versionOk) const; - int getMinValueInclusiveMax(bool versionOk) const; - int getDefaultValue(bool versionOk) const; - int getDefaultValueMin(bool versionOk) const; - int getDefaultValueMax(bool versionOk) const; - int getMaxValueExclusive(bool versionOk) const; - int getMaxValueExclusiveMin(bool versionOk) const; - int getMaxValueExclusiveMax(bool versionOk) const; + const std::string & getVariableName(bool versionOk, bool testData = false) const; + int getMinValueInclusive(bool versionOk, bool testData = false) const; + int getMinValueInclusiveMin(bool versionOk, bool testData = false) const; + int getMinValueInclusiveMax(bool versionOk, bool testData = false) const; + int getDefaultValue(bool versionOk, bool testData = false) const; + int getDefaultValueMin(bool versionOk, bool testData = false) const; + int getDefaultValueMax(bool versionOk, bool testData = false) const; + int getMaxValueExclusive(bool versionOk, bool testData = false) const; + int getMaxValueExclusiveMin(bool versionOk, bool testData = false) const; + int getMaxValueExclusiveMax(bool versionOk, bool testData = false) const; +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); @@ -142,12 +147,17 @@ private: virtual Tag getId(void) const; public: - const std::string & getVariableName(bool versionOk) const; - const std::string & getPalettePathName(bool versionOk) const; - int getDefaultPaletteIndex(bool versionOk) const; - int getDefaultPaletteIndexMin(bool versionOk) const; - int getDefaultPaletteIndexMax(bool versionOk) const; + const std::string & getVariableName(bool versionOk, bool testData = false) const; + const std::string & getPalettePathName(bool versionOk, bool testData = false) const; + int getDefaultPaletteIndex(bool versionOk, bool testData = false) const; + int getDefaultPaletteIndexMin(bool versionOk, bool testData = false) const; + int getDefaultPaletteIndexMax(bool versionOk, bool testData = false) const; +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); @@ -181,9 +191,14 @@ private: virtual Tag getId(void) const; public: - const std::string & getVariableName(bool versionOk) const; - const std::string & getConstValue(bool versionOk) const; + const std::string & getVariableName(bool versionOk, bool testData = false) const; + const std::string & getConstValue(bool versionOk, bool testData = false) const; +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); @@ -216,9 +231,14 @@ private: virtual Tag getId(void) const; public: - const std::string & getSourceVariable(bool versionOk) const; - const std::string & getDependentVariable(bool versionOk) const; + const std::string & getSourceVariable(bool versionOk, bool testData = false) const; + const std::string & getDependentVariable(bool versionOk, bool testData = false) const; +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); @@ -250,17 +270,22 @@ public: size_t getConstStringCustomizationVariablesCount(void) const; GameObjectType getSocketDestinations(int index) const; size_t getSocketDestinationsCount(void) const; - const std::string & getStructureFootprintFileName() const; - bool getUseStructureFootprintOutline() const; - bool getTargetable() const; + const std::string & getStructureFootprintFileName(bool testData = false) const; + bool getUseStructureFootprintOutline(bool testData = false) const; + bool getTargetable(bool testData = false) const; const std::string & getCertificationsRequired(int index) const; size_t getCertificationsRequiredCount(void) const; void getCustomizationVariableMapping(CustomizationVariableMapping &data, int index) const; void getCustomizationVariableMappingMin(CustomizationVariableMapping &data, int index) const; void getCustomizationVariableMappingMax(CustomizationVariableMapping &data, int index) const; size_t getCustomizationVariableMappingCount(void) const; - ClientVisabilityFlags getClientVisabilityFlag() const; + ClientVisabilityFlags getClientVisabilityFlag(bool testData = false) const; +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTerrainSurfaceObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTerrainSurfaceObjectTemplate.cpp old mode 100755 new mode 100644 index b2b26568..4c9d5e0c --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTerrainSurfaceObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTerrainSurfaceObjectTemplate.cpp @@ -12,7 +12,7 @@ #include "sharedGame/FirstSharedGame.h" #include "SharedTerrainSurfaceObjectTemplate.h" - +#include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedMath/Vector.h" #include "sharedObject/ObjectTemplateList.h" @@ -23,20 +23,20 @@ const std::string DefaultString(""); const StringId DefaultStringId("", 0); -const Vector DefaultVector(0, 0, 0); +const Vector DefaultVector(0,0,0); const TriggerVolumeData DefaultTriggerVolumeData; bool SharedTerrainSurfaceObjectTemplate::ms_allowDefaultTemplateParams = true; + /** * Class constructor. */ SharedTerrainSurfaceObjectTemplate::SharedTerrainSurfaceObjectTemplate(const std::string & filename) //@BEGIN TFD INIT : ObjectTemplate(filename) - , m_versionOk(true) - , m_templateVersion(0) - //@END TFD INIT + ,m_versionOk(true) +//@END TFD INIT { } // SharedTerrainSurfaceObjectTemplate::SharedTerrainSurfaceObjectTemplate @@ -45,8 +45,8 @@ SharedTerrainSurfaceObjectTemplate::SharedTerrainSurfaceObjectTemplate(const std */ SharedTerrainSurfaceObjectTemplate::~SharedTerrainSurfaceObjectTemplate() { - //@BEGIN TFD CLEANUP - //@END TFD CLEANUP +//@BEGIN TFD CLEANUP +//@END TFD CLEANUP } // SharedTerrainSurfaceObjectTemplate::~SharedTerrainSurfaceObjectTemplate /** @@ -103,12 +103,22 @@ Tag SharedTerrainSurfaceObjectTemplate::getHighestTemplateVersion(void) const } // SharedTerrainSurfaceObjectTemplate::getHighestTemplateVersion //@BEGIN TFD -float SharedTerrainSurfaceObjectTemplate::getCover() const +float SharedTerrainSurfaceObjectTemplate::getCover(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedTerrainSurfaceObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getCover(true); +#endif } if (!m_cover.isLoaded()) @@ -148,16 +158,31 @@ float SharedTerrainSurfaceObjectTemplate::getCover() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedTerrainSurfaceObjectTemplate::getCover -float SharedTerrainSurfaceObjectTemplate::getCoverMin() const +float SharedTerrainSurfaceObjectTemplate::getCoverMin(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedTerrainSurfaceObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getCoverMin(true); +#endif } if (!m_cover.isLoaded()) @@ -197,16 +222,31 @@ float SharedTerrainSurfaceObjectTemplate::getCoverMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedTerrainSurfaceObjectTemplate::getCoverMin -float SharedTerrainSurfaceObjectTemplate::getCoverMax() const +float SharedTerrainSurfaceObjectTemplate::getCoverMax(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedTerrainSurfaceObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getCoverMax(true); +#endif } if (!m_cover.isLoaded()) @@ -246,16 +286,31 @@ float SharedTerrainSurfaceObjectTemplate::getCoverMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedTerrainSurfaceObjectTemplate::getCoverMax -const std::string & SharedTerrainSurfaceObjectTemplate::getSurfaceType() const +const std::string & SharedTerrainSurfaceObjectTemplate::getSurfaceType(bool testData) const { +#ifdef _DEBUG +std::string testDataValue = DefaultString; +#else +UNREF(testData); +#endif + const SharedTerrainSurfaceObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getSurfaceType(true); +#endif } if (!m_surfaceType.isLoaded()) @@ -273,10 +328,27 @@ const std::string & SharedTerrainSurfaceObjectTemplate::getSurfaceType() const } const std::string & value = m_surfaceType.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedTerrainSurfaceObjectTemplate::getSurfaceType +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void SharedTerrainSurfaceObjectTemplate::testValues(void) const +{ + IGNORE_RETURN(getCoverMin(true)); + IGNORE_RETURN(getCoverMax(true)); + IGNORE_RETURN(getSurfaceType(true)); +} // SharedTerrainSurfaceObjectTemplate::testValues +#endif + /** * Loads the template data from an iff file. We should already be in the form * for this template. @@ -285,8 +357,8 @@ const std::string & SharedTerrainSurfaceObjectTemplate::getSurfaceType() const */ void SharedTerrainSurfaceObjectTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != SharedTerrainSurfaceObjectTemplate_tag) { @@ -295,7 +367,7 @@ void SharedTerrainSurfaceObjectTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -315,8 +387,10 @@ void SharedTerrainSurfaceObjectTemplate::load(Iff &file) file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 0, 0)) + if (getHighestTemplateVersion() != TAG(0,0,0,0)) { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); m_versionOk = false; } @@ -340,4 +414,4 @@ void SharedTerrainSurfaceObjectTemplate::load(Iff &file) return; } // SharedTerrainSurfaceObjectTemplate::load -//@END TFD \ No newline at end of file +//@END TFD diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTerrainSurfaceObjectTemplate.h b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTerrainSurfaceObjectTemplate.h old mode 100755 new mode 100644 index 4d2feaf9..bf5265e7 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTerrainSurfaceObjectTemplate.h +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTerrainSurfaceObjectTemplate.h @@ -44,11 +44,16 @@ public: //@BEGIN TFD public: - float getCover() const; - float getCoverMin() const; - float getCoverMax() const; - const std::string & getSurfaceType() const; + float getCover(bool testData = false) const; + float getCoverMin(bool testData = false) const; + float getCoverMax(bool testData = false) const; + const std::string & getSurfaceType(bool testData = false) const; +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTokenObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTokenObjectTemplate.cpp new file mode 100644 index 00000000..43d4b8ea --- /dev/null +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTokenObjectTemplate.cpp @@ -0,0 +1,176 @@ +//======================================================================== +// +// SharedTokenObjectTemplate.cpp +// +//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be +//overwritten the next time the template definition is compiled. Do not +//make changes to code inside these blocks. +// +// copyright 2001 Sony Online Entertainment +// +//======================================================================== + +#include "sharedGame/FirstSharedGame.h" +#include "SharedTokenObjectTemplate.h" +#include "sharedDebug/DataLint.h" +#include "sharedFile/Iff.h" +#include "sharedObject/ObjectTemplate.h" +#include "sharedObject/ObjectTemplateList.h" +#include "sharedMath/Vector.h" +//@BEGIN TFD TEMPLATE REFS +//@END TFD TEMPLATE REFS +#include + +const std::string DefaultString(""); +const StringId DefaultStringId("", 0); +const Vector DefaultVector(0,0,0); +const TriggerVolumeData DefaultTriggerVolumeData; + +bool SharedTokenObjectTemplate::ms_allowDefaultTemplateParams = true; + + +/** + * Class constructor. + */ +SharedTokenObjectTemplate::SharedTokenObjectTemplate(const std::string & filename) +//@BEGIN TFD INIT + : SharedIntangibleObjectTemplate(filename) + ,m_versionOk(true) +//@END TFD INIT +{ +} // SharedTokenObjectTemplate::SharedTokenObjectTemplate + +/** + * Class destructor. + */ +SharedTokenObjectTemplate::~SharedTokenObjectTemplate() +{ +//@BEGIN TFD CLEANUP +//@END TFD CLEANUP +} // SharedTokenObjectTemplate::~SharedTokenObjectTemplate + +/** + * Static function used to register this template. + */ +void SharedTokenObjectTemplate::registerMe(void) +{ + ObjectTemplateList::registerTemplate(SharedTokenObjectTemplate_tag, create); +} // SharedTokenObjectTemplate::registerMe + +/** + * Creates a SharedTokenObjectTemplate template. + * + * @return a new instance of the template + */ +ObjectTemplate * SharedTokenObjectTemplate::create(const std::string & filename) +{ + return new SharedTokenObjectTemplate(filename); +} // SharedTokenObjectTemplate::create + +/** + * Returns the template id. + * + * @return the template id + */ +Tag SharedTokenObjectTemplate::getId(void) const +{ + return SharedTokenObjectTemplate_tag; +} // SharedTokenObjectTemplate::getId + +/** + * Returns this template's version. + * + * @return the version + */ +Tag SharedTokenObjectTemplate::getTemplateVersion(void) const +{ + return m_templateVersion; +} // SharedTokenObjectTemplate::getTemplateVersion + +/** + * Returns the highest version of this template or it's base templates. + * + * @return the highest version + */ +Tag SharedTokenObjectTemplate::getHighestTemplateVersion(void) const +{ + if (m_baseData == nullptr) + return m_templateVersion; + const SharedTokenObjectTemplate * base = dynamic_cast(m_baseData); + if (base == nullptr) + return m_templateVersion; + return std::max(m_templateVersion, base->getHighestTemplateVersion()); +} // SharedTokenObjectTemplate::getHighestTemplateVersion + +//@BEGIN TFD +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void SharedTokenObjectTemplate::testValues(void) const +{ + SharedIntangibleObjectTemplate::testValues(); +} // SharedTokenObjectTemplate::testValues +#endif + +/** + * Loads the template data from an iff file. We should already be in the form + * for this template. + * + * @param file file to load from + */ +void SharedTokenObjectTemplate::load(Iff &file) +{ +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; + + if (file.getCurrentName() != SharedTokenObjectTemplate_tag) + { + SharedIntangibleObjectTemplate::load(file); + return; + } + + file.enterForm(); + m_templateVersion = file.getCurrentName(); + if (m_templateVersion == TAG(D,E,R,V)) + { + file.enterForm(); + file.enterChunk(); + std::string baseFilename; + file.read_string(baseFilename); + file.exitChunk(); + const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) + base->releaseReference(); + else + { + if (m_baseData != nullptr) + m_baseData->releaseReference(); + m_baseData = base; + } + file.exitForm(); + m_templateVersion = file.getCurrentName(); + } + if (getHighestTemplateVersion() != TAG(0,0,0,0)) + { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); + m_versionOk = false; + } + + file.enterForm(); + + file.enterChunk(); + int paramCount = file.read_int32(); + file.exitChunk(); + UNREF(paramName); + UNREF(paramCount); + + file.exitForm(); + SharedIntangibleObjectTemplate::load(file); + file.exitForm(); + return; +} // SharedTokenObjectTemplate::load + +//@END TFD diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTokenObjectTemplate.h b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTokenObjectTemplate.h new file mode 100644 index 00000000..aec97451 --- /dev/null +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTokenObjectTemplate.h @@ -0,0 +1,83 @@ +//======================================================================== +// +// SharedTokenObjectTemplate.h +// +//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be +//overwritten the next time the template definition is compiled. Do not +//make changes to code inside these blocks. +// +// copyright 2001 Sony Online Entertainment +// +//======================================================================== + +#ifndef _INCLUDED_SharedTokenObjectTemplate_H +#define _INCLUDED_SharedTokenObjectTemplate_H + +#include "SharedIntangibleObjectTemplate.h" +#include "sharedFoundation/DynamicVariable.h" +#include "sharedUtility/TemplateParameter.h" + + +class Vector; +typedef StructParam StructParamOT; +//@BEGIN TFD TEMPLATE REFS +//@END TFD TEMPLATE REFS + + +class SharedTokenObjectTemplate : public SharedIntangibleObjectTemplate +{ +public: +//@BEGIN TFD ID + enum + { + SharedTokenObjectTemplate_tag = TAG(S,T,O,K) + }; +//@END TFD ID +public: + SharedTokenObjectTemplate(const std::string & filename); + virtual ~SharedTokenObjectTemplate(); + + virtual Tag getId(void) const; + virtual Tag getTemplateVersion(void) const; + virtual Tag getHighestTemplateVersion(void) const; + static void install(bool allowDefaultTemplateParams = true); + +//@BEGIN TFD +public: + +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif + +protected: + virtual void load(Iff &file); + +private: +//@END TFD + +private: + Tag m_templateVersion; // the template version + bool m_versionOk; // flag that the template version loaded is the one we expect + static bool ms_allowDefaultTemplateParams; // flag to allow defaut params instead of fataling + + static void registerMe(void); + static ObjectTemplate * create(const std::string & filename); + + // no copying + SharedTokenObjectTemplate(const SharedTokenObjectTemplate &); + SharedTokenObjectTemplate & operator =(const SharedTokenObjectTemplate &); +}; + + +inline void SharedTokenObjectTemplate::install(bool allowDefaultTemplateParams) +{ + ms_allowDefaultTemplateParams = allowDefaultTemplateParams; +//@BEGIN TFD INSTALL + SharedTokenObjectTemplate::registerMe(); +//@END TFD INSTALL +} + + +#endif // _INCLUDED_SharedTokenObjectTemplate_H diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedUniverseObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedUniverseObjectTemplate.cpp old mode 100755 new mode 100644 index e1ced8e6..c6e9b692 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedUniverseObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedUniverseObjectTemplate.cpp @@ -12,7 +12,7 @@ #include "sharedGame/FirstSharedGame.h" #include "SharedUniverseObjectTemplate.h" - +#include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedMath/Vector.h" #include "sharedObject/ObjectTemplate.h" @@ -24,20 +24,20 @@ const std::string DefaultString(""); const StringId DefaultStringId("", 0); -const Vector DefaultVector(0, 0, 0); +const Vector DefaultVector(0,0,0); const TriggerVolumeData DefaultTriggerVolumeData; bool SharedUniverseObjectTemplate::ms_allowDefaultTemplateParams = true; + /** * Class constructor. */ SharedUniverseObjectTemplate::SharedUniverseObjectTemplate(const std::string & filename) //@BEGIN TFD INIT : SharedObjectTemplate(filename) - , m_versionOk(true) - , m_templateVersion(0) - //@END TFD INIT + ,m_versionOk(true) +//@END TFD INIT { } // SharedUniverseObjectTemplate::SharedUniverseObjectTemplate @@ -46,8 +46,8 @@ SharedUniverseObjectTemplate::SharedUniverseObjectTemplate(const std::string & f */ SharedUniverseObjectTemplate::~SharedUniverseObjectTemplate() { - //@BEGIN TFD CLEANUP - //@END TFD CLEANUP +//@BEGIN TFD CLEANUP +//@END TFD CLEANUP } // SharedUniverseObjectTemplate::~SharedUniverseObjectTemplate /** @@ -104,6 +104,15 @@ Tag SharedUniverseObjectTemplate::getHighestTemplateVersion(void) const } // SharedUniverseObjectTemplate::getHighestTemplateVersion //@BEGIN TFD +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void SharedUniverseObjectTemplate::testValues(void) const +{ + SharedObjectTemplate::testValues(); +} // SharedUniverseObjectTemplate::testValues +#endif /** * Loads the template data from an iff file. We should already be in the form @@ -113,8 +122,8 @@ Tag SharedUniverseObjectTemplate::getHighestTemplateVersion(void) const */ void SharedUniverseObjectTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != SharedUniverseObjectTemplate_tag) { @@ -124,7 +133,7 @@ void SharedUniverseObjectTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -144,8 +153,10 @@ void SharedUniverseObjectTemplate::load(Iff &file) file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 0, 0)) + if (getHighestTemplateVersion() != TAG(0,0,0,0)) { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); m_versionOk = false; } @@ -163,4 +174,4 @@ void SharedUniverseObjectTemplate::load(Iff &file) return; } // SharedUniverseObjectTemplate::load -//@END TFD \ No newline at end of file +//@END TFD diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedUniverseObjectTemplate.h b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedUniverseObjectTemplate.h old mode 100755 new mode 100644 index 369199b4..1968e4eb --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedUniverseObjectTemplate.h +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedUniverseObjectTemplate.h @@ -45,6 +45,11 @@ public: //@BEGIN TFD public: +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedVehicleObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedVehicleObjectTemplate.cpp old mode 100755 new mode 100644 index 514e9511..7467cf59 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedVehicleObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedVehicleObjectTemplate.cpp @@ -23,20 +23,20 @@ const std::string DefaultString(""); const StringId DefaultStringId("", 0); -const Vector DefaultVector(0, 0, 0); +const Vector DefaultVector(0,0,0); const TriggerVolumeData DefaultTriggerVolumeData; bool SharedVehicleObjectTemplate::ms_allowDefaultTemplateParams = true; + /** * Class constructor. */ SharedVehicleObjectTemplate::SharedVehicleObjectTemplate(const std::string & filename) //@BEGIN TFD INIT : SharedTangibleObjectTemplate(filename) - , m_versionOk(true) - , m_templateVersion(0) - //@END TFD INIT + ,m_versionOk(true) +//@END TFD INIT { } // SharedVehicleObjectTemplate::SharedVehicleObjectTemplate @@ -45,8 +45,8 @@ SharedVehicleObjectTemplate::SharedVehicleObjectTemplate(const std::string & fil */ SharedVehicleObjectTemplate::~SharedVehicleObjectTemplate() { - //@BEGIN TFD CLEANUP - //@END TFD CLEANUP +//@BEGIN TFD CLEANUP +//@END TFD CLEANUP } // SharedVehicleObjectTemplate::~SharedVehicleObjectTemplate /** @@ -250,12 +250,22 @@ float SharedVehicleObjectTemplate::getSpeedMax(MovementTypes index) const return value; } // SharedVehicleObjectTemplate::getSpeedMax -float SharedVehicleObjectTemplate::getSlopeAversion() const +float SharedVehicleObjectTemplate::getSlopeAversion(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedVehicleObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getSlopeAversion(true); +#endif } if (!m_slopeAversion.isLoaded()) @@ -295,16 +305,31 @@ float SharedVehicleObjectTemplate::getSlopeAversion() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedVehicleObjectTemplate::getSlopeAversion -float SharedVehicleObjectTemplate::getSlopeAversionMin() const +float SharedVehicleObjectTemplate::getSlopeAversionMin(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedVehicleObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getSlopeAversionMin(true); +#endif } if (!m_slopeAversion.isLoaded()) @@ -344,16 +369,31 @@ float SharedVehicleObjectTemplate::getSlopeAversionMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedVehicleObjectTemplate::getSlopeAversionMin -float SharedVehicleObjectTemplate::getSlopeAversionMax() const +float SharedVehicleObjectTemplate::getSlopeAversionMax(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedVehicleObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getSlopeAversionMax(true); +#endif } if (!m_slopeAversion.isLoaded()) @@ -393,16 +433,31 @@ float SharedVehicleObjectTemplate::getSlopeAversionMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedVehicleObjectTemplate::getSlopeAversionMax -float SharedVehicleObjectTemplate::getHoverValue() const +float SharedVehicleObjectTemplate::getHoverValue(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedVehicleObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getHoverValue(true); +#endif } if (!m_hoverValue.isLoaded()) @@ -442,16 +497,31 @@ float SharedVehicleObjectTemplate::getHoverValue() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedVehicleObjectTemplate::getHoverValue -float SharedVehicleObjectTemplate::getHoverValueMin() const +float SharedVehicleObjectTemplate::getHoverValueMin(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedVehicleObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getHoverValueMin(true); +#endif } if (!m_hoverValue.isLoaded()) @@ -491,16 +561,31 @@ float SharedVehicleObjectTemplate::getHoverValueMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedVehicleObjectTemplate::getHoverValueMin -float SharedVehicleObjectTemplate::getHoverValueMax() const +float SharedVehicleObjectTemplate::getHoverValueMax(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedVehicleObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getHoverValueMax(true); +#endif } if (!m_hoverValue.isLoaded()) @@ -540,16 +625,31 @@ float SharedVehicleObjectTemplate::getHoverValueMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedVehicleObjectTemplate::getHoverValueMax -float SharedVehicleObjectTemplate::getTurnRate() const +float SharedVehicleObjectTemplate::getTurnRate(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedVehicleObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getTurnRate(true); +#endif } if (!m_turnRate.isLoaded()) @@ -589,16 +689,31 @@ float SharedVehicleObjectTemplate::getTurnRate() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedVehicleObjectTemplate::getTurnRate -float SharedVehicleObjectTemplate::getTurnRateMin() const +float SharedVehicleObjectTemplate::getTurnRateMin(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedVehicleObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getTurnRateMin(true); +#endif } if (!m_turnRate.isLoaded()) @@ -638,16 +753,31 @@ float SharedVehicleObjectTemplate::getTurnRateMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedVehicleObjectTemplate::getTurnRateMin -float SharedVehicleObjectTemplate::getTurnRateMax() const +float SharedVehicleObjectTemplate::getTurnRateMax(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedVehicleObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getTurnRateMax(true); +#endif } if (!m_turnRate.isLoaded()) @@ -687,16 +817,31 @@ float SharedVehicleObjectTemplate::getTurnRateMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedVehicleObjectTemplate::getTurnRateMax -float SharedVehicleObjectTemplate::getMaxVelocity() const +float SharedVehicleObjectTemplate::getMaxVelocity(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedVehicleObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getMaxVelocity(true); +#endif } if (!m_maxVelocity.isLoaded()) @@ -736,16 +881,31 @@ float SharedVehicleObjectTemplate::getMaxVelocity() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedVehicleObjectTemplate::getMaxVelocity -float SharedVehicleObjectTemplate::getMaxVelocityMin() const +float SharedVehicleObjectTemplate::getMaxVelocityMin(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedVehicleObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getMaxVelocityMin(true); +#endif } if (!m_maxVelocity.isLoaded()) @@ -785,16 +945,31 @@ float SharedVehicleObjectTemplate::getMaxVelocityMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedVehicleObjectTemplate::getMaxVelocityMin -float SharedVehicleObjectTemplate::getMaxVelocityMax() const +float SharedVehicleObjectTemplate::getMaxVelocityMax(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedVehicleObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getMaxVelocityMax(true); +#endif } if (!m_maxVelocity.isLoaded()) @@ -834,16 +1009,31 @@ float SharedVehicleObjectTemplate::getMaxVelocityMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedVehicleObjectTemplate::getMaxVelocityMax -float SharedVehicleObjectTemplate::getAcceleration() const +float SharedVehicleObjectTemplate::getAcceleration(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedVehicleObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getAcceleration(true); +#endif } if (!m_acceleration.isLoaded()) @@ -883,16 +1073,31 @@ float SharedVehicleObjectTemplate::getAcceleration() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedVehicleObjectTemplate::getAcceleration -float SharedVehicleObjectTemplate::getAccelerationMin() const +float SharedVehicleObjectTemplate::getAccelerationMin(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedVehicleObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getAccelerationMin(true); +#endif } if (!m_acceleration.isLoaded()) @@ -932,16 +1137,31 @@ float SharedVehicleObjectTemplate::getAccelerationMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedVehicleObjectTemplate::getAccelerationMin -float SharedVehicleObjectTemplate::getAccelerationMax() const +float SharedVehicleObjectTemplate::getAccelerationMax(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedVehicleObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getAccelerationMax(true); +#endif } if (!m_acceleration.isLoaded()) @@ -981,16 +1201,31 @@ float SharedVehicleObjectTemplate::getAccelerationMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedVehicleObjectTemplate::getAccelerationMax -float SharedVehicleObjectTemplate::getBraking() const +float SharedVehicleObjectTemplate::getBraking(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedVehicleObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getBraking(true); +#endif } if (!m_braking.isLoaded()) @@ -1030,16 +1265,31 @@ float SharedVehicleObjectTemplate::getBraking() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedVehicleObjectTemplate::getBraking -float SharedVehicleObjectTemplate::getBrakingMin() const +float SharedVehicleObjectTemplate::getBrakingMin(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedVehicleObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getBrakingMin(true); +#endif } if (!m_braking.isLoaded()) @@ -1079,16 +1329,31 @@ float SharedVehicleObjectTemplate::getBrakingMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedVehicleObjectTemplate::getBrakingMin -float SharedVehicleObjectTemplate::getBrakingMax() const +float SharedVehicleObjectTemplate::getBrakingMax(bool testData) const { +#ifdef _DEBUG +float testDataValue = 0.0f; +#else +UNREF(testData); +#endif + const SharedVehicleObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getBrakingMax(true); +#endif } if (!m_braking.isLoaded()) @@ -1128,10 +1393,37 @@ float SharedVehicleObjectTemplate::getBrakingMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedVehicleObjectTemplate::getBrakingMax +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void SharedVehicleObjectTemplate::testValues(void) const +{ + IGNORE_RETURN(getSlopeAversionMin(true)); + IGNORE_RETURN(getSlopeAversionMax(true)); + IGNORE_RETURN(getHoverValueMin(true)); + IGNORE_RETURN(getHoverValueMax(true)); + IGNORE_RETURN(getTurnRateMin(true)); + IGNORE_RETURN(getTurnRateMax(true)); + IGNORE_RETURN(getMaxVelocityMin(true)); + IGNORE_RETURN(getMaxVelocityMax(true)); + IGNORE_RETURN(getAccelerationMin(true)); + IGNORE_RETURN(getAccelerationMax(true)); + IGNORE_RETURN(getBrakingMin(true)); + IGNORE_RETURN(getBrakingMax(true)); + SharedTangibleObjectTemplate::testValues(); +} // SharedVehicleObjectTemplate::testValues +#endif + /** * Loads the template data from an iff file. We should already be in the form * for this template. @@ -1140,8 +1432,8 @@ float SharedVehicleObjectTemplate::getBrakingMax() const */ void SharedVehicleObjectTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != SharedVehicleObjectTemplate_tag) { @@ -1151,7 +1443,7 @@ void SharedVehicleObjectTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -1171,8 +1463,10 @@ void SharedVehicleObjectTemplate::load(Iff &file) file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 0, 0)) + if (getHighestTemplateVersion() != TAG(0,0,0,0)) { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); m_versionOk = false; } @@ -1220,4 +1514,4 @@ void SharedVehicleObjectTemplate::load(Iff &file) return; } // SharedVehicleObjectTemplate::load -//@END TFD \ No newline at end of file +//@END TFD diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedVehicleObjectTemplate.h b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedVehicleObjectTemplate.h old mode 100755 new mode 100644 index 739aec05..4da4d4c1 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedVehicleObjectTemplate.h +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedVehicleObjectTemplate.h @@ -58,25 +58,30 @@ public: float getSpeed(MovementTypes index) const; float getSpeedMin(MovementTypes index) const; float getSpeedMax(MovementTypes index) const; - float getSlopeAversion() const; - float getSlopeAversionMin() const; - float getSlopeAversionMax() const; - float getHoverValue() const; - float getHoverValueMin() const; - float getHoverValueMax() const; - float getTurnRate() const; - float getTurnRateMin() const; - float getTurnRateMax() const; - float getMaxVelocity() const; - float getMaxVelocityMin() const; - float getMaxVelocityMax() const; - float getAcceleration() const; - float getAccelerationMin() const; - float getAccelerationMax() const; - float getBraking() const; - float getBrakingMin() const; - float getBrakingMax() const; + float getSlopeAversion(bool testData = false) const; + float getSlopeAversionMin(bool testData = false) const; + float getSlopeAversionMax(bool testData = false) const; + float getHoverValue(bool testData = false) const; + float getHoverValueMin(bool testData = false) const; + float getHoverValueMax(bool testData = false) const; + float getTurnRate(bool testData = false) const; + float getTurnRateMin(bool testData = false) const; + float getTurnRateMax(bool testData = false) const; + float getMaxVelocity(bool testData = false) const; + float getMaxVelocityMin(bool testData = false) const; + float getMaxVelocityMax(bool testData = false) const; + float getAcceleration(bool testData = false) const; + float getAccelerationMin(bool testData = false) const; + float getAccelerationMax(bool testData = false) const; + float getBraking(bool testData = false) const; + float getBrakingMin(bool testData = false) const; + float getBrakingMax(bool testData = false) const; +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedWaypointObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedWaypointObjectTemplate.cpp old mode 100755 new mode 100644 index d5c089f9..2d82cd46 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedWaypointObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedWaypointObjectTemplate.cpp @@ -23,20 +23,20 @@ const std::string DefaultString(""); const StringId DefaultStringId("", 0); -const Vector DefaultVector(0, 0, 0); +const Vector DefaultVector(0,0,0); const TriggerVolumeData DefaultTriggerVolumeData; bool SharedWaypointObjectTemplate::ms_allowDefaultTemplateParams = true; + /** * Class constructor. */ SharedWaypointObjectTemplate::SharedWaypointObjectTemplate(const std::string & filename) //@BEGIN TFD INIT : SharedIntangibleObjectTemplate(filename) - , m_versionOk(true) - , m_templateVersion(0) - //@END TFD INIT + ,m_versionOk(true) +//@END TFD INIT { } // SharedWaypointObjectTemplate::SharedWaypointObjectTemplate @@ -45,8 +45,8 @@ SharedWaypointObjectTemplate::SharedWaypointObjectTemplate(const std::string & f */ SharedWaypointObjectTemplate::~SharedWaypointObjectTemplate() { - //@BEGIN TFD CLEANUP - //@END TFD CLEANUP +//@BEGIN TFD CLEANUP +//@END TFD CLEANUP } // SharedWaypointObjectTemplate::~SharedWaypointObjectTemplate /** @@ -103,6 +103,15 @@ Tag SharedWaypointObjectTemplate::getHighestTemplateVersion(void) const } // SharedWaypointObjectTemplate::getHighestTemplateVersion //@BEGIN TFD +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void SharedWaypointObjectTemplate::testValues(void) const +{ + SharedIntangibleObjectTemplate::testValues(); +} // SharedWaypointObjectTemplate::testValues +#endif /** * Loads the template data from an iff file. We should already be in the form @@ -112,8 +121,8 @@ Tag SharedWaypointObjectTemplate::getHighestTemplateVersion(void) const */ void SharedWaypointObjectTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != SharedWaypointObjectTemplate_tag) { @@ -123,7 +132,7 @@ void SharedWaypointObjectTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -143,8 +152,10 @@ void SharedWaypointObjectTemplate::load(Iff &file) file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 0, 0)) + if (getHighestTemplateVersion() != TAG(0,0,0,0)) { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); m_versionOk = false; } @@ -162,4 +173,4 @@ void SharedWaypointObjectTemplate::load(Iff &file) return; } // SharedWaypointObjectTemplate::load -//@END TFD \ No newline at end of file +//@END TFD diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedWaypointObjectTemplate.h b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedWaypointObjectTemplate.h old mode 100755 new mode 100644 index 7bb0e2ec..4fb31a6b --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedWaypointObjectTemplate.h +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedWaypointObjectTemplate.h @@ -45,6 +45,11 @@ public: //@BEGIN TFD public: +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedWeaponObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedWeaponObjectTemplate.cpp old mode 100755 new mode 100644 index 8190a334..193d4ac7 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedWeaponObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedWeaponObjectTemplate.cpp @@ -23,20 +23,20 @@ const std::string DefaultString(""); const StringId DefaultStringId("", 0); -const Vector DefaultVector(0, 0, 0); +const Vector DefaultVector(0,0,0); const TriggerVolumeData DefaultTriggerVolumeData; bool SharedWeaponObjectTemplate::ms_allowDefaultTemplateParams = true; + /** * Class constructor. */ SharedWeaponObjectTemplate::SharedWeaponObjectTemplate(const std::string & filename) //@BEGIN TFD INIT : SharedTangibleObjectTemplate(filename) - , m_versionOk(true) - , m_templateVersion(0) - //@END TFD INIT + ,m_versionOk(true) +//@END TFD INIT { } // SharedWeaponObjectTemplate::SharedWeaponObjectTemplate @@ -45,8 +45,8 @@ SharedWeaponObjectTemplate::SharedWeaponObjectTemplate(const std::string & filen */ SharedWeaponObjectTemplate::~SharedWeaponObjectTemplate() { - //@BEGIN TFD CLEANUP - //@END TFD CLEANUP +//@BEGIN TFD CLEANUP +//@END TFD CLEANUP } // SharedWeaponObjectTemplate::~SharedWeaponObjectTemplate /** @@ -103,12 +103,22 @@ Tag SharedWeaponObjectTemplate::getHighestTemplateVersion(void) const } // SharedWeaponObjectTemplate::getHighestTemplateVersion //@BEGIN TFD -const std::string & SharedWeaponObjectTemplate::getWeaponEffect() const +const std::string & SharedWeaponObjectTemplate::getWeaponEffect(bool testData) const { +#ifdef _DEBUG +std::string testDataValue = DefaultString; +#else +UNREF(testData); +#endif + const SharedWeaponObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getWeaponEffect(true); +#endif } if (!m_weaponEffect.isLoaded()) @@ -126,16 +136,31 @@ const std::string & SharedWeaponObjectTemplate::getWeaponEffect() const } const std::string & value = m_weaponEffect.getValue(); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedWeaponObjectTemplate::getWeaponEffect -int SharedWeaponObjectTemplate::getWeaponEffectIndex() const +int SharedWeaponObjectTemplate::getWeaponEffectIndex(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const SharedWeaponObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getWeaponEffectIndex(true); +#endif } if (!m_weaponEffectIndex.isLoaded()) @@ -175,16 +200,31 @@ int SharedWeaponObjectTemplate::getWeaponEffectIndex() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedWeaponObjectTemplate::getWeaponEffectIndex -int SharedWeaponObjectTemplate::getWeaponEffectIndexMin() const +int SharedWeaponObjectTemplate::getWeaponEffectIndexMin(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const SharedWeaponObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getWeaponEffectIndexMin(true); +#endif } if (!m_weaponEffectIndex.isLoaded()) @@ -224,16 +264,31 @@ int SharedWeaponObjectTemplate::getWeaponEffectIndexMin() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedWeaponObjectTemplate::getWeaponEffectIndexMin -int SharedWeaponObjectTemplate::getWeaponEffectIndexMax() const +int SharedWeaponObjectTemplate::getWeaponEffectIndexMax(bool testData) const { +#ifdef _DEBUG +int testDataValue = 0; +#else +UNREF(testData); +#endif + const SharedWeaponObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getWeaponEffectIndexMax(true); +#endif } if (!m_weaponEffectIndex.isLoaded()) @@ -273,16 +328,31 @@ int SharedWeaponObjectTemplate::getWeaponEffectIndexMax() const else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedWeaponObjectTemplate::getWeaponEffectIndexMax -SharedWeaponObjectTemplate::AttackType SharedWeaponObjectTemplate::getAttackType() const +SharedWeaponObjectTemplate::AttackType SharedWeaponObjectTemplate::getAttackType(bool testData) const { +#ifdef _DEBUG +SharedWeaponObjectTemplate::AttackType testDataValue = static_cast(0); +#else +UNREF(testData); +#endif + const SharedWeaponObjectTemplate * base = nullptr; if (m_baseData != nullptr) { base = dynamic_cast(m_baseData); +#ifdef _DEBUG + if (testData && base != nullptr) + testDataValue = base->getAttackType(true); +#endif } if (!m_attackType.isLoaded()) @@ -300,10 +370,29 @@ SharedWeaponObjectTemplate::AttackType SharedWeaponObjectTemplate::getAttackType } AttackType value = static_cast(m_attackType.getValue()); +#ifdef _DEBUG + if (testData && base != nullptr) + { + } +#endif return value; } // SharedWeaponObjectTemplate::getAttackType +#ifdef _DEBUG +/** + * Special function used by datalint. Checks for duplicate values in base and derived templates. + */ +void SharedWeaponObjectTemplate::testValues(void) const +{ + IGNORE_RETURN(getWeaponEffect(true)); + IGNORE_RETURN(getWeaponEffectIndexMin(true)); + IGNORE_RETURN(getWeaponEffectIndexMax(true)); + IGNORE_RETURN(getAttackType(true)); + SharedTangibleObjectTemplate::testValues(); +} // SharedWeaponObjectTemplate::testValues +#endif + /** * Loads the template data from an iff file. We should already be in the form * for this template. @@ -312,8 +401,8 @@ SharedWeaponObjectTemplate::AttackType SharedWeaponObjectTemplate::getAttackType */ void SharedWeaponObjectTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != SharedWeaponObjectTemplate_tag) { @@ -323,7 +412,7 @@ void SharedWeaponObjectTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -343,8 +432,10 @@ void SharedWeaponObjectTemplate::load(Iff &file) file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 0, 4)) + if (getHighestTemplateVersion() != TAG(0,0,0,4)) { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); m_versionOk = false; } @@ -372,4 +463,4 @@ void SharedWeaponObjectTemplate::load(Iff &file) return; } // SharedWeaponObjectTemplate::load -//@END TFD \ No newline at end of file +//@END TFD diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedWeaponObjectTemplate.h b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedWeaponObjectTemplate.h old mode 100755 new mode 100644 index ddcf638c..ba4d771c --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedWeaponObjectTemplate.h +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedWeaponObjectTemplate.h @@ -54,12 +54,17 @@ public: }; public: - const std::string & getWeaponEffect() const; - int getWeaponEffectIndex() const; - int getWeaponEffectIndexMin() const; - int getWeaponEffectIndexMax() const; - AttackType getAttackType() const; + const std::string & getWeaponEffect(bool testData = false) const; + int getWeaponEffectIndex(bool testData = false) const; + int getWeaponEffectIndexMin(bool testData = false) const; + int getWeaponEffectIndexMax(bool testData = false) const; + AttackType getAttackType(bool testData = false) const; +#ifdef _DEBUG +public: + // special code used by datalint + virtual void testValues(void) const; +#endif protected: virtual void load(Iff &file); diff --git a/engine/shared/library/sharedTemplate/src/CMakeLists.txt b/engine/shared/library/sharedTemplate/src/CMakeLists.txt index 1bd3b95f..075e9766 100644 --- a/engine/shared/library/sharedTemplate/src/CMakeLists.txt +++ b/engine/shared/library/sharedTemplate/src/CMakeLists.txt @@ -38,16 +38,22 @@ set(SHARED_SOURCES shared/template/ServerManufactureInstallationObjectTemplate.h shared/template/ServerManufactureSchematicObjectTemplate.cpp shared/template/ServerManufactureSchematicObjectTemplate.h + shared/template/ServerMissionBoardObjectTemplate.cpp + shared/template/ServerMissionBoardObjectTemplate.h + shared/template/ServerMissionDataObjectTemplate.cpp + shared/template/ServerMissionDataObjectTemplate.h + shared/template/ServerMissionListEntryObjectTemplate.cpp + shared/template/ServerMissionListEntryObjectTemplate.h shared/template/ServerMissionObjectTemplate.cpp shared/template/ServerMissionObjectTemplate.h shared/template/ServerObjectTemplate.cpp shared/template/ServerObjectTemplate.h shared/template/ServerPlanetObjectTemplate.cpp shared/template/ServerPlanetObjectTemplate.h - shared/template/ServerPlayerQuestObjectTemplate.cpp - shared/template/ServerPlayerQuestObjectTemplate.h shared/template/ServerPlayerObjectTemplate.cpp shared/template/ServerPlayerObjectTemplate.h + shared/template/ServerPlayerQuestObjectTemplate.cpp + shared/template/ServerPlayerQuestObjectTemplate.h shared/template/ServerResourceClassObjectTemplate.cpp shared/template/ServerResourceClassObjectTemplate.h shared/template/ServerResourceContainerObjectTemplate.cpp @@ -102,6 +108,10 @@ set(SHARED_SOURCES shared/template/SharedJediManagerObjectTemplate.h shared/template/SharedManufactureSchematicObjectTemplate.cpp shared/template/SharedManufactureSchematicObjectTemplate.h + shared/template/SharedMissionDataObjectTemplate.cpp + shared/template/SharedMissionDataObjectTemplate.h + shared/template/SharedMissionListEntryObjectTemplate.cpp + shared/template/SharedMissionListEntryObjectTemplate.h shared/template/SharedMissionObjectTemplate.cpp shared/template/SharedMissionObjectTemplate.h shared/template/SharedObjectTemplate.cpp @@ -129,7 +139,7 @@ set(SHARED_SOURCES shared/template/SharedWaypointObjectTemplate.cpp shared/template/SharedWaypointObjectTemplate.h shared/template/SharedWeaponObjectTemplate.cpp - shared/template/SharedWeaponObjectTemplate.h + shared/template/SharedWeaponObjectTemplate.h ) if(WIN32) diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerArmorTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerArmorTemplate.cpp old mode 100755 new mode 100644 index 4ca36d87..f4833a9e --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerArmorTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerArmorTemplate.cpp @@ -17,9 +17,9 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" +#include + -#include -#include /** * Class constructor. @@ -27,11 +27,9 @@ ServerArmorTemplate::ServerArmorTemplate(const std::string & filename) //@BEGIN TFD INIT : TpfTemplate(filename) - , m_specialProtectionLoaded(false) - , m_specialProtectionAppend(false) - , m_templateVersion(0) - , m_versionOk(false) - //@END TFD INIT + ,m_specialProtectionLoaded(false) + ,m_specialProtectionAppend(false) +//@END TFD INIT { } // ServerArmorTemplate::ServerArmorTemplate @@ -40,7 +38,7 @@ ServerArmorTemplate::ServerArmorTemplate(const std::string & filename) */ ServerArmorTemplate::~ServerArmorTemplate() { - //@BEGIN TFD CLEANUP +//@BEGIN TFD CLEANUP { std::vector::iterator iter; for (iter = m_specialProtection.begin(); iter != m_specialProtection.end(); ++iter) @@ -50,7 +48,7 @@ ServerArmorTemplate::~ServerArmorTemplate() } m_specialProtection.clear(); } - //@END TFD CLEANUP +//@END TFD CLEANUP } // ServerArmorTemplate::~ServerArmorTemplate /** @@ -98,10 +96,10 @@ Tag ServerArmorTemplate::getTemplateVersion(void) const */ Tag ServerArmorTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerArmorTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerArmorTemplate::getHighestTemplateVersion @@ -275,6 +273,7 @@ bool ServerArmorTemplate::isAppend(const char *name) const return TpfTemplate::isAppend(name); } // ServerArmorTemplate::isAppend + int ServerArmorTemplate::getListLength(const char *name) const { if (strcmp(name, "specialProtection") == 0) @@ -297,8 +296,8 @@ int ServerArmorTemplate::getListLength(const char *name) const */ void ServerArmorTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != ServerArmorTemplate_tag) { @@ -308,7 +307,7 @@ void ServerArmorTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -328,7 +327,7 @@ void ServerArmorTemplate::load(Iff &file) file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 0, 1)) + if (getHighestTemplateVersion() != TAG(0,0,0,1)) { if (DataLint::isEnabled()) DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); @@ -401,18 +400,18 @@ void ServerArmorTemplate::load(Iff &file) */ void ServerArmorTemplate::save(Iff &file) { - int count; +int count; file.insertForm(ServerArmorTemplate_tag); if (m_baseTemplateName.size() != 0) { - file.insertForm(TAG(D, E, R, V)); + file.insertForm(TAG(D,E,R,V)); file.insertChunk(TAG(X, X, X, X)); file.insertChunkData(m_baseTemplateName.c_str(), m_baseTemplateName.size() + 1); file.exitChunk(); file.exitForm(); } - file.insertForm(TAG(0, 0, 0, 1)); + file.insertForm(TAG(0,0,0,1)); file.allowNonlinearFunctions(); int paramCount = 0; @@ -447,7 +446,7 @@ void ServerArmorTemplate::save(Iff &file) count = m_specialProtection.size(); file.insertChunkData(&count, sizeof(count)); {for (int i = 0; i < count; ++i) - m_specialProtection[i]->saveToIff(file); } + m_specialProtection[i]->saveToIff(file);} file.exitChunk(); ++paramCount; // save vulnerability @@ -462,7 +461,7 @@ void ServerArmorTemplate::save(Iff &file) count = 3; file.insertChunkData(&count, sizeof(count)); {for (int i = 0; i < 3; ++i) - m_encumbrance[i].saveToIff(file); } + m_encumbrance[i].saveToIff(file);} file.exitChunk(); ++paramCount; @@ -477,6 +476,7 @@ void ServerArmorTemplate::save(Iff &file) file.exitForm(); } // ServerArmorTemplate::save + //============================================================================= // class ServerArmorTemplate::_SpecialProtection @@ -620,6 +620,7 @@ bool ServerArmorTemplate::_SpecialProtection::isAppend(const char *name) const return TpfTemplate::isAppend(name); } // ServerArmorTemplate::_SpecialProtection::isAppend + int ServerArmorTemplate::_SpecialProtection::getListLength(const char *name) const { return TpfTemplate::getListLength(name); @@ -633,8 +634,8 @@ int ServerArmorTemplate::_SpecialProtection::getListLength(const char *name) con */ void ServerArmorTemplate::_SpecialProtection::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; file.enterForm(); @@ -664,7 +665,7 @@ void ServerArmorTemplate::_SpecialProtection::load(Iff &file) */ void ServerArmorTemplate::_SpecialProtection::save(Iff &file) { - int count; +int count; file.insertForm(_SpecialProtection_tag); @@ -693,4 +694,4 @@ void ServerArmorTemplate::_SpecialProtection::save(Iff &file) UNREF(count); } // ServerArmorTemplate::_SpecialProtection::save -//@END TFD \ No newline at end of file +//@END TFD diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerArmorTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/ServerArmorTemplate.h old mode 100755 new mode 100644 index cbab71e9..6059faeb --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerArmorTemplate.h +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerArmorTemplate.h @@ -54,7 +54,6 @@ public: enum DamageType { - DT_none = 0x00000000, DT_kinetic = 0x00000001, DT_energy = 0x00000002, DT_blast = 0x00000004, diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerBattlefieldMarkerObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerBattlefieldMarkerObjectTemplate.cpp old mode 100755 new mode 100644 index aa5440ae..acc6a7be --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerBattlefieldMarkerObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerBattlefieldMarkerObjectTemplate.cpp @@ -17,8 +17,7 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include -#include +#include @@ -86,10 +85,10 @@ Tag ServerBattlefieldMarkerObjectTemplate::getTemplateVersion(void) const */ Tag ServerBattlefieldMarkerObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerBattlefieldMarkerObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerBattlefieldMarkerObjectTemplate::getHighestTemplateVersion diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerBattlefieldMarkerObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/ServerBattlefieldMarkerObjectTemplate.h old mode 100755 new mode 100644 diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerBuildingObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerBuildingObjectTemplate.cpp old mode 100755 new mode 100644 index 40cf8c4e..8034821e --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerBuildingObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerBuildingObjectTemplate.cpp @@ -17,8 +17,7 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include -#include +#include @@ -86,10 +85,10 @@ Tag ServerBuildingObjectTemplate::getTemplateVersion(void) const */ Tag ServerBuildingObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerBuildingObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerBuildingObjectTemplate::getHighestTemplateVersion diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerBuildingObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/ServerBuildingObjectTemplate.h old mode 100755 new mode 100644 diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerCellObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerCellObjectTemplate.cpp old mode 100755 new mode 100644 index 427b3931..2ce56ebd --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerCellObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerCellObjectTemplate.cpp @@ -17,8 +17,7 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include -#include +#include @@ -86,10 +85,10 @@ Tag ServerCellObjectTemplate::getTemplateVersion(void) const */ Tag ServerCellObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerCellObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerCellObjectTemplate::getHighestTemplateVersion diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerCellObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/ServerCellObjectTemplate.h old mode 100755 new mode 100644 diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerCityObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerCityObjectTemplate.cpp old mode 100755 new mode 100644 index ac48b340..96403997 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerCityObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerCityObjectTemplate.cpp @@ -17,8 +17,7 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include -#include +#include @@ -86,10 +85,10 @@ Tag ServerCityObjectTemplate::getTemplateVersion(void) const */ Tag ServerCityObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerCityObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerCityObjectTemplate::getHighestTemplateVersion diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerCityObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/ServerCityObjectTemplate.h old mode 100755 new mode 100644 diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerConstructionContractObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerConstructionContractObjectTemplate.cpp old mode 100755 new mode 100644 index 73096b66..eca662c2 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerConstructionContractObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerConstructionContractObjectTemplate.cpp @@ -17,8 +17,7 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include -#include +#include @@ -86,10 +85,10 @@ Tag ServerConstructionContractObjectTemplate::getTemplateVersion(void) const */ Tag ServerConstructionContractObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerConstructionContractObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerConstructionContractObjectTemplate::getHighestTemplateVersion diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerConstructionContractObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/ServerConstructionContractObjectTemplate.h old mode 100755 new mode 100644 diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerCreatureObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerCreatureObjectTemplate.cpp old mode 100755 new mode 100644 index f70b5fd7..989ea73e --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerCreatureObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerCreatureObjectTemplate.cpp @@ -17,8 +17,9 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include -#include +#include + + /** * Class constructor. @@ -26,11 +27,9 @@ ServerCreatureObjectTemplate::ServerCreatureObjectTemplate(const std::string & filename) //@BEGIN TFD INIT : ServerTangibleObjectTemplate(filename) - , m_attribModsLoaded(false) - , m_attribModsAppend(false) - , m_templateVersion(0) - , m_versionOk(false) - //@END TFD INIT + ,m_attribModsLoaded(false) + ,m_attribModsAppend(false) +//@END TFD INIT { } // ServerCreatureObjectTemplate::ServerCreatureObjectTemplate @@ -39,7 +38,7 @@ ServerCreatureObjectTemplate::ServerCreatureObjectTemplate(const std::string & f */ ServerCreatureObjectTemplate::~ServerCreatureObjectTemplate() { - //@BEGIN TFD CLEANUP +//@BEGIN TFD CLEANUP { std::vector::iterator iter; for (iter = m_attribMods.begin(); iter != m_attribMods.end(); ++iter) @@ -49,7 +48,7 @@ ServerCreatureObjectTemplate::~ServerCreatureObjectTemplate() } m_attribMods.clear(); } - //@END TFD CLEANUP +//@END TFD CLEANUP } // ServerCreatureObjectTemplate::~ServerCreatureObjectTemplate /** @@ -97,10 +96,10 @@ Tag ServerCreatureObjectTemplate::getTemplateVersion(void) const */ Tag ServerCreatureObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerCreatureObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerCreatureObjectTemplate::getHighestTemplateVersion @@ -406,6 +405,7 @@ bool ServerCreatureObjectTemplate::isAppend(const char *name) const return ServerTangibleObjectTemplate::isAppend(name); } // ServerCreatureObjectTemplate::isAppend + int ServerCreatureObjectTemplate::getListLength(const char *name) const { if (strcmp(name, "attributes") == 0) @@ -444,8 +444,8 @@ int ServerCreatureObjectTemplate::getListLength(const char *name) const */ void ServerCreatureObjectTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != ServerCreatureObjectTemplate_tag) { @@ -455,7 +455,7 @@ void ServerCreatureObjectTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -475,7 +475,7 @@ void ServerCreatureObjectTemplate::load(Iff &file) file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 0, 5)) + if (getHighestTemplateVersion() != TAG(0,0,0,5)) { if (DataLint::isEnabled()) DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); @@ -614,18 +614,18 @@ void ServerCreatureObjectTemplate::load(Iff &file) */ void ServerCreatureObjectTemplate::save(Iff &file) { - int count; +int count; file.insertForm(ServerCreatureObjectTemplate_tag); if (m_baseTemplateName.size() != 0) { - file.insertForm(TAG(D, E, R, V)); + file.insertForm(TAG(D,E,R,V)); file.insertChunk(TAG(X, X, X, X)); file.insertChunkData(m_baseTemplateName.c_str(), m_baseTemplateName.size() + 1); file.exitChunk(); file.exitForm(); } - file.insertForm(TAG(0, 0, 0, 5)); + file.insertForm(TAG(0,0,0,5)); file.allowNonlinearFunctions(); int paramCount = 0; @@ -642,7 +642,7 @@ void ServerCreatureObjectTemplate::save(Iff &file) count = 6; file.insertChunkData(&count, sizeof(count)); {for (int i = 0; i < 6; ++i) - m_attributes[i].saveToIff(file); } + m_attributes[i].saveToIff(file);} file.exitChunk(); ++paramCount; // save minAttributes @@ -651,7 +651,7 @@ void ServerCreatureObjectTemplate::save(Iff &file) count = 6; file.insertChunkData(&count, sizeof(count)); {for (int i = 0; i < 6; ++i) - m_minAttributes[i].saveToIff(file); } + m_minAttributes[i].saveToIff(file);} file.exitChunk(); ++paramCount; // save maxAttributes @@ -660,7 +660,7 @@ void ServerCreatureObjectTemplate::save(Iff &file) count = 6; file.insertChunkData(&count, sizeof(count)); {for (int i = 0; i < 6; ++i) - m_maxAttributes[i].saveToIff(file); } + m_maxAttributes[i].saveToIff(file);} file.exitChunk(); ++paramCount; // save minDrainModifier @@ -699,7 +699,7 @@ void ServerCreatureObjectTemplate::save(Iff &file) count = m_attribMods.size(); file.insertChunkData(&count, sizeof(count)); {for (int i = 0; i < count; ++i) - m_attribMods[i]->saveToIff(file); } + m_attribMods[i]->saveToIff(file);} file.exitChunk(); ++paramCount; // save shockWounds @@ -732,7 +732,7 @@ void ServerCreatureObjectTemplate::save(Iff &file) count = 4; file.insertChunkData(&count, sizeof(count)); {for (int i = 0; i < 4; ++i) - m_maxMentalStates[i].saveToIff(file); } + m_maxMentalStates[i].saveToIff(file);} file.exitChunk(); ++paramCount; // save mentalStatesDecay @@ -741,7 +741,7 @@ void ServerCreatureObjectTemplate::save(Iff &file) count = 4; file.insertChunkData(&count, sizeof(count)); {for (int i = 0; i < 4; ++i) - m_mentalStatesDecay[i].saveToIff(file); } + m_mentalStatesDecay[i].saveToIff(file);} file.exitChunk(); ++paramCount; @@ -756,4 +756,4 @@ void ServerCreatureObjectTemplate::save(Iff &file) file.exitForm(); } // ServerCreatureObjectTemplate::save -//@END TFD \ No newline at end of file +//@END TFD diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerCreatureObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/ServerCreatureObjectTemplate.h old mode 100755 new mode 100644 diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerDraftSchematicObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerDraftSchematicObjectTemplate.cpp old mode 100755 new mode 100644 index e86547a9..52a830bd --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerDraftSchematicObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerDraftSchematicObjectTemplate.cpp @@ -17,8 +17,9 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include -#include +#include + + /** * Class constructor. @@ -26,15 +27,13 @@ ServerDraftSchematicObjectTemplate::ServerDraftSchematicObjectTemplate(const std::string & filename) //@BEGIN TFD INIT : ServerIntangibleObjectTemplate(filename) - , m_slotsLoaded(false) - , m_slotsAppend(false) - , m_skillCommandsLoaded(false) - , m_skillCommandsAppend(false) - , m_manufactureScriptsLoaded(false) - , m_manufactureScriptsAppend(false) - , m_templateVersion(0) - , m_versionOk(false) - //@END TFD INIT + ,m_slotsLoaded(false) + ,m_slotsAppend(false) + ,m_skillCommandsLoaded(false) + ,m_skillCommandsAppend(false) + ,m_manufactureScriptsLoaded(false) + ,m_manufactureScriptsAppend(false) +//@END TFD INIT { } // ServerDraftSchematicObjectTemplate::ServerDraftSchematicObjectTemplate @@ -43,7 +42,7 @@ ServerDraftSchematicObjectTemplate::ServerDraftSchematicObjectTemplate(const std */ ServerDraftSchematicObjectTemplate::~ServerDraftSchematicObjectTemplate() { - //@BEGIN TFD CLEANUP +//@BEGIN TFD CLEANUP { std::vector::iterator iter; for (iter = m_slots.begin(); iter != m_slots.end(); ++iter) @@ -71,7 +70,7 @@ ServerDraftSchematicObjectTemplate::~ServerDraftSchematicObjectTemplate() } m_manufactureScripts.clear(); } - //@END TFD CLEANUP +//@END TFD CLEANUP } // ServerDraftSchematicObjectTemplate::~ServerDraftSchematicObjectTemplate /** @@ -119,10 +118,10 @@ Tag ServerDraftSchematicObjectTemplate::getTemplateVersion(void) const */ Tag ServerDraftSchematicObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerDraftSchematicObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerDraftSchematicObjectTemplate::getHighestTemplateVersion @@ -372,6 +371,7 @@ bool ServerDraftSchematicObjectTemplate::isAppend(const char *name) const return ServerIntangibleObjectTemplate::isAppend(name); } // ServerDraftSchematicObjectTemplate::isAppend + int ServerDraftSchematicObjectTemplate::getListLength(const char *name) const { if (strcmp(name, "slots") == 0) @@ -398,8 +398,8 @@ int ServerDraftSchematicObjectTemplate::getListLength(const char *name) const */ void ServerDraftSchematicObjectTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != ServerDraftSchematicObjectTemplate_tag) { @@ -409,7 +409,7 @@ void ServerDraftSchematicObjectTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -429,7 +429,7 @@ void ServerDraftSchematicObjectTemplate::load(Iff &file) file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 0, 7)) + if (getHighestTemplateVersion() != TAG(0,0,0,7)) { if (DataLint::isEnabled()) DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); @@ -532,18 +532,18 @@ void ServerDraftSchematicObjectTemplate::load(Iff &file) */ void ServerDraftSchematicObjectTemplate::save(Iff &file) { - int count; +int count; file.insertForm(ServerDraftSchematicObjectTemplate_tag); if (m_baseTemplateName.size() != 0) { - file.insertForm(TAG(D, E, R, V)); + file.insertForm(TAG(D,E,R,V)); file.insertChunk(TAG(X, X, X, X)); file.insertChunkData(m_baseTemplateName.c_str(), m_baseTemplateName.size() + 1); file.exitChunk(); file.exitForm(); } - file.insertForm(TAG(0, 0, 0, 7)); + file.insertForm(TAG(0,0,0,7)); file.allowNonlinearFunctions(); int paramCount = 0; @@ -578,7 +578,7 @@ void ServerDraftSchematicObjectTemplate::save(Iff &file) count = m_slots.size(); file.insertChunkData(&count, sizeof(count)); {for (int i = 0; i < count; ++i) - m_slots[i]->saveToIff(file); } + m_slots[i]->saveToIff(file);} file.exitChunk(); ++paramCount; if (!m_skillCommandsLoaded) @@ -593,7 +593,7 @@ void ServerDraftSchematicObjectTemplate::save(Iff &file) count = m_skillCommands.size(); file.insertChunkData(&count, sizeof(count)); {for (int i = 0; i < count; ++i) - m_skillCommands[i]->saveToIff(file); } + m_skillCommands[i]->saveToIff(file);} file.exitChunk(); ++paramCount; // save destroyIngredients @@ -614,7 +614,7 @@ void ServerDraftSchematicObjectTemplate::save(Iff &file) count = m_manufactureScripts.size(); file.insertChunkData(&count, sizeof(count)); {for (int i = 0; i < count; ++i) - m_manufactureScripts[i]->saveToIff(file); } + m_manufactureScripts[i]->saveToIff(file);} file.exitChunk(); ++paramCount; // save itemsPerContainer @@ -647,6 +647,7 @@ void ServerDraftSchematicObjectTemplate::save(Iff &file) file.exitForm(); } // ServerDraftSchematicObjectTemplate::save + //============================================================================= // class ServerDraftSchematicObjectTemplate::_IngredientSlot @@ -655,8 +656,8 @@ void ServerDraftSchematicObjectTemplate::save(Iff &file) */ ServerDraftSchematicObjectTemplate::_IngredientSlot::_IngredientSlot(const std::string & filename) : TpfTemplate(filename) - , m_optionsLoaded(false) - , m_optionsAppend(false) + ,m_optionsLoaded(false) + ,m_optionsAppend(false) { } // ServerDraftSchematicObjectTemplate::_IngredientSlot::_IngredientSlot @@ -878,6 +879,7 @@ bool ServerDraftSchematicObjectTemplate::_IngredientSlot::isAppend(const char *n return TpfTemplate::isAppend(name); } // ServerDraftSchematicObjectTemplate::_IngredientSlot::isAppend + int ServerDraftSchematicObjectTemplate::_IngredientSlot::getListLength(const char *name) const { if (strcmp(name, "options") == 0) @@ -896,8 +898,8 @@ int ServerDraftSchematicObjectTemplate::_IngredientSlot::getListLength(const cha */ void ServerDraftSchematicObjectTemplate::_IngredientSlot::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; file.enterForm(); @@ -952,7 +954,7 @@ void ServerDraftSchematicObjectTemplate::_IngredientSlot::load(Iff &file) */ void ServerDraftSchematicObjectTemplate::_IngredientSlot::save(Iff &file) { - int count; +int count; file.insertForm(_IngredientSlot_tag); @@ -982,7 +984,7 @@ void ServerDraftSchematicObjectTemplate::_IngredientSlot::save(Iff &file) count = m_options.size(); file.insertChunkData(&count, sizeof(count)); {for (int i = 0; i < count; ++i) - m_options[i]->saveToIff(file); } + m_options[i]->saveToIff(file);} file.exitChunk(); ++paramCount; // save optionalSkillCommand @@ -1013,4 +1015,4 @@ void ServerDraftSchematicObjectTemplate::_IngredientSlot::save(Iff &file) file.exitForm(true); } // ServerDraftSchematicObjectTemplate::_IngredientSlot::save -//@END TFD \ No newline at end of file +//@END TFD diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerDraftSchematicObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/ServerDraftSchematicObjectTemplate.h old mode 100755 new mode 100644 diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerFactoryObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerFactoryObjectTemplate.cpp old mode 100755 new mode 100644 index a4d8ae8d..4fabf457 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerFactoryObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerFactoryObjectTemplate.cpp @@ -17,8 +17,7 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include -#include +#include @@ -86,10 +85,10 @@ Tag ServerFactoryObjectTemplate::getTemplateVersion(void) const */ Tag ServerFactoryObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerFactoryObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerFactoryObjectTemplate::getHighestTemplateVersion diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerFactoryObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/ServerFactoryObjectTemplate.h old mode 100755 new mode 100644 diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerGroupObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerGroupObjectTemplate.cpp old mode 100755 new mode 100644 index a4c0367a..d7db01a9 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerGroupObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerGroupObjectTemplate.cpp @@ -17,8 +17,7 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include -#include +#include @@ -86,10 +85,10 @@ Tag ServerGroupObjectTemplate::getTemplateVersion(void) const */ Tag ServerGroupObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerGroupObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerGroupObjectTemplate::getHighestTemplateVersion diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerGroupObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/ServerGroupObjectTemplate.h old mode 100755 new mode 100644 diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerGuildObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerGuildObjectTemplate.cpp old mode 100755 new mode 100644 index b212df70..8ebbe5d7 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerGuildObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerGuildObjectTemplate.cpp @@ -17,8 +17,7 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include -#include +#include @@ -86,10 +85,10 @@ Tag ServerGuildObjectTemplate::getTemplateVersion(void) const */ Tag ServerGuildObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerGuildObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerGuildObjectTemplate::getHighestTemplateVersion diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerGuildObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/ServerGuildObjectTemplate.h old mode 100755 new mode 100644 diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerHarvesterInstallationObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerHarvesterInstallationObjectTemplate.cpp old mode 100755 new mode 100644 index 6516811d..299c8a2c --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerHarvesterInstallationObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerHarvesterInstallationObjectTemplate.cpp @@ -17,8 +17,7 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include -#include +#include @@ -86,10 +85,10 @@ Tag ServerHarvesterInstallationObjectTemplate::getTemplateVersion(void) const */ Tag ServerHarvesterInstallationObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerHarvesterInstallationObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerHarvesterInstallationObjectTemplate::getHighestTemplateVersion diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerHarvesterInstallationObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/ServerHarvesterInstallationObjectTemplate.h old mode 100755 new mode 100644 diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerInstallationObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerInstallationObjectTemplate.cpp old mode 100755 new mode 100644 index 6525ffe2..bc42176a --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerInstallationObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerInstallationObjectTemplate.cpp @@ -17,8 +17,7 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include -#include +#include @@ -86,10 +85,10 @@ Tag ServerInstallationObjectTemplate::getTemplateVersion(void) const */ Tag ServerInstallationObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerInstallationObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerInstallationObjectTemplate::getHighestTemplateVersion diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerInstallationObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/ServerInstallationObjectTemplate.h old mode 100755 new mode 100644 diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerIntangibleObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerIntangibleObjectTemplate.cpp old mode 100755 new mode 100644 index 43781914..a6d3126c --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerIntangibleObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerIntangibleObjectTemplate.cpp @@ -17,8 +17,7 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include -#include +#include @@ -86,10 +85,10 @@ Tag ServerIntangibleObjectTemplate::getTemplateVersion(void) const */ Tag ServerIntangibleObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerIntangibleObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerIntangibleObjectTemplate::getHighestTemplateVersion diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerIntangibleObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/ServerIntangibleObjectTemplate.h old mode 100755 new mode 100644 diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerJediManagerObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerJediManagerObjectTemplate.cpp old mode 100755 new mode 100644 index acecbef1..2384cbab --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerJediManagerObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerJediManagerObjectTemplate.cpp @@ -17,8 +17,7 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include -#include +#include @@ -86,10 +85,10 @@ Tag ServerJediManagerObjectTemplate::getTemplateVersion(void) const */ Tag ServerJediManagerObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerJediManagerObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerJediManagerObjectTemplate::getHighestTemplateVersion diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerJediManagerObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/ServerJediManagerObjectTemplate.h old mode 100755 new mode 100644 diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerManufactureInstallationObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerManufactureInstallationObjectTemplate.cpp old mode 100755 new mode 100644 index 1747392d..0a2d08b9 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerManufactureInstallationObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerManufactureInstallationObjectTemplate.cpp @@ -17,8 +17,7 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include -#include +#include @@ -86,10 +85,10 @@ Tag ServerManufactureInstallationObjectTemplate::getTemplateVersion(void) const */ Tag ServerManufactureInstallationObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerManufactureInstallationObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerManufactureInstallationObjectTemplate::getHighestTemplateVersion diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerManufactureInstallationObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/ServerManufactureInstallationObjectTemplate.h old mode 100755 new mode 100644 diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerManufactureSchematicObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerManufactureSchematicObjectTemplate.cpp old mode 100755 new mode 100644 index 63d2033e..13707972 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerManufactureSchematicObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerManufactureSchematicObjectTemplate.cpp @@ -17,8 +17,9 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include -#include +#include + + /** * Class constructor. @@ -26,13 +27,11 @@ ServerManufactureSchematicObjectTemplate::ServerManufactureSchematicObjectTemplate(const std::string & filename) //@BEGIN TFD INIT : ServerIntangibleObjectTemplate(filename) - , m_ingredientsLoaded(false) - , m_ingredientsAppend(false) - , m_attributesLoaded(false) - , m_attributesAppend(false) - , m_templateVersion(0) - , m_versionOk(false) - //@END TFD INIT + ,m_ingredientsLoaded(false) + ,m_ingredientsAppend(false) + ,m_attributesLoaded(false) + ,m_attributesAppend(false) +//@END TFD INIT { } // ServerManufactureSchematicObjectTemplate::ServerManufactureSchematicObjectTemplate @@ -41,7 +40,7 @@ ServerManufactureSchematicObjectTemplate::ServerManufactureSchematicObjectTempla */ ServerManufactureSchematicObjectTemplate::~ServerManufactureSchematicObjectTemplate() { - //@BEGIN TFD CLEANUP +//@BEGIN TFD CLEANUP { std::vector::iterator iter; for (iter = m_ingredients.begin(); iter != m_ingredients.end(); ++iter) @@ -60,7 +59,7 @@ ServerManufactureSchematicObjectTemplate::~ServerManufactureSchematicObjectTempl } m_attributes.clear(); } - //@END TFD CLEANUP +//@END TFD CLEANUP } // ServerManufactureSchematicObjectTemplate::~ServerManufactureSchematicObjectTemplate /** @@ -108,10 +107,10 @@ Tag ServerManufactureSchematicObjectTemplate::getTemplateVersion(void) const */ Tag ServerManufactureSchematicObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerManufactureSchematicObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerManufactureSchematicObjectTemplate::getHighestTemplateVersion @@ -282,6 +281,7 @@ bool ServerManufactureSchematicObjectTemplate::isAppend(const char *name) const return ServerIntangibleObjectTemplate::isAppend(name); } // ServerManufactureSchematicObjectTemplate::isAppend + int ServerManufactureSchematicObjectTemplate::getListLength(const char *name) const { if (strcmp(name, "ingredients") == 0) @@ -304,8 +304,8 @@ int ServerManufactureSchematicObjectTemplate::getListLength(const char *name) co */ void ServerManufactureSchematicObjectTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != ServerManufactureSchematicObjectTemplate_tag) { @@ -315,7 +315,7 @@ void ServerManufactureSchematicObjectTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -335,7 +335,7 @@ void ServerManufactureSchematicObjectTemplate::load(Iff &file) file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 0, 0)) + if (getHighestTemplateVersion() != TAG(0,0,0,0)) { if (DataLint::isEnabled()) DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); @@ -411,18 +411,18 @@ void ServerManufactureSchematicObjectTemplate::load(Iff &file) */ void ServerManufactureSchematicObjectTemplate::save(Iff &file) { - int count; +int count; file.insertForm(ServerManufactureSchematicObjectTemplate_tag); if (m_baseTemplateName.size() != 0) { - file.insertForm(TAG(D, E, R, V)); + file.insertForm(TAG(D,E,R,V)); file.insertChunk(TAG(X, X, X, X)); file.insertChunkData(m_baseTemplateName.c_str(), m_baseTemplateName.size() + 1); file.exitChunk(); file.exitForm(); } - file.insertForm(TAG(0, 0, 0, 0)); + file.insertForm(TAG(0,0,0,0)); file.allowNonlinearFunctions(); int paramCount = 0; @@ -451,7 +451,7 @@ void ServerManufactureSchematicObjectTemplate::save(Iff &file) count = m_ingredients.size(); file.insertChunkData(&count, sizeof(count)); {for (int i = 0; i < count; ++i) - m_ingredients[i]->saveToIff(file); } + m_ingredients[i]->saveToIff(file);} file.exitChunk(); ++paramCount; // save itemCount @@ -472,7 +472,7 @@ void ServerManufactureSchematicObjectTemplate::save(Iff &file) count = m_attributes.size(); file.insertChunkData(&count, sizeof(count)); {for (int i = 0; i < count; ++i) - m_attributes[i]->saveToIff(file); } + m_attributes[i]->saveToIff(file);} file.exitChunk(); ++paramCount; @@ -487,6 +487,7 @@ void ServerManufactureSchematicObjectTemplate::save(Iff &file) file.exitForm(); } // ServerManufactureSchematicObjectTemplate::save + //============================================================================= // class ServerManufactureSchematicObjectTemplate::_IngredientSlot @@ -635,6 +636,7 @@ bool ServerManufactureSchematicObjectTemplate::_IngredientSlot::isAppend(const c return TpfTemplate::isAppend(name); } // ServerManufactureSchematicObjectTemplate::_IngredientSlot::isAppend + int ServerManufactureSchematicObjectTemplate::_IngredientSlot::getListLength(const char *name) const { return TpfTemplate::getListLength(name); @@ -648,8 +650,8 @@ int ServerManufactureSchematicObjectTemplate::_IngredientSlot::getListLength(con */ void ServerManufactureSchematicObjectTemplate::_IngredientSlot::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; file.enterForm(); @@ -679,7 +681,7 @@ void ServerManufactureSchematicObjectTemplate::_IngredientSlot::load(Iff &file) */ void ServerManufactureSchematicObjectTemplate::_IngredientSlot::save(Iff &file) { - int count; +int count; file.insertForm(_IngredientSlot_tag); @@ -708,4 +710,4 @@ void ServerManufactureSchematicObjectTemplate::_IngredientSlot::save(Iff &file) UNREF(count); } // ServerManufactureSchematicObjectTemplate::_IngredientSlot::save -//@END TFD \ No newline at end of file +//@END TFD diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerManufactureSchematicObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/ServerManufactureSchematicObjectTemplate.h old mode 100755 new mode 100644 diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerMissionBoardObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerMissionBoardObjectTemplate.cpp new file mode 100644 index 00000000..408af73e --- /dev/null +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerMissionBoardObjectTemplate.cpp @@ -0,0 +1,266 @@ +//======================================================================== +// +// ServerMissionBoardObjectTemplate.cpp +// +//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be +//overwritten the next time the template definition is compiled. Do not +//make changes to code inside these blocks. +// +// copyright 2001 Sony Online Entertainment +// +//======================================================================== + +#include "sharedTemplate/FirstSharedTemplate.h" +#include "sharedTemplateDefinition/TemplateData.h" +#include "sharedTemplateDefinition/TemplateGlobals.h" +#include "ServerMissionBoardObjectTemplate.h" +#include "sharedDebug/DataLint.h" +#include "sharedFile/Iff.h" +#include "sharedTemplateDefinition/ObjectTemplate.h" +#include + + + +/** + * Class constructor. + */ +ServerMissionBoardObjectTemplate::ServerMissionBoardObjectTemplate(const std::string & filename) +//@BEGIN TFD INIT + : ServerUniverseObjectTemplate(filename) +//@END TFD INIT +{ +} // ServerMissionBoardObjectTemplate::ServerMissionBoardObjectTemplate + +/** + * Class destructor. + */ +ServerMissionBoardObjectTemplate::~ServerMissionBoardObjectTemplate() +{ +//@BEGIN TFD CLEANUP +//@END TFD CLEANUP +} // ServerMissionBoardObjectTemplate::~ServerMissionBoardObjectTemplate + +/** + * Static function used to register this template. + */ +void ServerMissionBoardObjectTemplate::registerMe(void) +{ + ObjectTemplateList::registerTemplate(ServerMissionBoardObjectTemplate_tag, create); +} // ServerMissionBoardObjectTemplate::registerMe + +/** + * Creates a ServerMissionBoardObjectTemplate template. + * + * @return a new instance of the template + */ +ObjectTemplate * ServerMissionBoardObjectTemplate::create(const std::string & filename) +{ + return new ServerMissionBoardObjectTemplate(filename); +} // ServerMissionBoardObjectTemplate::create + +/** + * Returns the template id. + * + * @return the template id + */ +Tag ServerMissionBoardObjectTemplate::getId(void) const +{ + return ServerMissionBoardObjectTemplate_tag; +} // ServerMissionBoardObjectTemplate::getId + +/** + * Returns this template's version. + * + * @return the version + */ +Tag ServerMissionBoardObjectTemplate::getTemplateVersion(void) const +{ + return m_templateVersion; +} // ServerMissionBoardObjectTemplate::getTemplateVersion + +/** + * Returns the highest version of this template or it's base templates. + * + * @return the highest version + */ +Tag ServerMissionBoardObjectTemplate::getHighestTemplateVersion(void) const +{ + if (m_baseData == nullptr) + return m_templateVersion; + const ServerMissionBoardObjectTemplate * base = dynamic_cast(m_baseData); + if (base == nullptr) + return m_templateVersion; + return std::max(m_templateVersion, base->getHighestTemplateVersion()); +} // ServerMissionBoardObjectTemplate::getHighestTemplateVersion + +//@BEGIN TFD +CompilerIntegerParam * ServerMissionBoardObjectTemplate::getCompilerIntegerParam(const char *name, bool deepCheck, int index) +{ + return ServerUniverseObjectTemplate::getCompilerIntegerParam(name, deepCheck, index); +} //ServerMissionBoardObjectTemplate::getCompilerIntegerParam + +FloatParam * ServerMissionBoardObjectTemplate::getFloatParam(const char *name, bool deepCheck, int index) +{ + return ServerUniverseObjectTemplate::getFloatParam(name, deepCheck, index); +} //ServerMissionBoardObjectTemplate::getFloatParam + +BoolParam * ServerMissionBoardObjectTemplate::getBoolParam(const char *name, bool deepCheck, int index) +{ + return ServerUniverseObjectTemplate::getBoolParam(name, deepCheck, index); +} //ServerMissionBoardObjectTemplate::getBoolParam + +StringParam * ServerMissionBoardObjectTemplate::getStringParam(const char *name, bool deepCheck, int index) +{ + return ServerUniverseObjectTemplate::getStringParam(name, deepCheck, index); +} //ServerMissionBoardObjectTemplate::getStringParam + +StringIdParam * ServerMissionBoardObjectTemplate::getStringIdParam(const char *name, bool deepCheck, int index) +{ + return ServerUniverseObjectTemplate::getStringIdParam(name, deepCheck, index); +} //ServerMissionBoardObjectTemplate::getStringIdParam + +VectorParam * ServerMissionBoardObjectTemplate::getVectorParam(const char *name, bool deepCheck, int index) +{ + return ServerUniverseObjectTemplate::getVectorParam(name, deepCheck, index); +} //ServerMissionBoardObjectTemplate::getVectorParam + +DynamicVariableParam * ServerMissionBoardObjectTemplate::getDynamicVariableParam(const char *name, bool deepCheck, int index) +{ + return ServerUniverseObjectTemplate::getDynamicVariableParam(name, deepCheck, index); +} //ServerMissionBoardObjectTemplate::getDynamicVariableParam + +StructParamOT * ServerMissionBoardObjectTemplate::getStructParamOT(const char *name, bool deepCheck, int index) +{ + return ServerUniverseObjectTemplate::getStructParamOT(name, deepCheck, index); +} //ServerMissionBoardObjectTemplate::getStructParamOT + +TriggerVolumeParam * ServerMissionBoardObjectTemplate::getTriggerVolumeParam(const char *name, bool deepCheck, int index) +{ + return ServerUniverseObjectTemplate::getTriggerVolumeParam(name, deepCheck, index); +} //ServerMissionBoardObjectTemplate::getTriggerVolumeParam + +void ServerMissionBoardObjectTemplate::initStructParamOT(StructParamOT ¶m, const char *name) +{ + if (param.isInitialized()) + return; + ServerUniverseObjectTemplate::initStructParamOT(param, name); +} // ServerMissionBoardObjectTemplate::initStructParamOT + +void ServerMissionBoardObjectTemplate::setAsEmptyList(const char *name) +{ + ServerUniverseObjectTemplate::setAsEmptyList(name); +} // ServerMissionBoardObjectTemplate::setAsEmptyList + +void ServerMissionBoardObjectTemplate::setAppend(const char *name) +{ + ServerUniverseObjectTemplate::setAppend(name); +} // ServerMissionBoardObjectTemplate::setAppend + +bool ServerMissionBoardObjectTemplate::isAppend(const char *name) const +{ + return ServerUniverseObjectTemplate::isAppend(name); +} // ServerMissionBoardObjectTemplate::isAppend + + +int ServerMissionBoardObjectTemplate::getListLength(const char *name) const +{ + return ServerUniverseObjectTemplate::getListLength(name); +} // ServerMissionBoardObjectTemplate::getListLength + +/** + * Loads the template data from an iff file. We should already be in the form + * for this template. + * + * @param file file to load from + */ +void ServerMissionBoardObjectTemplate::load(Iff &file) +{ +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; + + if (file.getCurrentName() != ServerMissionBoardObjectTemplate_tag) + { + ServerUniverseObjectTemplate::load(file); + return; + } + + file.enterForm(); + m_templateVersion = file.getCurrentName(); + if (m_templateVersion == TAG(D,E,R,V)) + { + file.enterForm(); + file.enterChunk(); + std::string baseFilename; + file.read_string(baseFilename); + file.exitChunk(); + const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) + base->releaseReference(); + else + { + if (m_baseData != nullptr) + m_baseData->releaseReference(); + m_baseData = base; + } + file.exitForm(); + m_templateVersion = file.getCurrentName(); + } + if (getHighestTemplateVersion() != TAG(0,0,0,0)) + { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); + } + + file.enterForm(); + + file.enterChunk(); + int paramCount = file.read_int32(); + file.exitChunk(); + UNREF(paramName); + UNREF(paramCount); + + file.exitForm(); + ServerUniverseObjectTemplate::load(file); + file.exitForm(); + return; +} // ServerMissionBoardObjectTemplate::load + +/** + * Saves the template data to an iff file. + * + * @param file file to save to + * @param location file type (client or server) + */ +void ServerMissionBoardObjectTemplate::save(Iff &file) +{ +int count; + + file.insertForm(ServerMissionBoardObjectTemplate_tag); + if (m_baseTemplateName.size() != 0) + { + file.insertForm(TAG(D,E,R,V)); + file.insertChunk(TAG(X, X, X, X)); + file.insertChunkData(m_baseTemplateName.c_str(), m_baseTemplateName.size() + 1); + file.exitChunk(); + file.exitForm(); + } + file.insertForm(TAG(0,0,0,0)); + file.allowNonlinearFunctions(); + + int paramCount = 0; + + + // write number of parameters + file.goToTopOfForm(); + file.insertChunk(TAG(P, C, N, T)); + file.insertChunkData(¶mCount, sizeof(paramCount)); + file.exitChunk(); + + file.exitForm(true); + ServerUniverseObjectTemplate::save(file); + file.exitForm(); + UNREF(count); +} // ServerMissionBoardObjectTemplate::save + +//@END TFD diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerMissionBoardObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/ServerMissionBoardObjectTemplate.h new file mode 100644 index 00000000..59c2edf4 --- /dev/null +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerMissionBoardObjectTemplate.h @@ -0,0 +1,88 @@ +//======================================================================== +// +// ServerMissionBoardObjectTemplate.h +// +//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be +//overwritten the next time the template definition is compiled. Do not +//make changes to code inside these blocks. +// +// copyright 2001 Sony Online Entertainment +// +//======================================================================== + +#ifndef _INCLUDED_ServerMissionBoardObjectTemplate_H +#define _INCLUDED_ServerMissionBoardObjectTemplate_H + +#include "ServerUniverseObjectTemplate.h" +#include "sharedFoundation/DynamicVariable.h" +#include "sharedTemplateDefinition/TpfTemplate.h" + + +class Vector; +typedef StructParam StructParamOT; + + +class ServerMissionBoardObjectTemplate : public ServerUniverseObjectTemplate +{ +public: +//@BEGIN TFD ID + enum + { + ServerMissionBoardObjectTemplate_tag = TAG(M,I,S,B) + }; +//@END TFD ID +public: + ServerMissionBoardObjectTemplate(const std::string & filename); + virtual ~ServerMissionBoardObjectTemplate(); + + virtual Tag getId(void) const; + virtual Tag getTemplateVersion(void) const; + virtual Tag getHighestTemplateVersion(void) const; + static void install(void); + +//@BEGIN TFD +public: + virtual CompilerIntegerParam *getCompilerIntegerParam(const char *name, bool deepCheck = true, int index = 0); + virtual FloatParam *getFloatParam(const char *name, bool deepCheck = true, int index = 0); + virtual BoolParam *getBoolParam(const char *name, bool deepCheck = true, int index = 0); + virtual StringParam *getStringParam(const char *name, bool deepCheck = true, int index = 0); + virtual StringIdParam *getStringIdParam(const char *name, bool deepCheck = true, int index = 0); + virtual VectorParam *getVectorParam(const char *name, bool deepCheck = true, int index = 0); + virtual DynamicVariableParam *getDynamicVariableParam(const char *name, bool deepCheck = true, int index = 0); + virtual StructParamOT *getStructParamOT(const char *name, bool deepCheck = true, int index = 0); + virtual TriggerVolumeParam *getTriggerVolumeParam(const char *name, bool deepCheck = true, int index = 0); + virtual void initStructParamOT(StructParamOT ¶m, const char *name); + virtual void setAsEmptyList(const char *name); + virtual void setAppend(const char *name); + virtual bool isAppend(const char *name) const; + virtual int getListLength(const char *name) const; + +protected: + virtual void load(Iff &file); + virtual void save(Iff &file); + +private: +//@END TFD + +private: + Tag m_templateVersion; // the template version + bool m_versionOk; // flag that the template version loaded is the one we expect + + static void registerMe(void); + static ObjectTemplate * create(const std::string & filename); + + // no copying + ServerMissionBoardObjectTemplate(const ServerMissionBoardObjectTemplate &); + ServerMissionBoardObjectTemplate & operator =(const ServerMissionBoardObjectTemplate &); +}; + + +inline void ServerMissionBoardObjectTemplate::install(void) +{ +//@BEGIN TFD INSTALL + ServerMissionBoardObjectTemplate::registerMe(); +//@END TFD INSTALL +} + + +#endif // _INCLUDED_ServerMissionBoardObjectTemplate_H diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerMissionDataObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerMissionDataObjectTemplate.cpp new file mode 100644 index 00000000..74977285 --- /dev/null +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerMissionDataObjectTemplate.cpp @@ -0,0 +1,266 @@ +//======================================================================== +// +// ServerMissionDataObjectTemplate.cpp +// +//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be +//overwritten the next time the template definition is compiled. Do not +//make changes to code inside these blocks. +// +// copyright 2001 Sony Online Entertainment +// +//======================================================================== + +#include "sharedTemplate/FirstSharedTemplate.h" +#include "sharedTemplateDefinition/TemplateData.h" +#include "sharedTemplateDefinition/TemplateGlobals.h" +#include "ServerMissionDataObjectTemplate.h" +#include "sharedDebug/DataLint.h" +#include "sharedFile/Iff.h" +#include "sharedTemplateDefinition/ObjectTemplate.h" +#include + + + +/** + * Class constructor. + */ +ServerMissionDataObjectTemplate::ServerMissionDataObjectTemplate(const std::string & filename) +//@BEGIN TFD INIT + : ServerIntangibleObjectTemplate(filename) +//@END TFD INIT +{ +} // ServerMissionDataObjectTemplate::ServerMissionDataObjectTemplate + +/** + * Class destructor. + */ +ServerMissionDataObjectTemplate::~ServerMissionDataObjectTemplate() +{ +//@BEGIN TFD CLEANUP +//@END TFD CLEANUP +} // ServerMissionDataObjectTemplate::~ServerMissionDataObjectTemplate + +/** + * Static function used to register this template. + */ +void ServerMissionDataObjectTemplate::registerMe(void) +{ + ObjectTemplateList::registerTemplate(ServerMissionDataObjectTemplate_tag, create); +} // ServerMissionDataObjectTemplate::registerMe + +/** + * Creates a ServerMissionDataObjectTemplate template. + * + * @return a new instance of the template + */ +ObjectTemplate * ServerMissionDataObjectTemplate::create(const std::string & filename) +{ + return new ServerMissionDataObjectTemplate(filename); +} // ServerMissionDataObjectTemplate::create + +/** + * Returns the template id. + * + * @return the template id + */ +Tag ServerMissionDataObjectTemplate::getId(void) const +{ + return ServerMissionDataObjectTemplate_tag; +} // ServerMissionDataObjectTemplate::getId + +/** + * Returns this template's version. + * + * @return the version + */ +Tag ServerMissionDataObjectTemplate::getTemplateVersion(void) const +{ + return m_templateVersion; +} // ServerMissionDataObjectTemplate::getTemplateVersion + +/** + * Returns the highest version of this template or it's base templates. + * + * @return the highest version + */ +Tag ServerMissionDataObjectTemplate::getHighestTemplateVersion(void) const +{ + if (m_baseData == nullptr) + return m_templateVersion; + const ServerMissionDataObjectTemplate * base = dynamic_cast(m_baseData); + if (base == nullptr) + return m_templateVersion; + return std::max(m_templateVersion, base->getHighestTemplateVersion()); +} // ServerMissionDataObjectTemplate::getHighestTemplateVersion + +//@BEGIN TFD +CompilerIntegerParam * ServerMissionDataObjectTemplate::getCompilerIntegerParam(const char *name, bool deepCheck, int index) +{ + return ServerIntangibleObjectTemplate::getCompilerIntegerParam(name, deepCheck, index); +} //ServerMissionDataObjectTemplate::getCompilerIntegerParam + +FloatParam * ServerMissionDataObjectTemplate::getFloatParam(const char *name, bool deepCheck, int index) +{ + return ServerIntangibleObjectTemplate::getFloatParam(name, deepCheck, index); +} //ServerMissionDataObjectTemplate::getFloatParam + +BoolParam * ServerMissionDataObjectTemplate::getBoolParam(const char *name, bool deepCheck, int index) +{ + return ServerIntangibleObjectTemplate::getBoolParam(name, deepCheck, index); +} //ServerMissionDataObjectTemplate::getBoolParam + +StringParam * ServerMissionDataObjectTemplate::getStringParam(const char *name, bool deepCheck, int index) +{ + return ServerIntangibleObjectTemplate::getStringParam(name, deepCheck, index); +} //ServerMissionDataObjectTemplate::getStringParam + +StringIdParam * ServerMissionDataObjectTemplate::getStringIdParam(const char *name, bool deepCheck, int index) +{ + return ServerIntangibleObjectTemplate::getStringIdParam(name, deepCheck, index); +} //ServerMissionDataObjectTemplate::getStringIdParam + +VectorParam * ServerMissionDataObjectTemplate::getVectorParam(const char *name, bool deepCheck, int index) +{ + return ServerIntangibleObjectTemplate::getVectorParam(name, deepCheck, index); +} //ServerMissionDataObjectTemplate::getVectorParam + +DynamicVariableParam * ServerMissionDataObjectTemplate::getDynamicVariableParam(const char *name, bool deepCheck, int index) +{ + return ServerIntangibleObjectTemplate::getDynamicVariableParam(name, deepCheck, index); +} //ServerMissionDataObjectTemplate::getDynamicVariableParam + +StructParamOT * ServerMissionDataObjectTemplate::getStructParamOT(const char *name, bool deepCheck, int index) +{ + return ServerIntangibleObjectTemplate::getStructParamOT(name, deepCheck, index); +} //ServerMissionDataObjectTemplate::getStructParamOT + +TriggerVolumeParam * ServerMissionDataObjectTemplate::getTriggerVolumeParam(const char *name, bool deepCheck, int index) +{ + return ServerIntangibleObjectTemplate::getTriggerVolumeParam(name, deepCheck, index); +} //ServerMissionDataObjectTemplate::getTriggerVolumeParam + +void ServerMissionDataObjectTemplate::initStructParamOT(StructParamOT ¶m, const char *name) +{ + if (param.isInitialized()) + return; + ServerIntangibleObjectTemplate::initStructParamOT(param, name); +} // ServerMissionDataObjectTemplate::initStructParamOT + +void ServerMissionDataObjectTemplate::setAsEmptyList(const char *name) +{ + ServerIntangibleObjectTemplate::setAsEmptyList(name); +} // ServerMissionDataObjectTemplate::setAsEmptyList + +void ServerMissionDataObjectTemplate::setAppend(const char *name) +{ + ServerIntangibleObjectTemplate::setAppend(name); +} // ServerMissionDataObjectTemplate::setAppend + +bool ServerMissionDataObjectTemplate::isAppend(const char *name) const +{ + return ServerIntangibleObjectTemplate::isAppend(name); +} // ServerMissionDataObjectTemplate::isAppend + + +int ServerMissionDataObjectTemplate::getListLength(const char *name) const +{ + return ServerIntangibleObjectTemplate::getListLength(name); +} // ServerMissionDataObjectTemplate::getListLength + +/** + * Loads the template data from an iff file. We should already be in the form + * for this template. + * + * @param file file to load from + */ +void ServerMissionDataObjectTemplate::load(Iff &file) +{ +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; + + if (file.getCurrentName() != ServerMissionDataObjectTemplate_tag) + { + ServerIntangibleObjectTemplate::load(file); + return; + } + + file.enterForm(); + m_templateVersion = file.getCurrentName(); + if (m_templateVersion == TAG(D,E,R,V)) + { + file.enterForm(); + file.enterChunk(); + std::string baseFilename; + file.read_string(baseFilename); + file.exitChunk(); + const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) + base->releaseReference(); + else + { + if (m_baseData != nullptr) + m_baseData->releaseReference(); + m_baseData = base; + } + file.exitForm(); + m_templateVersion = file.getCurrentName(); + } + if (getHighestTemplateVersion() != TAG(0,0,0,0)) + { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); + } + + file.enterForm(); + + file.enterChunk(); + int paramCount = file.read_int32(); + file.exitChunk(); + UNREF(paramName); + UNREF(paramCount); + + file.exitForm(); + ServerIntangibleObjectTemplate::load(file); + file.exitForm(); + return; +} // ServerMissionDataObjectTemplate::load + +/** + * Saves the template data to an iff file. + * + * @param file file to save to + * @param location file type (client or server) + */ +void ServerMissionDataObjectTemplate::save(Iff &file) +{ +int count; + + file.insertForm(ServerMissionDataObjectTemplate_tag); + if (m_baseTemplateName.size() != 0) + { + file.insertForm(TAG(D,E,R,V)); + file.insertChunk(TAG(X, X, X, X)); + file.insertChunkData(m_baseTemplateName.c_str(), m_baseTemplateName.size() + 1); + file.exitChunk(); + file.exitForm(); + } + file.insertForm(TAG(0,0,0,0)); + file.allowNonlinearFunctions(); + + int paramCount = 0; + + + // write number of parameters + file.goToTopOfForm(); + file.insertChunk(TAG(P, C, N, T)); + file.insertChunkData(¶mCount, sizeof(paramCount)); + file.exitChunk(); + + file.exitForm(true); + ServerIntangibleObjectTemplate::save(file); + file.exitForm(); + UNREF(count); +} // ServerMissionDataObjectTemplate::save + +//@END TFD diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerMissionDataObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/ServerMissionDataObjectTemplate.h new file mode 100644 index 00000000..b78a2cbe --- /dev/null +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerMissionDataObjectTemplate.h @@ -0,0 +1,88 @@ +//======================================================================== +// +// ServerMissionDataObjectTemplate.h +// +//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be +//overwritten the next time the template definition is compiled. Do not +//make changes to code inside these blocks. +// +// copyright 2001 Sony Online Entertainment +// +//======================================================================== + +#ifndef _INCLUDED_ServerMissionDataObjectTemplate_H +#define _INCLUDED_ServerMissionDataObjectTemplate_H + +#include "ServerIntangibleObjectTemplate.h" +#include "sharedFoundation/DynamicVariable.h" +#include "sharedTemplateDefinition/TpfTemplate.h" + + +class Vector; +typedef StructParam StructParamOT; + + +class ServerMissionDataObjectTemplate : public ServerIntangibleObjectTemplate +{ +public: +//@BEGIN TFD ID + enum + { + ServerMissionDataObjectTemplate_tag = TAG(M,I,S,D) + }; +//@END TFD ID +public: + ServerMissionDataObjectTemplate(const std::string & filename); + virtual ~ServerMissionDataObjectTemplate(); + + virtual Tag getId(void) const; + virtual Tag getTemplateVersion(void) const; + virtual Tag getHighestTemplateVersion(void) const; + static void install(void); + +//@BEGIN TFD +public: + virtual CompilerIntegerParam *getCompilerIntegerParam(const char *name, bool deepCheck = true, int index = 0); + virtual FloatParam *getFloatParam(const char *name, bool deepCheck = true, int index = 0); + virtual BoolParam *getBoolParam(const char *name, bool deepCheck = true, int index = 0); + virtual StringParam *getStringParam(const char *name, bool deepCheck = true, int index = 0); + virtual StringIdParam *getStringIdParam(const char *name, bool deepCheck = true, int index = 0); + virtual VectorParam *getVectorParam(const char *name, bool deepCheck = true, int index = 0); + virtual DynamicVariableParam *getDynamicVariableParam(const char *name, bool deepCheck = true, int index = 0); + virtual StructParamOT *getStructParamOT(const char *name, bool deepCheck = true, int index = 0); + virtual TriggerVolumeParam *getTriggerVolumeParam(const char *name, bool deepCheck = true, int index = 0); + virtual void initStructParamOT(StructParamOT ¶m, const char *name); + virtual void setAsEmptyList(const char *name); + virtual void setAppend(const char *name); + virtual bool isAppend(const char *name) const; + virtual int getListLength(const char *name) const; + +protected: + virtual void load(Iff &file); + virtual void save(Iff &file); + +private: +//@END TFD + +private: + Tag m_templateVersion; // the template version + bool m_versionOk; // flag that the template version loaded is the one we expect + + static void registerMe(void); + static ObjectTemplate * create(const std::string & filename); + + // no copying + ServerMissionDataObjectTemplate(const ServerMissionDataObjectTemplate &); + ServerMissionDataObjectTemplate & operator =(const ServerMissionDataObjectTemplate &); +}; + + +inline void ServerMissionDataObjectTemplate::install(void) +{ +//@BEGIN TFD INSTALL + ServerMissionDataObjectTemplate::registerMe(); +//@END TFD INSTALL +} + + +#endif // _INCLUDED_ServerMissionDataObjectTemplate_H diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerMissionListEntryObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerMissionListEntryObjectTemplate.cpp new file mode 100644 index 00000000..ec311cf3 --- /dev/null +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerMissionListEntryObjectTemplate.cpp @@ -0,0 +1,266 @@ +//======================================================================== +// +// ServerMissionListEntryObjectTemplate.cpp +// +//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be +//overwritten the next time the template definition is compiled. Do not +//make changes to code inside these blocks. +// +// copyright 2001 Sony Online Entertainment +// +//======================================================================== + +#include "sharedTemplate/FirstSharedTemplate.h" +#include "sharedTemplateDefinition/TemplateData.h" +#include "sharedTemplateDefinition/TemplateGlobals.h" +#include "ServerMissionListEntryObjectTemplate.h" +#include "sharedDebug/DataLint.h" +#include "sharedFile/Iff.h" +#include "sharedTemplateDefinition/ObjectTemplate.h" +#include + + + +/** + * Class constructor. + */ +ServerMissionListEntryObjectTemplate::ServerMissionListEntryObjectTemplate(const std::string & filename) +//@BEGIN TFD INIT + : ServerIntangibleObjectTemplate(filename) +//@END TFD INIT +{ +} // ServerMissionListEntryObjectTemplate::ServerMissionListEntryObjectTemplate + +/** + * Class destructor. + */ +ServerMissionListEntryObjectTemplate::~ServerMissionListEntryObjectTemplate() +{ +//@BEGIN TFD CLEANUP +//@END TFD CLEANUP +} // ServerMissionListEntryObjectTemplate::~ServerMissionListEntryObjectTemplate + +/** + * Static function used to register this template. + */ +void ServerMissionListEntryObjectTemplate::registerMe(void) +{ + ObjectTemplateList::registerTemplate(ServerMissionListEntryObjectTemplate_tag, create); +} // ServerMissionListEntryObjectTemplate::registerMe + +/** + * Creates a ServerMissionListEntryObjectTemplate template. + * + * @return a new instance of the template + */ +ObjectTemplate * ServerMissionListEntryObjectTemplate::create(const std::string & filename) +{ + return new ServerMissionListEntryObjectTemplate(filename); +} // ServerMissionListEntryObjectTemplate::create + +/** + * Returns the template id. + * + * @return the template id + */ +Tag ServerMissionListEntryObjectTemplate::getId(void) const +{ + return ServerMissionListEntryObjectTemplate_tag; +} // ServerMissionListEntryObjectTemplate::getId + +/** + * Returns this template's version. + * + * @return the version + */ +Tag ServerMissionListEntryObjectTemplate::getTemplateVersion(void) const +{ + return m_templateVersion; +} // ServerMissionListEntryObjectTemplate::getTemplateVersion + +/** + * Returns the highest version of this template or it's base templates. + * + * @return the highest version + */ +Tag ServerMissionListEntryObjectTemplate::getHighestTemplateVersion(void) const +{ + if (m_baseData == nullptr) + return m_templateVersion; + const ServerMissionListEntryObjectTemplate * base = dynamic_cast(m_baseData); + if (base == nullptr) + return m_templateVersion; + return std::max(m_templateVersion, base->getHighestTemplateVersion()); +} // ServerMissionListEntryObjectTemplate::getHighestTemplateVersion + +//@BEGIN TFD +CompilerIntegerParam * ServerMissionListEntryObjectTemplate::getCompilerIntegerParam(const char *name, bool deepCheck, int index) +{ + return ServerIntangibleObjectTemplate::getCompilerIntegerParam(name, deepCheck, index); +} //ServerMissionListEntryObjectTemplate::getCompilerIntegerParam + +FloatParam * ServerMissionListEntryObjectTemplate::getFloatParam(const char *name, bool deepCheck, int index) +{ + return ServerIntangibleObjectTemplate::getFloatParam(name, deepCheck, index); +} //ServerMissionListEntryObjectTemplate::getFloatParam + +BoolParam * ServerMissionListEntryObjectTemplate::getBoolParam(const char *name, bool deepCheck, int index) +{ + return ServerIntangibleObjectTemplate::getBoolParam(name, deepCheck, index); +} //ServerMissionListEntryObjectTemplate::getBoolParam + +StringParam * ServerMissionListEntryObjectTemplate::getStringParam(const char *name, bool deepCheck, int index) +{ + return ServerIntangibleObjectTemplate::getStringParam(name, deepCheck, index); +} //ServerMissionListEntryObjectTemplate::getStringParam + +StringIdParam * ServerMissionListEntryObjectTemplate::getStringIdParam(const char *name, bool deepCheck, int index) +{ + return ServerIntangibleObjectTemplate::getStringIdParam(name, deepCheck, index); +} //ServerMissionListEntryObjectTemplate::getStringIdParam + +VectorParam * ServerMissionListEntryObjectTemplate::getVectorParam(const char *name, bool deepCheck, int index) +{ + return ServerIntangibleObjectTemplate::getVectorParam(name, deepCheck, index); +} //ServerMissionListEntryObjectTemplate::getVectorParam + +DynamicVariableParam * ServerMissionListEntryObjectTemplate::getDynamicVariableParam(const char *name, bool deepCheck, int index) +{ + return ServerIntangibleObjectTemplate::getDynamicVariableParam(name, deepCheck, index); +} //ServerMissionListEntryObjectTemplate::getDynamicVariableParam + +StructParamOT * ServerMissionListEntryObjectTemplate::getStructParamOT(const char *name, bool deepCheck, int index) +{ + return ServerIntangibleObjectTemplate::getStructParamOT(name, deepCheck, index); +} //ServerMissionListEntryObjectTemplate::getStructParamOT + +TriggerVolumeParam * ServerMissionListEntryObjectTemplate::getTriggerVolumeParam(const char *name, bool deepCheck, int index) +{ + return ServerIntangibleObjectTemplate::getTriggerVolumeParam(name, deepCheck, index); +} //ServerMissionListEntryObjectTemplate::getTriggerVolumeParam + +void ServerMissionListEntryObjectTemplate::initStructParamOT(StructParamOT ¶m, const char *name) +{ + if (param.isInitialized()) + return; + ServerIntangibleObjectTemplate::initStructParamOT(param, name); +} // ServerMissionListEntryObjectTemplate::initStructParamOT + +void ServerMissionListEntryObjectTemplate::setAsEmptyList(const char *name) +{ + ServerIntangibleObjectTemplate::setAsEmptyList(name); +} // ServerMissionListEntryObjectTemplate::setAsEmptyList + +void ServerMissionListEntryObjectTemplate::setAppend(const char *name) +{ + ServerIntangibleObjectTemplate::setAppend(name); +} // ServerMissionListEntryObjectTemplate::setAppend + +bool ServerMissionListEntryObjectTemplate::isAppend(const char *name) const +{ + return ServerIntangibleObjectTemplate::isAppend(name); +} // ServerMissionListEntryObjectTemplate::isAppend + + +int ServerMissionListEntryObjectTemplate::getListLength(const char *name) const +{ + return ServerIntangibleObjectTemplate::getListLength(name); +} // ServerMissionListEntryObjectTemplate::getListLength + +/** + * Loads the template data from an iff file. We should already be in the form + * for this template. + * + * @param file file to load from + */ +void ServerMissionListEntryObjectTemplate::load(Iff &file) +{ +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; + + if (file.getCurrentName() != ServerMissionListEntryObjectTemplate_tag) + { + ServerIntangibleObjectTemplate::load(file); + return; + } + + file.enterForm(); + m_templateVersion = file.getCurrentName(); + if (m_templateVersion == TAG(D,E,R,V)) + { + file.enterForm(); + file.enterChunk(); + std::string baseFilename; + file.read_string(baseFilename); + file.exitChunk(); + const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) + base->releaseReference(); + else + { + if (m_baseData != nullptr) + m_baseData->releaseReference(); + m_baseData = base; + } + file.exitForm(); + m_templateVersion = file.getCurrentName(); + } + if (getHighestTemplateVersion() != TAG(0,0,0,0)) + { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); + } + + file.enterForm(); + + file.enterChunk(); + int paramCount = file.read_int32(); + file.exitChunk(); + UNREF(paramName); + UNREF(paramCount); + + file.exitForm(); + ServerIntangibleObjectTemplate::load(file); + file.exitForm(); + return; +} // ServerMissionListEntryObjectTemplate::load + +/** + * Saves the template data to an iff file. + * + * @param file file to save to + * @param location file type (client or server) + */ +void ServerMissionListEntryObjectTemplate::save(Iff &file) +{ +int count; + + file.insertForm(ServerMissionListEntryObjectTemplate_tag); + if (m_baseTemplateName.size() != 0) + { + file.insertForm(TAG(D,E,R,V)); + file.insertChunk(TAG(X, X, X, X)); + file.insertChunkData(m_baseTemplateName.c_str(), m_baseTemplateName.size() + 1); + file.exitChunk(); + file.exitForm(); + } + file.insertForm(TAG(0,0,0,0)); + file.allowNonlinearFunctions(); + + int paramCount = 0; + + + // write number of parameters + file.goToTopOfForm(); + file.insertChunk(TAG(P, C, N, T)); + file.insertChunkData(¶mCount, sizeof(paramCount)); + file.exitChunk(); + + file.exitForm(true); + ServerIntangibleObjectTemplate::save(file); + file.exitForm(); + UNREF(count); +} // ServerMissionListEntryObjectTemplate::save + +//@END TFD diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerMissionListEntryObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/ServerMissionListEntryObjectTemplate.h new file mode 100644 index 00000000..53b0d060 --- /dev/null +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerMissionListEntryObjectTemplate.h @@ -0,0 +1,88 @@ +//======================================================================== +// +// ServerMissionListEntryObjectTemplate.h +// +//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be +//overwritten the next time the template definition is compiled. Do not +//make changes to code inside these blocks. +// +// copyright 2001 Sony Online Entertainment +// +//======================================================================== + +#ifndef _INCLUDED_ServerMissionListEntryObjectTemplate_H +#define _INCLUDED_ServerMissionListEntryObjectTemplate_H + +#include "ServerIntangibleObjectTemplate.h" +#include "sharedFoundation/DynamicVariable.h" +#include "sharedTemplateDefinition/TpfTemplate.h" + + +class Vector; +typedef StructParam StructParamOT; + + +class ServerMissionListEntryObjectTemplate : public ServerIntangibleObjectTemplate +{ +public: +//@BEGIN TFD ID + enum + { + ServerMissionListEntryObjectTemplate_tag = TAG(M,L,E,O) + }; +//@END TFD ID +public: + ServerMissionListEntryObjectTemplate(const std::string & filename); + virtual ~ServerMissionListEntryObjectTemplate(); + + virtual Tag getId(void) const; + virtual Tag getTemplateVersion(void) const; + virtual Tag getHighestTemplateVersion(void) const; + static void install(void); + +//@BEGIN TFD +public: + virtual CompilerIntegerParam *getCompilerIntegerParam(const char *name, bool deepCheck = true, int index = 0); + virtual FloatParam *getFloatParam(const char *name, bool deepCheck = true, int index = 0); + virtual BoolParam *getBoolParam(const char *name, bool deepCheck = true, int index = 0); + virtual StringParam *getStringParam(const char *name, bool deepCheck = true, int index = 0); + virtual StringIdParam *getStringIdParam(const char *name, bool deepCheck = true, int index = 0); + virtual VectorParam *getVectorParam(const char *name, bool deepCheck = true, int index = 0); + virtual DynamicVariableParam *getDynamicVariableParam(const char *name, bool deepCheck = true, int index = 0); + virtual StructParamOT *getStructParamOT(const char *name, bool deepCheck = true, int index = 0); + virtual TriggerVolumeParam *getTriggerVolumeParam(const char *name, bool deepCheck = true, int index = 0); + virtual void initStructParamOT(StructParamOT ¶m, const char *name); + virtual void setAsEmptyList(const char *name); + virtual void setAppend(const char *name); + virtual bool isAppend(const char *name) const; + virtual int getListLength(const char *name) const; + +protected: + virtual void load(Iff &file); + virtual void save(Iff &file); + +private: +//@END TFD + +private: + Tag m_templateVersion; // the template version + bool m_versionOk; // flag that the template version loaded is the one we expect + + static void registerMe(void); + static ObjectTemplate * create(const std::string & filename); + + // no copying + ServerMissionListEntryObjectTemplate(const ServerMissionListEntryObjectTemplate &); + ServerMissionListEntryObjectTemplate & operator =(const ServerMissionListEntryObjectTemplate &); +}; + + +inline void ServerMissionListEntryObjectTemplate::install(void) +{ +//@BEGIN TFD INSTALL + ServerMissionListEntryObjectTemplate::registerMe(); +//@END TFD INSTALL +} + + +#endif // _INCLUDED_ServerMissionListEntryObjectTemplate_H diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerMissionObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerMissionObjectTemplate.cpp old mode 100755 new mode 100644 index 240882ac..d1feb0d9 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerMissionObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerMissionObjectTemplate.cpp @@ -17,8 +17,7 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include -#include +#include @@ -86,10 +85,10 @@ Tag ServerMissionObjectTemplate::getTemplateVersion(void) const */ Tag ServerMissionObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerMissionObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerMissionObjectTemplate::getHighestTemplateVersion diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerMissionObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/ServerMissionObjectTemplate.h old mode 100755 new mode 100644 diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerObjectTemplate.cpp old mode 100755 new mode 100644 index 257b1f02..eb064024 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerObjectTemplate.cpp @@ -17,8 +17,9 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include -#include +#include + + /** * Class constructor. @@ -26,21 +27,19 @@ ServerObjectTemplate::ServerObjectTemplate(const std::string & filename) //@BEGIN TFD INIT : TpfTemplate(filename) - , m_scriptsLoaded(false) - , m_scriptsAppend(false) - , m_visibleFlagsLoaded(false) - , m_visibleFlagsAppend(false) - , m_deleteFlagsLoaded(false) - , m_deleteFlagsAppend(false) - , m_moveFlagsLoaded(false) - , m_moveFlagsAppend(false) - , m_contentsLoaded(false) - , m_contentsAppend(false) - , m_xpPointsLoaded(false) - , m_xpPointsAppend(false) - , m_templateVersion(0) - , m_versionOk(false) - //@END TFD INIT + ,m_scriptsLoaded(false) + ,m_scriptsAppend(false) + ,m_visibleFlagsLoaded(false) + ,m_visibleFlagsAppend(false) + ,m_deleteFlagsLoaded(false) + ,m_deleteFlagsAppend(false) + ,m_moveFlagsLoaded(false) + ,m_moveFlagsAppend(false) + ,m_contentsLoaded(false) + ,m_contentsAppend(false) + ,m_xpPointsLoaded(false) + ,m_xpPointsAppend(false) +//@END TFD INIT { } // ServerObjectTemplate::ServerObjectTemplate @@ -49,7 +48,7 @@ ServerObjectTemplate::ServerObjectTemplate(const std::string & filename) */ ServerObjectTemplate::~ServerObjectTemplate() { - //@BEGIN TFD CLEANUP +//@BEGIN TFD CLEANUP { std::vector::iterator iter; for (iter = m_scripts.begin(); iter != m_scripts.end(); ++iter) @@ -104,7 +103,7 @@ ServerObjectTemplate::~ServerObjectTemplate() } m_xpPoints.clear(); } - //@END TFD CLEANUP +//@END TFD CLEANUP } // ServerObjectTemplate::~ServerObjectTemplate /** @@ -152,10 +151,10 @@ Tag ServerObjectTemplate::getTemplateVersion(void) const */ Tag ServerObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerObjectTemplate::getHighestTemplateVersion @@ -500,6 +499,7 @@ bool ServerObjectTemplate::isAppend(const char *name) const return TpfTemplate::isAppend(name); } // ServerObjectTemplate::isAppend + int ServerObjectTemplate::getListLength(const char *name) const { if (strcmp(name, "scripts") == 0) @@ -542,8 +542,8 @@ int ServerObjectTemplate::getListLength(const char *name) const */ void ServerObjectTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != ServerObjectTemplate_tag) { @@ -553,7 +553,7 @@ void ServerObjectTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -573,7 +573,7 @@ void ServerObjectTemplate::load(Iff &file) file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 1, 1)) + if (getHighestTemplateVersion() != TAG(0,0,1,1)) { if (DataLint::isEnabled()) DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); @@ -749,18 +749,18 @@ void ServerObjectTemplate::load(Iff &file) */ void ServerObjectTemplate::save(Iff &file) { - int count; +int count; file.insertForm(ServerObjectTemplate_tag); if (m_baseTemplateName.size() != 0) { - file.insertForm(TAG(D, E, R, V)); + file.insertForm(TAG(D,E,R,V)); file.insertChunk(TAG(X, X, X, X)); file.insertChunkData(m_baseTemplateName.c_str(), m_baseTemplateName.size() + 1); file.exitChunk(); file.exitForm(); } - file.insertForm(TAG(0, 0, 1, 1)); + file.insertForm(TAG(0,0,1,1)); file.allowNonlinearFunctions(); int paramCount = 0; @@ -783,7 +783,7 @@ void ServerObjectTemplate::save(Iff &file) count = m_scripts.size(); file.insertChunkData(&count, sizeof(count)); {for (int i = 0; i < count; ++i) - m_scripts[i]->saveToIff(file); } + m_scripts[i]->saveToIff(file);} file.exitChunk(); ++paramCount; // save objvars @@ -810,7 +810,7 @@ void ServerObjectTemplate::save(Iff &file) count = m_visibleFlags.size(); file.insertChunkData(&count, sizeof(count)); {for (int i = 0; i < count; ++i) - m_visibleFlags[i]->saveToIff(file); } + m_visibleFlags[i]->saveToIff(file);} file.exitChunk(); ++paramCount; if (!m_deleteFlagsLoaded) @@ -825,7 +825,7 @@ void ServerObjectTemplate::save(Iff &file) count = m_deleteFlags.size(); file.insertChunkData(&count, sizeof(count)); {for (int i = 0; i < count; ++i) - m_deleteFlags[i]->saveToIff(file); } + m_deleteFlags[i]->saveToIff(file);} file.exitChunk(); ++paramCount; if (!m_moveFlagsLoaded) @@ -840,7 +840,7 @@ void ServerObjectTemplate::save(Iff &file) count = m_moveFlags.size(); file.insertChunkData(&count, sizeof(count)); {for (int i = 0; i < count; ++i) - m_moveFlags[i]->saveToIff(file); } + m_moveFlags[i]->saveToIff(file);} file.exitChunk(); ++paramCount; // save invulnerable @@ -867,7 +867,7 @@ void ServerObjectTemplate::save(Iff &file) count = 3; file.insertChunkData(&count, sizeof(count)); {for (int i = 0; i < 3; ++i) - m_updateRanges[i].saveToIff(file); } + m_updateRanges[i].saveToIff(file);} file.exitChunk(); ++paramCount; if (!m_contentsLoaded) @@ -882,7 +882,7 @@ void ServerObjectTemplate::save(Iff &file) count = m_contents.size(); file.insertChunkData(&count, sizeof(count)); {for (int i = 0; i < count; ++i) - m_contents[i]->saveToIff(file); } + m_contents[i]->saveToIff(file);} file.exitChunk(); ++paramCount; if (!m_xpPointsLoaded) @@ -897,7 +897,7 @@ void ServerObjectTemplate::save(Iff &file) count = m_xpPoints.size(); file.insertChunkData(&count, sizeof(count)); {for (int i = 0; i < count; ++i) - m_xpPoints[i]->saveToIff(file); } + m_xpPoints[i]->saveToIff(file);} file.exitChunk(); ++paramCount; // save persistByDefault @@ -924,6 +924,7 @@ void ServerObjectTemplate::save(Iff &file) file.exitForm(); } // ServerObjectTemplate::save + //============================================================================= // class ServerObjectTemplate::_AttribMod @@ -1111,6 +1112,7 @@ bool ServerObjectTemplate::_AttribMod::isAppend(const char *name) const return TpfTemplate::isAppend(name); } // ServerObjectTemplate::_AttribMod::isAppend + int ServerObjectTemplate::_AttribMod::getListLength(const char *name) const { return TpfTemplate::getListLength(name); @@ -1124,8 +1126,8 @@ int ServerObjectTemplate::_AttribMod::getListLength(const char *name) const */ void ServerObjectTemplate::_AttribMod::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; file.enterForm(); @@ -1161,7 +1163,7 @@ void ServerObjectTemplate::_AttribMod::load(Iff &file) */ void ServerObjectTemplate::_AttribMod::save(Iff &file) { - int count; +int count; file.insertForm(_AttribMod_tag); @@ -1208,6 +1210,7 @@ void ServerObjectTemplate::_AttribMod::save(Iff &file) UNREF(count); } // ServerObjectTemplate::_AttribMod::save + //============================================================================= // class ServerObjectTemplate::_Contents @@ -1367,6 +1370,7 @@ bool ServerObjectTemplate::_Contents::isAppend(const char *name) const return TpfTemplate::isAppend(name); } // ServerObjectTemplate::_Contents::isAppend + int ServerObjectTemplate::_Contents::getListLength(const char *name) const { return TpfTemplate::getListLength(name); @@ -1380,8 +1384,8 @@ int ServerObjectTemplate::_Contents::getListLength(const char *name) const */ void ServerObjectTemplate::_Contents::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; file.enterForm(); @@ -1413,7 +1417,7 @@ void ServerObjectTemplate::_Contents::load(Iff &file) */ void ServerObjectTemplate::_Contents::save(Iff &file) { - int count; +int count; file.insertForm(_Contents_tag); @@ -1448,6 +1452,7 @@ void ServerObjectTemplate::_Contents::save(Iff &file) UNREF(count); } // ServerObjectTemplate::_Contents::save + //============================================================================= // class ServerObjectTemplate::_MentalStateMod @@ -1635,6 +1640,7 @@ bool ServerObjectTemplate::_MentalStateMod::isAppend(const char *name) const return TpfTemplate::isAppend(name); } // ServerObjectTemplate::_MentalStateMod::isAppend + int ServerObjectTemplate::_MentalStateMod::getListLength(const char *name) const { return TpfTemplate::getListLength(name); @@ -1648,8 +1654,8 @@ int ServerObjectTemplate::_MentalStateMod::getListLength(const char *name) const */ void ServerObjectTemplate::_MentalStateMod::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; file.enterForm(); @@ -1685,7 +1691,7 @@ void ServerObjectTemplate::_MentalStateMod::load(Iff &file) */ void ServerObjectTemplate::_MentalStateMod::save(Iff &file) { - int count; +int count; file.insertForm(_MentalStateMod_tag); @@ -1732,6 +1738,7 @@ void ServerObjectTemplate::_MentalStateMod::save(Iff &file) UNREF(count); } // ServerObjectTemplate::_MentalStateMod::save + //============================================================================= // class ServerObjectTemplate::_Xp @@ -1889,6 +1896,7 @@ bool ServerObjectTemplate::_Xp::isAppend(const char *name) const return TpfTemplate::isAppend(name); } // ServerObjectTemplate::_Xp::isAppend + int ServerObjectTemplate::_Xp::getListLength(const char *name) const { return TpfTemplate::getListLength(name); @@ -1902,8 +1910,8 @@ int ServerObjectTemplate::_Xp::getListLength(const char *name) const */ void ServerObjectTemplate::_Xp::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; file.enterForm(); @@ -1935,7 +1943,7 @@ void ServerObjectTemplate::_Xp::load(Iff &file) */ void ServerObjectTemplate::_Xp::save(Iff &file) { - int count; +int count; file.insertForm(_Xp_tag); @@ -1970,4 +1978,4 @@ void ServerObjectTemplate::_Xp::save(Iff &file) UNREF(count); } // ServerObjectTemplate::_Xp::save -//@END TFD \ No newline at end of file +//@END TFD diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/ServerObjectTemplate.h old mode 100755 new mode 100644 diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerPlanetObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerPlanetObjectTemplate.cpp old mode 100755 new mode 100644 index fc998c4a..62efaa60 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerPlanetObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerPlanetObjectTemplate.cpp @@ -17,8 +17,7 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include -#include +#include @@ -86,10 +85,10 @@ Tag ServerPlanetObjectTemplate::getTemplateVersion(void) const */ Tag ServerPlanetObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerPlanetObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerPlanetObjectTemplate::getHighestTemplateVersion diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerPlanetObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/ServerPlanetObjectTemplate.h old mode 100755 new mode 100644 diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerPlayerObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerPlayerObjectTemplate.cpp old mode 100755 new mode 100644 index bd678142..e98be40c --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerPlayerObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerPlayerObjectTemplate.cpp @@ -17,8 +17,7 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include -#include +#include @@ -86,10 +85,10 @@ Tag ServerPlayerObjectTemplate::getTemplateVersion(void) const */ Tag ServerPlayerObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerPlayerObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerPlayerObjectTemplate::getHighestTemplateVersion diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerPlayerObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/ServerPlayerObjectTemplate.h old mode 100755 new mode 100644 diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerPlayerQuestObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerPlayerQuestObjectTemplate.cpp old mode 100755 new mode 100644 index 36c23628..33faec3e --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerPlayerQuestObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerPlayerQuestObjectTemplate.cpp @@ -17,8 +17,7 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include -#include +#include @@ -86,10 +85,10 @@ Tag ServerPlayerQuestObjectTemplate::getTemplateVersion(void) const */ Tag ServerPlayerQuestObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerPlayerQuestObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerPlayerQuestObjectTemplate::getHighestTemplateVersion diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerPlayerQuestObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/ServerPlayerQuestObjectTemplate.h old mode 100755 new mode 100644 diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceClassObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceClassObjectTemplate.cpp old mode 100755 new mode 100644 index 0a5c1bac..dfa0c7fd --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceClassObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceClassObjectTemplate.cpp @@ -17,8 +17,7 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include -#include +#include @@ -86,10 +85,10 @@ Tag ServerResourceClassObjectTemplate::getTemplateVersion(void) const */ Tag ServerResourceClassObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerResourceClassObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerResourceClassObjectTemplate::getHighestTemplateVersion @@ -103,9 +102,9 @@ CompilerIntegerParam * ServerResourceClassObjectTemplate::getCompilerIntegerPara { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_numTypes; } @@ -117,9 +116,9 @@ CompilerIntegerParam * ServerResourceClassObjectTemplate::getCompilerIntegerPara { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_minTypes; } @@ -131,9 +130,9 @@ CompilerIntegerParam * ServerResourceClassObjectTemplate::getCompilerIntegerPara { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_maxTypes; } @@ -141,7 +140,7 @@ CompilerIntegerParam * ServerResourceClassObjectTemplate::getCompilerIntegerPara } else return ServerUniverseObjectTemplate::getCompilerIntegerParam(name, deepCheck, index); - return nullptr; + return NULL; } //ServerResourceClassObjectTemplate::getCompilerIntegerParam FloatParam * ServerResourceClassObjectTemplate::getFloatParam(const char *name, bool deepCheck, int index) @@ -162,9 +161,9 @@ StringParam * ServerResourceClassObjectTemplate::getStringParam(const char *name { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_resourceClassName; } @@ -176,9 +175,9 @@ StringParam * ServerResourceClassObjectTemplate::getStringParam(const char *name { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_parentClass; } @@ -186,7 +185,7 @@ StringParam * ServerResourceClassObjectTemplate::getStringParam(const char *name } else return ServerUniverseObjectTemplate::getStringParam(name, deepCheck, index); - return nullptr; + return NULL; } //ServerResourceClassObjectTemplate::getStringParam StringIdParam * ServerResourceClassObjectTemplate::getStringIdParam(const char *name, bool deepCheck, int index) @@ -269,12 +268,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != nullptr) + DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != NULL) base->releaseReference(); else { - if (m_baseData != nullptr) + if (m_baseData != NULL) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceClassObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceClassObjectTemplate.h old mode 100755 new mode 100644 diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceContainerObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceContainerObjectTemplate.cpp old mode 100755 new mode 100644 index c4008c2f..4085661c --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceContainerObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceContainerObjectTemplate.cpp @@ -17,8 +17,7 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include -#include +#include @@ -86,10 +85,10 @@ Tag ServerResourceContainerObjectTemplate::getTemplateVersion(void) const */ Tag ServerResourceContainerObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerResourceContainerObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerResourceContainerObjectTemplate::getHighestTemplateVersion diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceContainerObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceContainerObjectTemplate.h old mode 100755 new mode 100644 diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerResourcePoolObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerResourcePoolObjectTemplate.cpp old mode 100755 new mode 100644 index 15ad8ebc..87e8bab4 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerResourcePoolObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerResourcePoolObjectTemplate.cpp @@ -17,8 +17,7 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include -#include +#include @@ -86,10 +85,10 @@ Tag ServerResourcePoolObjectTemplate::getTemplateVersion(void) const */ Tag ServerResourcePoolObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerResourcePoolObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerResourcePoolObjectTemplate::getHighestTemplateVersion @@ -103,9 +102,9 @@ CompilerIntegerParam * ServerResourcePoolObjectTemplate::getCompilerIntegerParam { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_mapSeed; } @@ -117,9 +116,9 @@ CompilerIntegerParam * ServerResourcePoolObjectTemplate::getCompilerIntegerParam { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_amountRemaining; } @@ -127,7 +126,7 @@ CompilerIntegerParam * ServerResourcePoolObjectTemplate::getCompilerIntegerParam } else return ServerUniverseObjectTemplate::getCompilerIntegerParam(name, deepCheck, index); - return nullptr; + return NULL; } //ServerResourcePoolObjectTemplate::getCompilerIntegerParam FloatParam * ServerResourcePoolObjectTemplate::getFloatParam(const char *name, bool deepCheck, int index) @@ -225,12 +224,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != nullptr) + DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != NULL) base->releaseReference(); else { - if (m_baseData != nullptr) + if (m_baseData != NULL) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerResourcePoolObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/ServerResourcePoolObjectTemplate.h old mode 100755 new mode 100644 diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceTypeObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceTypeObjectTemplate.cpp old mode 100755 new mode 100644 index 7ed9954d..eb9604fd --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceTypeObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceTypeObjectTemplate.cpp @@ -17,8 +17,7 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include -#include +#include @@ -86,10 +85,10 @@ Tag ServerResourceTypeObjectTemplate::getTemplateVersion(void) const */ Tag ServerResourceTypeObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerResourceTypeObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerResourceTypeObjectTemplate::getHighestTemplateVersion @@ -118,9 +117,9 @@ StringParam * ServerResourceTypeObjectTemplate::getStringParam(const char *name, { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_resourceName; } @@ -128,7 +127,7 @@ StringParam * ServerResourceTypeObjectTemplate::getStringParam(const char *name, } else return ServerUniverseObjectTemplate::getStringParam(name, deepCheck, index); - return nullptr; + return NULL; } //ServerResourceTypeObjectTemplate::getStringParam StringIdParam * ServerResourceTypeObjectTemplate::getStringIdParam(const char *name, bool deepCheck, int index) @@ -211,12 +210,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != nullptr) + DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != NULL) base->releaseReference(); else { - if (m_baseData != nullptr) + if (m_baseData != NULL) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceTypeObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceTypeObjectTemplate.h old mode 100755 new mode 100644 diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerShipObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerShipObjectTemplate.cpp old mode 100755 new mode 100644 index c1bb613c..9be2a3a6 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerShipObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerShipObjectTemplate.cpp @@ -17,8 +17,7 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include -#include +#include @@ -86,10 +85,10 @@ Tag ServerShipObjectTemplate::getTemplateVersion(void) const */ Tag ServerShipObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerShipObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerShipObjectTemplate::getHighestTemplateVersion diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerShipObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/ServerShipObjectTemplate.h old mode 100755 new mode 100644 diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerStaticObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerStaticObjectTemplate.cpp old mode 100755 new mode 100644 index 48fe0b50..6768c4ec --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerStaticObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerStaticObjectTemplate.cpp @@ -17,8 +17,7 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include -#include +#include @@ -86,10 +85,10 @@ Tag ServerStaticObjectTemplate::getTemplateVersion(void) const */ Tag ServerStaticObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerStaticObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerStaticObjectTemplate::getHighestTemplateVersion diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerStaticObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/ServerStaticObjectTemplate.h old mode 100755 new mode 100644 diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerTangibleObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerTangibleObjectTemplate.cpp old mode 100755 new mode 100644 index 980b1547..1a88f18c --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerTangibleObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerTangibleObjectTemplate.cpp @@ -17,8 +17,9 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include -#include +#include + + /** * Class constructor. @@ -26,11 +27,9 @@ ServerTangibleObjectTemplate::ServerTangibleObjectTemplate(const std::string & filename) //@BEGIN TFD INIT : ServerObjectTemplate(filename) - , m_triggerVolumesLoaded(false) - , m_triggerVolumesAppend(false) - , m_templateVersion(0) - , m_versionOk(false) - //@END TFD INIT + ,m_triggerVolumesLoaded(false) + ,m_triggerVolumesAppend(false) +//@END TFD INIT { } // ServerTangibleObjectTemplate::ServerTangibleObjectTemplate @@ -39,7 +38,7 @@ ServerTangibleObjectTemplate::ServerTangibleObjectTemplate(const std::string & f */ ServerTangibleObjectTemplate::~ServerTangibleObjectTemplate() { - //@BEGIN TFD CLEANUP +//@BEGIN TFD CLEANUP { std::vector::iterator iter; for (iter = m_triggerVolumes.begin(); iter != m_triggerVolumes.end(); ++iter) @@ -49,7 +48,7 @@ ServerTangibleObjectTemplate::~ServerTangibleObjectTemplate() } m_triggerVolumes.clear(); } - //@END TFD CLEANUP +//@END TFD CLEANUP } // ServerTangibleObjectTemplate::~ServerTangibleObjectTemplate /** @@ -97,10 +96,10 @@ Tag ServerTangibleObjectTemplate::getTemplateVersion(void) const */ Tag ServerTangibleObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerTangibleObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerTangibleObjectTemplate::getHighestTemplateVersion @@ -303,6 +302,7 @@ bool ServerTangibleObjectTemplate::isAppend(const char *name) const return ServerObjectTemplate::isAppend(name); } // ServerTangibleObjectTemplate::isAppend + int ServerTangibleObjectTemplate::getListLength(const char *name) const { if (strcmp(name, "triggerVolumes") == 0) @@ -321,8 +321,8 @@ int ServerTangibleObjectTemplate::getListLength(const char *name) const */ void ServerTangibleObjectTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != ServerTangibleObjectTemplate_tag) { @@ -332,7 +332,7 @@ void ServerTangibleObjectTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -352,7 +352,7 @@ void ServerTangibleObjectTemplate::load(Iff &file) file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 0, 4)) + if (getHighestTemplateVersion() != TAG(0,0,0,4)) { if (DataLint::isEnabled()) DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); @@ -417,18 +417,18 @@ void ServerTangibleObjectTemplate::load(Iff &file) */ void ServerTangibleObjectTemplate::save(Iff &file) { - int count; +int count; file.insertForm(ServerTangibleObjectTemplate_tag); if (m_baseTemplateName.size() != 0) { - file.insertForm(TAG(D, E, R, V)); + file.insertForm(TAG(D,E,R,V)); file.insertChunk(TAG(X, X, X, X)); file.insertChunkData(m_baseTemplateName.c_str(), m_baseTemplateName.size() + 1); file.exitChunk(); file.exitForm(); } - file.insertForm(TAG(0, 0, 0, 4)); + file.insertForm(TAG(0,0,0,4)); file.allowNonlinearFunctions(); int paramCount = 0; @@ -445,7 +445,7 @@ void ServerTangibleObjectTemplate::save(Iff &file) count = m_triggerVolumes.size(); file.insertChunkData(&count, sizeof(count)); {for (int i = 0; i < count; ++i) - m_triggerVolumes[i]->saveToIff(file); } + m_triggerVolumes[i]->saveToIff(file);} file.exitChunk(); ++paramCount; // save combatSkeleton @@ -502,4 +502,4 @@ void ServerTangibleObjectTemplate::save(Iff &file) file.exitForm(); } // ServerTangibleObjectTemplate::save -//@END TFD \ No newline at end of file +//@END TFD diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerTangibleObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/ServerTangibleObjectTemplate.h old mode 100755 new mode 100644 index 04aeb3c0..b83009c7 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerTangibleObjectTemplate.h +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerTangibleObjectTemplate.h @@ -77,7 +77,10 @@ public: C_inflightTutorial = 0x00800000, C_spaceCombatMusic = 0x01000000, // Set programmatically by the AI system. Do not set this in the template. C_encounterLocked = 0x02000000, - Conditions_Last = C_encounterLocked, + C_spawnedCreature = 0x04000000, + C_holidayInteresting = 0x08000000, + C_locked = 0x10000000, + Conditions_Last = C_locked, }; public: @@ -101,8 +104,11 @@ protected: virtual void save(Iff &file); private: - // these MUST be reflected in clientGame/TangibleObject.h - // these MUST be reflected in base_class.java + // these MUST be reflected in: + // //depot/swg/current/dsrc/sku.0/sys.server/compiled/game/object/tangible_object_template.tdf + // //depot/swg/current/dsrc/sku.0/sys.server/compiled/game/script/base_class.java + // //depot/swg/current/src/engine/client/library/clientGame/src/shared/object/TangibleObject.h + // //depot/swg/current/src/engine/server/library/serverGame/src/shared/object/TangibleObject.h stdvector::fwd m_triggerVolumes; // trigger volume(s) attached to the object bool m_triggerVolumesLoaded; bool m_triggerVolumesAppend; diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerTokenObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerTokenObjectTemplate.cpp old mode 100755 new mode 100644 index a3cac916..5397fcc6 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerTokenObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerTokenObjectTemplate.cpp @@ -17,8 +17,7 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include -#include +#include @@ -86,10 +85,10 @@ Tag ServerTokenObjectTemplate::getTemplateVersion(void) const */ Tag ServerTokenObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerTokenObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerTokenObjectTemplate::getHighestTemplateVersion diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerTokenObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/ServerTokenObjectTemplate.h old mode 100755 new mode 100644 diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerUberObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerUberObjectTemplate.cpp old mode 100755 new mode 100644 index 16239668..12a2714a --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerUberObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerUberObjectTemplate.cpp @@ -17,8 +17,9 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include -#include +#include + + /** * Class constructor. @@ -26,53 +27,51 @@ ServerUberObjectTemplate::ServerUberObjectTemplate(const std::string & filename) //@BEGIN TFD INIT : TpfTemplate(filename) - , m_intListSimpleLoaded(false) - , m_intListSimpleAppend(false) - , m_intListWeightedListLoaded(false) - , m_intListWeightedListAppend(false) - , m_intListRandomRangeLoaded(false) - , m_intListRandomRangeAppend(false) - , m_intListDiceRollLoaded(false) - , m_intListDiceRollAppend(false) - , m_floatListSimpleLoaded(false) - , m_floatListSimpleAppend(false) - , m_floatListWeightedListLoaded(false) - , m_floatListWeightedListAppend(false) - , m_floatListRandomRangeLoaded(false) - , m_floatListRandomRangeAppend(false) - , m_enumListIndexedLoaded(false) - , m_enumListIndexedAppend(false) - , m_enumListWeightedListLoaded(false) - , m_enumListWeightedListAppend(false) - , m_stringIdListSimpleLoaded(false) - , m_stringIdListSimpleAppend(false) - , m_stringIdListWeightedListLoaded(false) - , m_stringIdListWeightedListAppend(false) - , m_stringListSimpleLoaded(false) - , m_stringListSimpleAppend(false) - , m_stringListWeightedListLoaded(false) - , m_stringListWeightedListAppend(false) - , m_triggerVolumeListLoaded(false) - , m_triggerVolumeListAppend(false) - , m_triggerVolumesListWeightedListLoaded(false) - , m_triggerVolumesListWeightedListAppend(false) - , m_boolListDerivedLoaded(false) - , m_boolListDerivedAppend(false) - , m_boolListSimpleLoaded(false) - , m_boolListSimpleAppend(false) - , m_boolListWeightedListLoaded(false) - , m_boolListWeightedListAppend(false) - , m_vectorListSimpleLoaded(false) - , m_vectorListSimpleAppend(false) - , m_filenameListSimpleLoaded(false) - , m_filenameListSimpleAppend(false) - , m_templateListSimpleLoaded(false) - , m_templateListSimpleAppend(false) - , m_structListSimpleLoaded(false) - , m_structListSimpleAppend(false) - , m_templateVersion(0) - , m_versionOk(false) - //@END TFD INIT + ,m_intListSimpleLoaded(false) + ,m_intListSimpleAppend(false) + ,m_intListWeightedListLoaded(false) + ,m_intListWeightedListAppend(false) + ,m_intListRandomRangeLoaded(false) + ,m_intListRandomRangeAppend(false) + ,m_intListDiceRollLoaded(false) + ,m_intListDiceRollAppend(false) + ,m_floatListSimpleLoaded(false) + ,m_floatListSimpleAppend(false) + ,m_floatListWeightedListLoaded(false) + ,m_floatListWeightedListAppend(false) + ,m_floatListRandomRangeLoaded(false) + ,m_floatListRandomRangeAppend(false) + ,m_enumListIndexedLoaded(false) + ,m_enumListIndexedAppend(false) + ,m_enumListWeightedListLoaded(false) + ,m_enumListWeightedListAppend(false) + ,m_stringIdListSimpleLoaded(false) + ,m_stringIdListSimpleAppend(false) + ,m_stringIdListWeightedListLoaded(false) + ,m_stringIdListWeightedListAppend(false) + ,m_stringListSimpleLoaded(false) + ,m_stringListSimpleAppend(false) + ,m_stringListWeightedListLoaded(false) + ,m_stringListWeightedListAppend(false) + ,m_triggerVolumeListLoaded(false) + ,m_triggerVolumeListAppend(false) + ,m_triggerVolumesListWeightedListLoaded(false) + ,m_triggerVolumesListWeightedListAppend(false) + ,m_boolListDerivedLoaded(false) + ,m_boolListDerivedAppend(false) + ,m_boolListSimpleLoaded(false) + ,m_boolListSimpleAppend(false) + ,m_boolListWeightedListLoaded(false) + ,m_boolListWeightedListAppend(false) + ,m_vectorListSimpleLoaded(false) + ,m_vectorListSimpleAppend(false) + ,m_filenameListSimpleLoaded(false) + ,m_filenameListSimpleAppend(false) + ,m_templateListSimpleLoaded(false) + ,m_templateListSimpleAppend(false) + ,m_structListSimpleLoaded(false) + ,m_structListSimpleAppend(false) +//@END TFD INIT { } // ServerUberObjectTemplate::ServerUberObjectTemplate @@ -81,13 +80,13 @@ ServerUberObjectTemplate::ServerUberObjectTemplate(const std::string & filename) */ ServerUberObjectTemplate::~ServerUberObjectTemplate() { - //@BEGIN TFD CLEANUP +//@BEGIN TFD CLEANUP { std::vector::iterator iter; for (iter = m_intListSimple.begin(); iter != m_intListSimple.end(); ++iter) { delete *iter; - *iter = nullptr; + *iter = NULL; } } { @@ -95,7 +94,7 @@ ServerUberObjectTemplate::~ServerUberObjectTemplate() for (iter = m_intListWeightedList.begin(); iter != m_intListWeightedList.end(); ++iter) { delete *iter; - *iter = nullptr; + *iter = NULL; } } { @@ -103,7 +102,7 @@ ServerUberObjectTemplate::~ServerUberObjectTemplate() for (iter = m_intListRandomRange.begin(); iter != m_intListRandomRange.end(); ++iter) { delete *iter; - *iter = nullptr; + *iter = NULL; } } { @@ -111,7 +110,7 @@ ServerUberObjectTemplate::~ServerUberObjectTemplate() for (iter = m_intListDiceRoll.begin(); iter != m_intListDiceRoll.end(); ++iter) { delete *iter; - *iter = nullptr; + *iter = NULL; } } { @@ -119,7 +118,7 @@ ServerUberObjectTemplate::~ServerUberObjectTemplate() for (iter = m_floatListSimple.begin(); iter != m_floatListSimple.end(); ++iter) { delete *iter; - *iter = nullptr; + *iter = NULL; } } { @@ -127,7 +126,7 @@ ServerUberObjectTemplate::~ServerUberObjectTemplate() for (iter = m_floatListWeightedList.begin(); iter != m_floatListWeightedList.end(); ++iter) { delete *iter; - *iter = nullptr; + *iter = NULL; } } { @@ -135,7 +134,7 @@ ServerUberObjectTemplate::~ServerUberObjectTemplate() for (iter = m_floatListRandomRange.begin(); iter != m_floatListRandomRange.end(); ++iter) { delete *iter; - *iter = nullptr; + *iter = NULL; } } { @@ -143,7 +142,7 @@ ServerUberObjectTemplate::~ServerUberObjectTemplate() for (iter = m_enumListIndexed.begin(); iter != m_enumListIndexed.end(); ++iter) { delete *iter; - *iter = nullptr; + *iter = NULL; } } { @@ -151,7 +150,7 @@ ServerUberObjectTemplate::~ServerUberObjectTemplate() for (iter = m_enumListWeightedList.begin(); iter != m_enumListWeightedList.end(); ++iter) { delete *iter; - *iter = nullptr; + *iter = NULL; } } { @@ -159,7 +158,7 @@ ServerUberObjectTemplate::~ServerUberObjectTemplate() for (iter = m_stringIdListSimple.begin(); iter != m_stringIdListSimple.end(); ++iter) { delete *iter; - *iter = nullptr; + *iter = NULL; } } { @@ -167,7 +166,7 @@ ServerUberObjectTemplate::~ServerUberObjectTemplate() for (iter = m_stringIdListWeightedList.begin(); iter != m_stringIdListWeightedList.end(); ++iter) { delete *iter; - *iter = nullptr; + *iter = NULL; } } { @@ -175,7 +174,7 @@ ServerUberObjectTemplate::~ServerUberObjectTemplate() for (iter = m_stringListSimple.begin(); iter != m_stringListSimple.end(); ++iter) { delete *iter; - *iter = nullptr; + *iter = NULL; } } { @@ -183,7 +182,7 @@ ServerUberObjectTemplate::~ServerUberObjectTemplate() for (iter = m_stringListWeightedList.begin(); iter != m_stringListWeightedList.end(); ++iter) { delete *iter; - *iter = nullptr; + *iter = NULL; } } { @@ -191,7 +190,7 @@ ServerUberObjectTemplate::~ServerUberObjectTemplate() for (iter = m_triggerVolumeList.begin(); iter != m_triggerVolumeList.end(); ++iter) { delete *iter; - *iter = nullptr; + *iter = NULL; } } { @@ -199,7 +198,7 @@ ServerUberObjectTemplate::~ServerUberObjectTemplate() for (iter = m_triggerVolumesListWeightedList.begin(); iter != m_triggerVolumesListWeightedList.end(); ++iter) { delete *iter; - *iter = nullptr; + *iter = NULL; } } { @@ -207,7 +206,7 @@ ServerUberObjectTemplate::~ServerUberObjectTemplate() for (iter = m_boolListDerived.begin(); iter != m_boolListDerived.end(); ++iter) { delete *iter; - *iter = nullptr; + *iter = NULL; } } { @@ -215,7 +214,7 @@ ServerUberObjectTemplate::~ServerUberObjectTemplate() for (iter = m_boolListSimple.begin(); iter != m_boolListSimple.end(); ++iter) { delete *iter; - *iter = nullptr; + *iter = NULL; } } { @@ -223,7 +222,7 @@ ServerUberObjectTemplate::~ServerUberObjectTemplate() for (iter = m_boolListWeightedList.begin(); iter != m_boolListWeightedList.end(); ++iter) { delete *iter; - *iter = nullptr; + *iter = NULL; } } { @@ -231,7 +230,7 @@ ServerUberObjectTemplate::~ServerUberObjectTemplate() for (iter = m_vectorListSimple.begin(); iter != m_vectorListSimple.end(); ++iter) { delete *iter; - *iter = nullptr; + *iter = NULL; } } { @@ -239,7 +238,7 @@ ServerUberObjectTemplate::~ServerUberObjectTemplate() for (iter = m_filenameListSimple.begin(); iter != m_filenameListSimple.end(); ++iter) { delete *iter; - *iter = nullptr; + *iter = NULL; } } { @@ -247,7 +246,7 @@ ServerUberObjectTemplate::~ServerUberObjectTemplate() for (iter = m_templateListSimple.begin(); iter != m_templateListSimple.end(); ++iter) { delete *iter; - *iter = nullptr; + *iter = NULL; } } { @@ -255,10 +254,10 @@ ServerUberObjectTemplate::~ServerUberObjectTemplate() for (iter = m_structListSimple.begin(); iter != m_structListSimple.end(); ++iter) { delete *iter; - *iter = nullptr; + *iter = NULL; } } - //@END TFD CLEANUP +//@END TFD CLEANUP } // ServerUberObjectTemplate::~ServerUberObjectTemplate /** @@ -306,10 +305,10 @@ Tag ServerUberObjectTemplate::getTemplateVersion(void) const */ Tag ServerUberObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerUberObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerUberObjectTemplate::getHighestTemplateVersion @@ -323,9 +322,9 @@ CompilerIntegerParam * ServerUberObjectTemplate::getCompilerIntegerParam(const c { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_intAtDerived; } @@ -337,9 +336,9 @@ CompilerIntegerParam * ServerUberObjectTemplate::getCompilerIntegerParam(const c { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_intSimple; } @@ -351,9 +350,9 @@ CompilerIntegerParam * ServerUberObjectTemplate::getCompilerIntegerParam(const c { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_intSimpleDeltaPositive; } @@ -365,9 +364,9 @@ CompilerIntegerParam * ServerUberObjectTemplate::getCompilerIntegerParam(const c { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_intSimpleDeltaNegative; } @@ -379,9 +378,9 @@ CompilerIntegerParam * ServerUberObjectTemplate::getCompilerIntegerParam(const c { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_intSimpleDeltaPositivePercent; } @@ -393,9 +392,9 @@ CompilerIntegerParam * ServerUberObjectTemplate::getCompilerIntegerParam(const c { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_intSimpleDeltaNegativePercent; } @@ -407,9 +406,9 @@ CompilerIntegerParam * ServerUberObjectTemplate::getCompilerIntegerParam(const c { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_intWeightedList; } @@ -421,9 +420,9 @@ CompilerIntegerParam * ServerUberObjectTemplate::getCompilerIntegerParam(const c { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_intWeightedListDeltaPositive; } @@ -435,9 +434,9 @@ CompilerIntegerParam * ServerUberObjectTemplate::getCompilerIntegerParam(const c { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_intWeightedListDeltaNegative; } @@ -449,9 +448,9 @@ CompilerIntegerParam * ServerUberObjectTemplate::getCompilerIntegerParam(const c { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_intWeightedListDeltaPositivePercent; } @@ -463,9 +462,9 @@ CompilerIntegerParam * ServerUberObjectTemplate::getCompilerIntegerParam(const c { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_intWeightedListDeltaNegativePercent; } @@ -477,9 +476,9 @@ CompilerIntegerParam * ServerUberObjectTemplate::getCompilerIntegerParam(const c { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_intRandomRange1; } @@ -491,9 +490,9 @@ CompilerIntegerParam * ServerUberObjectTemplate::getCompilerIntegerParam(const c { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_intRandomRange2; } @@ -505,9 +504,9 @@ CompilerIntegerParam * ServerUberObjectTemplate::getCompilerIntegerParam(const c { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_intRandomRange3; } @@ -519,9 +518,9 @@ CompilerIntegerParam * ServerUberObjectTemplate::getCompilerIntegerParam(const c { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_intRandomRange4; } @@ -533,9 +532,9 @@ CompilerIntegerParam * ServerUberObjectTemplate::getCompilerIntegerParam(const c { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_intDiceRoll1; } @@ -547,9 +546,9 @@ CompilerIntegerParam * ServerUberObjectTemplate::getCompilerIntegerParam(const c { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_intDiceRoll2; } @@ -609,9 +608,9 @@ CompilerIntegerParam * ServerUberObjectTemplate::getCompilerIntegerParam(const c { if (deepCheck && !isParamLoaded(name, false, index)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_enumIndexedByEnumSingle[index]; } @@ -623,9 +622,9 @@ CompilerIntegerParam * ServerUberObjectTemplate::getCompilerIntegerParam(const c { if (deepCheck && !isParamLoaded(name, false, index)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_enumIndexedByEnumWeightedList[index]; } @@ -661,9 +660,9 @@ CompilerIntegerParam * ServerUberObjectTemplate::getCompilerIntegerParam(const c { if (deepCheck && !isParamLoaded(name, false, index)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_integerArray[index]; } @@ -671,7 +670,7 @@ CompilerIntegerParam * ServerUberObjectTemplate::getCompilerIntegerParam(const c } else return TpfTemplate::getCompilerIntegerParam(name, deepCheck, index); - return nullptr; + return NULL; } //ServerUberObjectTemplate::getCompilerIntegerParam FloatParam * ServerUberObjectTemplate::getFloatParam(const char *name, bool deepCheck, int index) @@ -682,9 +681,9 @@ FloatParam * ServerUberObjectTemplate::getFloatParam(const char *name, bool deep { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_floatAtDerived; } @@ -696,9 +695,9 @@ FloatParam * ServerUberObjectTemplate::getFloatParam(const char *name, bool deep { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_floatSimple; } @@ -710,9 +709,9 @@ FloatParam * ServerUberObjectTemplate::getFloatParam(const char *name, bool deep { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_floatSimpleDeltaPositive; } @@ -724,9 +723,9 @@ FloatParam * ServerUberObjectTemplate::getFloatParam(const char *name, bool deep { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_floatSimpleDeltaNegative; } @@ -738,9 +737,9 @@ FloatParam * ServerUberObjectTemplate::getFloatParam(const char *name, bool deep { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_floatSimpleDeltaPositivePercent; } @@ -752,9 +751,9 @@ FloatParam * ServerUberObjectTemplate::getFloatParam(const char *name, bool deep { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_floatSimpleDeltaNegativePercent; } @@ -766,9 +765,9 @@ FloatParam * ServerUberObjectTemplate::getFloatParam(const char *name, bool deep { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_floatWeightedList; } @@ -780,9 +779,9 @@ FloatParam * ServerUberObjectTemplate::getFloatParam(const char *name, bool deep { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_floatRandomRange1; } @@ -794,9 +793,9 @@ FloatParam * ServerUberObjectTemplate::getFloatParam(const char *name, bool deep { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_floatRandomRange2; } @@ -808,9 +807,9 @@ FloatParam * ServerUberObjectTemplate::getFloatParam(const char *name, bool deep { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_floatRandomRange3; } @@ -822,9 +821,9 @@ FloatParam * ServerUberObjectTemplate::getFloatParam(const char *name, bool deep { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_floatRandomRange4; } @@ -872,9 +871,9 @@ FloatParam * ServerUberObjectTemplate::getFloatParam(const char *name, bool deep { if (deepCheck && !isParamLoaded(name, false, index)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_floatArray[index]; } @@ -882,7 +881,7 @@ FloatParam * ServerUberObjectTemplate::getFloatParam(const char *name, bool deep } else return TpfTemplate::getFloatParam(name, deepCheck, index); - return nullptr; + return NULL; } //ServerUberObjectTemplate::getFloatParam BoolParam * ServerUberObjectTemplate::getBoolParam(const char *name, bool deepCheck, int index) @@ -893,9 +892,9 @@ BoolParam * ServerUberObjectTemplate::getBoolParam(const char *name, bool deepCh { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getBoolParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_boolDerived; } @@ -907,9 +906,9 @@ BoolParam * ServerUberObjectTemplate::getBoolParam(const char *name, bool deepCh { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getBoolParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_boolSimple; } @@ -921,9 +920,9 @@ BoolParam * ServerUberObjectTemplate::getBoolParam(const char *name, bool deepCh { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getBoolParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_boolWeightedList; } @@ -971,9 +970,9 @@ BoolParam * ServerUberObjectTemplate::getBoolParam(const char *name, bool deepCh { if (deepCheck && !isParamLoaded(name, false, index)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getBoolParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_boolArray[index]; } @@ -981,7 +980,7 @@ BoolParam * ServerUberObjectTemplate::getBoolParam(const char *name, bool deepCh } else return TpfTemplate::getBoolParam(name, deepCheck, index); - return nullptr; + return NULL; } //ServerUberObjectTemplate::getBoolParam StringParam * ServerUberObjectTemplate::getStringParam(const char *name, bool deepCheck, int index) @@ -992,9 +991,9 @@ StringParam * ServerUberObjectTemplate::getStringParam(const char *name, bool de { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_stringDerived; } @@ -1006,9 +1005,9 @@ StringParam * ServerUberObjectTemplate::getStringParam(const char *name, bool de { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_stringSimple; } @@ -1020,9 +1019,9 @@ StringParam * ServerUberObjectTemplate::getStringParam(const char *name, bool de { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_stringWeightedList; } @@ -1058,9 +1057,9 @@ StringParam * ServerUberObjectTemplate::getStringParam(const char *name, bool de { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_filenameAtDerived; } @@ -1072,9 +1071,9 @@ StringParam * ServerUberObjectTemplate::getStringParam(const char *name, bool de { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_filenameSimple; } @@ -1086,9 +1085,9 @@ StringParam * ServerUberObjectTemplate::getStringParam(const char *name, bool de { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_filenameWeightedList; } @@ -1112,9 +1111,9 @@ StringParam * ServerUberObjectTemplate::getStringParam(const char *name, bool de { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_templateDerived; } @@ -1126,9 +1125,9 @@ StringParam * ServerUberObjectTemplate::getStringParam(const char *name, bool de { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_templateSimple; } @@ -1140,9 +1139,9 @@ StringParam * ServerUberObjectTemplate::getStringParam(const char *name, bool de { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_templateWeightedList; } @@ -1166,9 +1165,9 @@ StringParam * ServerUberObjectTemplate::getStringParam(const char *name, bool de { if (deepCheck && !isParamLoaded(name, false, index)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_stringArray[index]; } @@ -1180,9 +1179,9 @@ StringParam * ServerUberObjectTemplate::getStringParam(const char *name, bool de { if (deepCheck && !isParamLoaded(name, false, index)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_fileNameArray[index]; } @@ -1190,7 +1189,7 @@ StringParam * ServerUberObjectTemplate::getStringParam(const char *name, bool de } else return TpfTemplate::getStringParam(name, deepCheck, index); - return nullptr; + return NULL; } //ServerUberObjectTemplate::getStringParam StringIdParam * ServerUberObjectTemplate::getStringIdParam(const char *name, bool deepCheck, int index) @@ -1201,9 +1200,9 @@ StringIdParam * ServerUberObjectTemplate::getStringIdParam(const char *name, boo { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getStringIdParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_stringIdDerived; } @@ -1215,9 +1214,9 @@ StringIdParam * ServerUberObjectTemplate::getStringIdParam(const char *name, boo { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getStringIdParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_stringIdSimple; } @@ -1229,9 +1228,9 @@ StringIdParam * ServerUberObjectTemplate::getStringIdParam(const char *name, boo { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getStringIdParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_stringIdWeightedList; } @@ -1267,9 +1266,9 @@ StringIdParam * ServerUberObjectTemplate::getStringIdParam(const char *name, boo { if (deepCheck && !isParamLoaded(name, false, index)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getStringIdParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_stringIdArray[index]; } @@ -1277,7 +1276,7 @@ StringIdParam * ServerUberObjectTemplate::getStringIdParam(const char *name, boo } else return TpfTemplate::getStringIdParam(name, deepCheck, index); - return nullptr; + return NULL; } //ServerUberObjectTemplate::getStringIdParam VectorParam * ServerUberObjectTemplate::getVectorParam(const char *name, bool deepCheck, int index) @@ -1288,9 +1287,9 @@ VectorParam * ServerUberObjectTemplate::getVectorParam(const char *name, bool de { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getVectorParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_vectorAtDerived; } @@ -1302,9 +1301,9 @@ VectorParam * ServerUberObjectTemplate::getVectorParam(const char *name, bool de { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getVectorParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_vectorSimple; } @@ -1328,9 +1327,9 @@ VectorParam * ServerUberObjectTemplate::getVectorParam(const char *name, bool de { if (deepCheck && !isParamLoaded(name, false, index)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getVectorParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_vectorArray[index]; } @@ -1338,7 +1337,7 @@ VectorParam * ServerUberObjectTemplate::getVectorParam(const char *name, bool de } else return TpfTemplate::getVectorParam(name, deepCheck, index); - return nullptr; + return NULL; } //ServerUberObjectTemplate::getVectorParam DynamicVariableParam * ServerUberObjectTemplate::getDynamicVariableParam(const char *name, bool deepCheck, int index) @@ -1349,9 +1348,9 @@ DynamicVariableParam * ServerUberObjectTemplate::getDynamicVariableParam(const c { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getDynamicVariableParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_objvarDerived; } @@ -1363,9 +1362,9 @@ DynamicVariableParam * ServerUberObjectTemplate::getDynamicVariableParam(const c { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getDynamicVariableParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_objvarSimple; } @@ -1373,7 +1372,7 @@ DynamicVariableParam * ServerUberObjectTemplate::getDynamicVariableParam(const c } else return TpfTemplate::getDynamicVariableParam(name, deepCheck, index); - return nullptr; + return NULL; } //ServerUberObjectTemplate::getDynamicVariableParam StructParamOT * ServerUberObjectTemplate::getStructParamOT(const char *name, bool deepCheck, int index) @@ -1384,9 +1383,9 @@ StructParamOT * ServerUberObjectTemplate::getStructParamOT(const char *name, boo { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getStructParamOT(name, deepCheck, index); - return nullptr; + return NULL; } return &m_structAtDerived; } @@ -1398,9 +1397,9 @@ StructParamOT * ServerUberObjectTemplate::getStructParamOT(const char *name, boo { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getStructParamOT(name, deepCheck, index); - return nullptr; + return NULL; } return &m_structSimple; } @@ -1424,9 +1423,9 @@ StructParamOT * ServerUberObjectTemplate::getStructParamOT(const char *name, boo { if (deepCheck && !isParamLoaded(name, false, index)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getStructParamOT(name, deepCheck, index); - return nullptr; + return NULL; } return &m_structArrayEnum[index]; } @@ -1438,9 +1437,9 @@ StructParamOT * ServerUberObjectTemplate::getStructParamOT(const char *name, boo { if (deepCheck && !isParamLoaded(name, false, index)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getStructParamOT(name, deepCheck, index); - return nullptr; + return NULL; } return &m_structArrayInteger[index]; } @@ -1448,7 +1447,7 @@ StructParamOT * ServerUberObjectTemplate::getStructParamOT(const char *name, boo } else return TpfTemplate::getStructParamOT(name, deepCheck, index); - return nullptr; + return NULL; } //ServerUberObjectTemplate::getStructParamOT TriggerVolumeParam * ServerUberObjectTemplate::getTriggerVolumeParam(const char *name, bool deepCheck, int index) @@ -1459,9 +1458,9 @@ TriggerVolumeParam * ServerUberObjectTemplate::getTriggerVolumeParam(const char { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getTriggerVolumeParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_triggerVolumeDerived; } @@ -1473,9 +1472,9 @@ TriggerVolumeParam * ServerUberObjectTemplate::getTriggerVolumeParam(const char { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getTriggerVolumeParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_triggerVolumeSimple; } @@ -1487,9 +1486,9 @@ TriggerVolumeParam * ServerUberObjectTemplate::getTriggerVolumeParam(const char { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getTriggerVolumeParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_triggerVolumeWeightedList; } @@ -1525,9 +1524,9 @@ TriggerVolumeParam * ServerUberObjectTemplate::getTriggerVolumeParam(const char { if (deepCheck && !isParamLoaded(name, false, index)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getTriggerVolumeParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_triggerArray[index]; } @@ -1535,7 +1534,7 @@ TriggerVolumeParam * ServerUberObjectTemplate::getTriggerVolumeParam(const char } else return TpfTemplate::getTriggerVolumeParam(name, deepCheck, index); - return nullptr; + return NULL; } //ServerUberObjectTemplate::getTriggerVolumeParam void ServerUberObjectTemplate::initStructParamOT(StructParamOT ¶m, const char *name) @@ -1772,6 +1771,7 @@ bool ServerUberObjectTemplate::isAppend(const char *name) const return TpfTemplate::isAppend(name); } // ServerUberObjectTemplate::isAppend + int ServerUberObjectTemplate::getListLength(const char *name) const { if (strcmp(name, "intListSimple") == 0) @@ -1922,8 +1922,8 @@ int ServerUberObjectTemplate::getListLength(const char *name) const */ void ServerUberObjectTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != ServerUberObjectTemplate_tag) { @@ -1933,7 +1933,7 @@ void ServerUberObjectTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -1941,19 +1941,19 @@ void ServerUberObjectTemplate::load(Iff &file) file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != nullptr) + DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != NULL) base->releaseReference(); else { - if (m_baseData != nullptr) + if (m_baseData != NULL) m_baseData->releaseReference(); m_baseData = base; } file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 0, 0)) + if (getHighestTemplateVersion() != TAG(0,0,0,0)) { if (DataLint::isEnabled()) DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); @@ -2008,7 +2008,7 @@ void ServerUberObjectTemplate::load(Iff &file) for (iter = m_intListSimple.begin(); iter != m_intListSimple.end(); ++iter) { delete *iter; - *iter = nullptr; + *iter = NULL; } m_intListSimpleAppend = file.read_bool8(); int listCount = file.read_int32(); @@ -2026,7 +2026,7 @@ void ServerUberObjectTemplate::load(Iff &file) for (iter = m_intListWeightedList.begin(); iter != m_intListWeightedList.end(); ++iter) { delete *iter; - *iter = nullptr; + *iter = NULL; } m_intListWeightedListAppend = file.read_bool8(); int listCount = file.read_int32(); @@ -2044,7 +2044,7 @@ void ServerUberObjectTemplate::load(Iff &file) for (iter = m_intListRandomRange.begin(); iter != m_intListRandomRange.end(); ++iter) { delete *iter; - *iter = nullptr; + *iter = NULL; } m_intListRandomRangeAppend = file.read_bool8(); int listCount = file.read_int32(); @@ -2062,7 +2062,7 @@ void ServerUberObjectTemplate::load(Iff &file) for (iter = m_intListDiceRoll.begin(); iter != m_intListDiceRoll.end(); ++iter) { delete *iter; - *iter = nullptr; + *iter = NULL; } m_intListDiceRollAppend = file.read_bool8(); int listCount = file.read_int32(); @@ -2102,7 +2102,7 @@ void ServerUberObjectTemplate::load(Iff &file) for (iter = m_floatListSimple.begin(); iter != m_floatListSimple.end(); ++iter) { delete *iter; - *iter = nullptr; + *iter = NULL; } m_floatListSimpleAppend = file.read_bool8(); int listCount = file.read_int32(); @@ -2120,7 +2120,7 @@ void ServerUberObjectTemplate::load(Iff &file) for (iter = m_floatListWeightedList.begin(); iter != m_floatListWeightedList.end(); ++iter) { delete *iter; - *iter = nullptr; + *iter = NULL; } m_floatListWeightedListAppend = file.read_bool8(); int listCount = file.read_int32(); @@ -2138,7 +2138,7 @@ void ServerUberObjectTemplate::load(Iff &file) for (iter = m_floatListRandomRange.begin(); iter != m_floatListRandomRange.end(); ++iter) { delete *iter; - *iter = nullptr; + *iter = NULL; } m_floatListRandomRangeAppend = file.read_bool8(); int listCount = file.read_int32(); @@ -2184,7 +2184,7 @@ void ServerUberObjectTemplate::load(Iff &file) for (iter = m_enumListIndexed.begin(); iter != m_enumListIndexed.end(); ++iter) { delete *iter; - *iter = nullptr; + *iter = NULL; } m_enumListIndexedAppend = file.read_bool8(); int listCount = file.read_int32(); @@ -2202,7 +2202,7 @@ void ServerUberObjectTemplate::load(Iff &file) for (iter = m_enumListWeightedList.begin(); iter != m_enumListWeightedList.end(); ++iter) { delete *iter; - *iter = nullptr; + *iter = NULL; } m_enumListWeightedListAppend = file.read_bool8(); int listCount = file.read_int32(); @@ -2226,7 +2226,7 @@ void ServerUberObjectTemplate::load(Iff &file) for (iter = m_stringIdListSimple.begin(); iter != m_stringIdListSimple.end(); ++iter) { delete *iter; - *iter = nullptr; + *iter = NULL; } m_stringIdListSimpleAppend = file.read_bool8(); int listCount = file.read_int32(); @@ -2244,7 +2244,7 @@ void ServerUberObjectTemplate::load(Iff &file) for (iter = m_stringIdListWeightedList.begin(); iter != m_stringIdListWeightedList.end(); ++iter) { delete *iter; - *iter = nullptr; + *iter = NULL; } m_stringIdListWeightedListAppend = file.read_bool8(); int listCount = file.read_int32(); @@ -2268,7 +2268,7 @@ void ServerUberObjectTemplate::load(Iff &file) for (iter = m_stringListSimple.begin(); iter != m_stringListSimple.end(); ++iter) { delete *iter; - *iter = nullptr; + *iter = NULL; } m_stringListSimpleAppend = file.read_bool8(); int listCount = file.read_int32(); @@ -2286,7 +2286,7 @@ void ServerUberObjectTemplate::load(Iff &file) for (iter = m_stringListWeightedList.begin(); iter != m_stringListWeightedList.end(); ++iter) { delete *iter; - *iter = nullptr; + *iter = NULL; } m_stringListWeightedListAppend = file.read_bool8(); int listCount = file.read_int32(); @@ -2310,7 +2310,7 @@ void ServerUberObjectTemplate::load(Iff &file) for (iter = m_triggerVolumeList.begin(); iter != m_triggerVolumeList.end(); ++iter) { delete *iter; - *iter = nullptr; + *iter = NULL; } m_triggerVolumeListAppend = file.read_bool8(); int listCount = file.read_int32(); @@ -2328,7 +2328,7 @@ void ServerUberObjectTemplate::load(Iff &file) for (iter = m_triggerVolumesListWeightedList.begin(); iter != m_triggerVolumesListWeightedList.end(); ++iter) { delete *iter; - *iter = nullptr; + *iter = NULL; } m_triggerVolumesListWeightedListAppend = file.read_bool8(); int listCount = file.read_int32(); @@ -2352,7 +2352,7 @@ void ServerUberObjectTemplate::load(Iff &file) for (iter = m_boolListDerived.begin(); iter != m_boolListDerived.end(); ++iter) { delete *iter; - *iter = nullptr; + *iter = NULL; } m_boolListDerivedAppend = file.read_bool8(); int listCount = file.read_int32(); @@ -2370,7 +2370,7 @@ void ServerUberObjectTemplate::load(Iff &file) for (iter = m_boolListSimple.begin(); iter != m_boolListSimple.end(); ++iter) { delete *iter; - *iter = nullptr; + *iter = NULL; } m_boolListSimpleAppend = file.read_bool8(); int listCount = file.read_int32(); @@ -2388,7 +2388,7 @@ void ServerUberObjectTemplate::load(Iff &file) for (iter = m_boolListWeightedList.begin(); iter != m_boolListWeightedList.end(); ++iter) { delete *iter; - *iter = nullptr; + *iter = NULL; } m_boolListWeightedListAppend = file.read_bool8(); int listCount = file.read_int32(); @@ -2410,7 +2410,7 @@ void ServerUberObjectTemplate::load(Iff &file) for (iter = m_vectorListSimple.begin(); iter != m_vectorListSimple.end(); ++iter) { delete *iter; - *iter = nullptr; + *iter = NULL; } m_vectorListSimpleAppend = file.read_bool8(); int listCount = file.read_int32(); @@ -2434,7 +2434,7 @@ void ServerUberObjectTemplate::load(Iff &file) for (iter = m_filenameListSimple.begin(); iter != m_filenameListSimple.end(); ++iter) { delete *iter; - *iter = nullptr; + *iter = NULL; } m_filenameListSimpleAppend = file.read_bool8(); int listCount = file.read_int32(); @@ -2462,7 +2462,7 @@ void ServerUberObjectTemplate::load(Iff &file) for (iter = m_templateListSimple.begin(); iter != m_templateListSimple.end(); ++iter) { delete *iter; - *iter = nullptr; + *iter = NULL; } m_templateListSimpleAppend = file.read_bool8(); int listCount = file.read_int32(); @@ -2484,7 +2484,7 @@ void ServerUberObjectTemplate::load(Iff &file) for (iter = m_structListSimple.begin(); iter != m_structListSimple.end(); ++iter) { delete *iter; - *iter = nullptr; + *iter = NULL; } m_structListSimpleAppend = file.read_bool8(); int listCount = file.read_int32(); @@ -2653,18 +2653,18 @@ void ServerUberObjectTemplate::load(Iff &file) */ void ServerUberObjectTemplate::save(Iff &file) { - int count; +int count; file.insertForm(ServerUberObjectTemplate_tag); if (m_baseTemplateName.size() != 0) { - file.insertForm(TAG(D, E, R, V)); + file.insertForm(TAG(D,E,R,V)); file.insertChunk(TAG(X, X, X, X)); file.insertChunkData(m_baseTemplateName.c_str(), m_baseTemplateName.size() + 1); file.exitChunk(); file.exitForm(); } - file.insertForm(TAG(0, 0, 0, 0)); + file.insertForm(TAG(0,0,0,0)); file.allowNonlinearFunctions(); int paramCount = 0; @@ -2783,7 +2783,7 @@ void ServerUberObjectTemplate::save(Iff &file) count = m_intListSimple.size(); file.insertChunkData(&count, sizeof(count)); {for (int i = 0; i < count; ++i) - m_intListSimple[i]->saveToIff(file); } + m_intListSimple[i]->saveToIff(file);} file.exitChunk(); ++paramCount; if (!m_intListWeightedListLoaded) @@ -2798,7 +2798,7 @@ void ServerUberObjectTemplate::save(Iff &file) count = m_intListWeightedList.size(); file.insertChunkData(&count, sizeof(count)); {for (int i = 0; i < count; ++i) - m_intListWeightedList[i]->saveToIff(file); } + m_intListWeightedList[i]->saveToIff(file);} file.exitChunk(); ++paramCount; if (!m_intListRandomRangeLoaded) @@ -2813,7 +2813,7 @@ void ServerUberObjectTemplate::save(Iff &file) count = m_intListRandomRange.size(); file.insertChunkData(&count, sizeof(count)); {for (int i = 0; i < count; ++i) - m_intListRandomRange[i]->saveToIff(file); } + m_intListRandomRange[i]->saveToIff(file);} file.exitChunk(); ++paramCount; if (!m_intListDiceRollLoaded) @@ -2828,7 +2828,7 @@ void ServerUberObjectTemplate::save(Iff &file) count = m_intListDiceRoll.size(); file.insertChunkData(&count, sizeof(count)); {for (int i = 0; i < count; ++i) - m_intListDiceRoll[i]->saveToIff(file); } + m_intListDiceRoll[i]->saveToIff(file);} file.exitChunk(); ++paramCount; // save floatAtDerived @@ -2909,7 +2909,7 @@ void ServerUberObjectTemplate::save(Iff &file) count = m_floatListSimple.size(); file.insertChunkData(&count, sizeof(count)); {for (int i = 0; i < count; ++i) - m_floatListSimple[i]->saveToIff(file); } + m_floatListSimple[i]->saveToIff(file);} file.exitChunk(); ++paramCount; if (!m_floatListWeightedListLoaded) @@ -2924,7 +2924,7 @@ void ServerUberObjectTemplate::save(Iff &file) count = m_floatListWeightedList.size(); file.insertChunkData(&count, sizeof(count)); {for (int i = 0; i < count; ++i) - m_floatListWeightedList[i]->saveToIff(file); } + m_floatListWeightedList[i]->saveToIff(file);} file.exitChunk(); ++paramCount; if (!m_floatListRandomRangeLoaded) @@ -2939,7 +2939,7 @@ void ServerUberObjectTemplate::save(Iff &file) count = m_floatListRandomRange.size(); file.insertChunkData(&count, sizeof(count)); {for (int i = 0; i < count; ++i) - m_floatListRandomRange[i]->saveToIff(file); } + m_floatListRandomRange[i]->saveToIff(file);} file.exitChunk(); ++paramCount; // save enumIndexedByEnumSingle @@ -2948,7 +2948,7 @@ void ServerUberObjectTemplate::save(Iff &file) count = 3; file.insertChunkData(&count, sizeof(count)); {for (int i = 0; i < 3; ++i) - m_enumIndexedByEnumSingle[i].saveToIff(file); } + m_enumIndexedByEnumSingle[i].saveToIff(file);} file.exitChunk(); ++paramCount; // save enumIndexedByEnumWeightedList @@ -2957,7 +2957,7 @@ void ServerUberObjectTemplate::save(Iff &file) count = 3; file.insertChunkData(&count, sizeof(count)); {for (int i = 0; i < 3; ++i) - m_enumIndexedByEnumWeightedList[i].saveToIff(file); } + m_enumIndexedByEnumWeightedList[i].saveToIff(file);} file.exitChunk(); ++paramCount; if (!m_enumListIndexedLoaded) @@ -2972,7 +2972,7 @@ void ServerUberObjectTemplate::save(Iff &file) count = m_enumListIndexed.size(); file.insertChunkData(&count, sizeof(count)); {for (int i = 0; i < count; ++i) - m_enumListIndexed[i]->saveToIff(file); } + m_enumListIndexed[i]->saveToIff(file);} file.exitChunk(); ++paramCount; if (!m_enumListWeightedListLoaded) @@ -2987,7 +2987,7 @@ void ServerUberObjectTemplate::save(Iff &file) count = m_enumListWeightedList.size(); file.insertChunkData(&count, sizeof(count)); {for (int i = 0; i < count; ++i) - m_enumListWeightedList[i]->saveToIff(file); } + m_enumListWeightedList[i]->saveToIff(file);} file.exitChunk(); ++paramCount; // save stringIdDerived @@ -3020,7 +3020,7 @@ void ServerUberObjectTemplate::save(Iff &file) count = m_stringIdListSimple.size(); file.insertChunkData(&count, sizeof(count)); {for (int i = 0; i < count; ++i) - m_stringIdListSimple[i]->saveToIff(file); } + m_stringIdListSimple[i]->saveToIff(file);} file.exitChunk(); ++paramCount; if (!m_stringIdListWeightedListLoaded) @@ -3035,7 +3035,7 @@ void ServerUberObjectTemplate::save(Iff &file) count = m_stringIdListWeightedList.size(); file.insertChunkData(&count, sizeof(count)); {for (int i = 0; i < count; ++i) - m_stringIdListWeightedList[i]->saveToIff(file); } + m_stringIdListWeightedList[i]->saveToIff(file);} file.exitChunk(); ++paramCount; // save stringDerived @@ -3068,7 +3068,7 @@ void ServerUberObjectTemplate::save(Iff &file) count = m_stringListSimple.size(); file.insertChunkData(&count, sizeof(count)); {for (int i = 0; i < count; ++i) - m_stringListSimple[i]->saveToIff(file); } + m_stringListSimple[i]->saveToIff(file);} file.exitChunk(); ++paramCount; if (!m_stringListWeightedListLoaded) @@ -3083,7 +3083,7 @@ void ServerUberObjectTemplate::save(Iff &file) count = m_stringListWeightedList.size(); file.insertChunkData(&count, sizeof(count)); {for (int i = 0; i < count; ++i) - m_stringListWeightedList[i]->saveToIff(file); } + m_stringListWeightedList[i]->saveToIff(file);} file.exitChunk(); ++paramCount; // save triggerVolumeDerived @@ -3116,7 +3116,7 @@ void ServerUberObjectTemplate::save(Iff &file) count = m_triggerVolumeList.size(); file.insertChunkData(&count, sizeof(count)); {for (int i = 0; i < count; ++i) - m_triggerVolumeList[i]->saveToIff(file); } + m_triggerVolumeList[i]->saveToIff(file);} file.exitChunk(); ++paramCount; if (!m_triggerVolumesListWeightedListLoaded) @@ -3131,7 +3131,7 @@ void ServerUberObjectTemplate::save(Iff &file) count = m_triggerVolumesListWeightedList.size(); file.insertChunkData(&count, sizeof(count)); {for (int i = 0; i < count; ++i) - m_triggerVolumesListWeightedList[i]->saveToIff(file); } + m_triggerVolumesListWeightedList[i]->saveToIff(file);} file.exitChunk(); ++paramCount; // save boolDerived @@ -3164,7 +3164,7 @@ void ServerUberObjectTemplate::save(Iff &file) count = m_boolListDerived.size(); file.insertChunkData(&count, sizeof(count)); {for (int i = 0; i < count; ++i) - m_boolListDerived[i]->saveToIff(file); } + m_boolListDerived[i]->saveToIff(file);} file.exitChunk(); ++paramCount; if (!m_boolListSimpleLoaded) @@ -3179,7 +3179,7 @@ void ServerUberObjectTemplate::save(Iff &file) count = m_boolListSimple.size(); file.insertChunkData(&count, sizeof(count)); {for (int i = 0; i < count; ++i) - m_boolListSimple[i]->saveToIff(file); } + m_boolListSimple[i]->saveToIff(file);} file.exitChunk(); ++paramCount; if (!m_boolListWeightedListLoaded) @@ -3194,7 +3194,7 @@ void ServerUberObjectTemplate::save(Iff &file) count = m_boolListWeightedList.size(); file.insertChunkData(&count, sizeof(count)); {for (int i = 0; i < count; ++i) - m_boolListWeightedList[i]->saveToIff(file); } + m_boolListWeightedList[i]->saveToIff(file);} file.exitChunk(); ++paramCount; // save vectorAtDerived @@ -3221,7 +3221,7 @@ void ServerUberObjectTemplate::save(Iff &file) count = m_vectorListSimple.size(); file.insertChunkData(&count, sizeof(count)); {for (int i = 0; i < count; ++i) - m_vectorListSimple[i]->saveToIff(file); } + m_vectorListSimple[i]->saveToIff(file);} file.exitChunk(); ++paramCount; // save filenameAtDerived @@ -3254,7 +3254,7 @@ void ServerUberObjectTemplate::save(Iff &file) count = m_filenameListSimple.size(); file.insertChunkData(&count, sizeof(count)); {for (int i = 0; i < count; ++i) - m_filenameListSimple[i]->saveToIff(file); } + m_filenameListSimple[i]->saveToIff(file);} file.exitChunk(); ++paramCount; // save objvarDerived @@ -3299,7 +3299,7 @@ void ServerUberObjectTemplate::save(Iff &file) count = m_templateListSimple.size(); file.insertChunkData(&count, sizeof(count)); {for (int i = 0; i < count; ++i) - m_templateListSimple[i]->saveToIff(file); } + m_templateListSimple[i]->saveToIff(file);} file.exitChunk(); ++paramCount; // save structAtDerived @@ -3326,7 +3326,7 @@ void ServerUberObjectTemplate::save(Iff &file) count = m_structListSimple.size(); file.insertChunkData(&count, sizeof(count)); {for (int i = 0; i < count; ++i) - m_structListSimple[i]->saveToIff(file); } + m_structListSimple[i]->saveToIff(file);} file.exitChunk(); ++paramCount; // save structArrayEnum @@ -3335,7 +3335,7 @@ void ServerUberObjectTemplate::save(Iff &file) count = 3; file.insertChunkData(&count, sizeof(count)); {for (int i = 0; i < 3; ++i) - m_structArrayEnum[i].saveToIff(file); } + m_structArrayEnum[i].saveToIff(file);} file.exitChunk(); ++paramCount; // save structArrayInteger @@ -3344,7 +3344,7 @@ void ServerUberObjectTemplate::save(Iff &file) count = 2; file.insertChunkData(&count, sizeof(count)); {for (int i = 0; i < 2; ++i) - m_structArrayInteger[i].saveToIff(file); } + m_structArrayInteger[i].saveToIff(file);} file.exitChunk(); ++paramCount; // save integerArray @@ -3353,7 +3353,7 @@ void ServerUberObjectTemplate::save(Iff &file) count = 2; file.insertChunkData(&count, sizeof(count)); {for (int i = 0; i < 2; ++i) - m_integerArray[i].saveToIff(file); } + m_integerArray[i].saveToIff(file);} file.exitChunk(); ++paramCount; // save floatArray @@ -3362,7 +3362,7 @@ void ServerUberObjectTemplate::save(Iff &file) count = 2; file.insertChunkData(&count, sizeof(count)); {for (int i = 0; i < 2; ++i) - m_floatArray[i].saveToIff(file); } + m_floatArray[i].saveToIff(file);} file.exitChunk(); ++paramCount; // save stringArray @@ -3371,7 +3371,7 @@ void ServerUberObjectTemplate::save(Iff &file) count = 2; file.insertChunkData(&count, sizeof(count)); {for (int i = 0; i < 2; ++i) - m_stringArray[i].saveToIff(file); } + m_stringArray[i].saveToIff(file);} file.exitChunk(); ++paramCount; // save boolArray @@ -3380,7 +3380,7 @@ void ServerUberObjectTemplate::save(Iff &file) count = 2; file.insertChunkData(&count, sizeof(count)); {for (int i = 0; i < 2; ++i) - m_boolArray[i].saveToIff(file); } + m_boolArray[i].saveToIff(file);} file.exitChunk(); ++paramCount; // save stringIdArray @@ -3389,7 +3389,7 @@ void ServerUberObjectTemplate::save(Iff &file) count = 2; file.insertChunkData(&count, sizeof(count)); {for (int i = 0; i < 2; ++i) - m_stringIdArray[i].saveToIff(file); } + m_stringIdArray[i].saveToIff(file);} file.exitChunk(); ++paramCount; // save triggerArray @@ -3398,7 +3398,7 @@ void ServerUberObjectTemplate::save(Iff &file) count = 2; file.insertChunkData(&count, sizeof(count)); {for (int i = 0; i < 2; ++i) - m_triggerArray[i].saveToIff(file); } + m_triggerArray[i].saveToIff(file);} file.exitChunk(); ++paramCount; // save vectorArray @@ -3407,7 +3407,7 @@ void ServerUberObjectTemplate::save(Iff &file) count = 2; file.insertChunkData(&count, sizeof(count)); {for (int i = 0; i < 2; ++i) - m_vectorArray[i].saveToIff(file); } + m_vectorArray[i].saveToIff(file);} file.exitChunk(); ++paramCount; // save fileNameArray @@ -3416,7 +3416,7 @@ void ServerUberObjectTemplate::save(Iff &file) count = 2; file.insertChunkData(&count, sizeof(count)); {for (int i = 0; i < 2; ++i) - m_fileNameArray[i].saveToIff(file); } + m_fileNameArray[i].saveToIff(file);} file.exitChunk(); ++paramCount; @@ -3431,6 +3431,7 @@ void ServerUberObjectTemplate::save(Iff &file) file.exitForm(); } // ServerUberObjectTemplate::save + //============================================================================= // class ServerUberObjectTemplate::_Foo @@ -3485,9 +3486,9 @@ CompilerIntegerParam * ServerUberObjectTemplate::_Foo::getCompilerIntegerParam(c { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getCompilerIntegerParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_item1; } @@ -3495,7 +3496,7 @@ CompilerIntegerParam * ServerUberObjectTemplate::_Foo::getCompilerIntegerParam(c } else return TpfTemplate::getCompilerIntegerParam(name, deepCheck, index); - return nullptr; + return NULL; } //ServerUberObjectTemplate::_Foo::getCompilerIntegerParam FloatParam * ServerUberObjectTemplate::_Foo::getFloatParam(const char *name, bool deepCheck, int index) @@ -3506,9 +3507,9 @@ FloatParam * ServerUberObjectTemplate::_Foo::getFloatParam(const char *name, boo { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getFloatParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_item2; } @@ -3516,7 +3517,7 @@ FloatParam * ServerUberObjectTemplate::_Foo::getFloatParam(const char *name, boo } else return TpfTemplate::getFloatParam(name, deepCheck, index); - return nullptr; + return NULL; } //ServerUberObjectTemplate::_Foo::getFloatParam BoolParam * ServerUberObjectTemplate::_Foo::getBoolParam(const char *name, bool deepCheck, int index) @@ -3532,9 +3533,9 @@ StringParam * ServerUberObjectTemplate::_Foo::getStringParam(const char *name, b { if (deepCheck && !isParamLoaded(name, false, 0)) { - if (getBaseTemplate() != nullptr) + if (getBaseTemplate() != NULL) return getBaseTemplate()->getStringParam(name, deepCheck, index); - return nullptr; + return NULL; } return &m_item3; } @@ -3542,7 +3543,7 @@ StringParam * ServerUberObjectTemplate::_Foo::getStringParam(const char *name, b } else return TpfTemplate::getStringParam(name, deepCheck, index); - return nullptr; + return NULL; } //ServerUberObjectTemplate::_Foo::getStringParam StringIdParam * ServerUberObjectTemplate::_Foo::getStringIdParam(const char *name, bool deepCheck, int index) @@ -3592,6 +3593,7 @@ bool ServerUberObjectTemplate::_Foo::isAppend(const char *name) const return TpfTemplate::isAppend(name); } // ServerUberObjectTemplate::_Foo::isAppend + int ServerUberObjectTemplate::_Foo::getListLength(const char *name) const { return TpfTemplate::getListLength(name); @@ -3605,8 +3607,8 @@ int ServerUberObjectTemplate::_Foo::getListLength(const char *name) const */ void ServerUberObjectTemplate::_Foo::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; file.enterForm(); @@ -3638,7 +3640,7 @@ void ServerUberObjectTemplate::_Foo::load(Iff &file) */ void ServerUberObjectTemplate::_Foo::save(Iff &file) { - int count; +int count; file.insertForm(_Foo_tag); @@ -3673,4 +3675,4 @@ void ServerUberObjectTemplate::_Foo::save(Iff &file) UNREF(count); } // ServerUberObjectTemplate::_Foo::save -//@END TFD \ No newline at end of file +//@END TFD diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerUberObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/ServerUberObjectTemplate.h old mode 100755 new mode 100644 diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerUniverseObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerUniverseObjectTemplate.cpp old mode 100755 new mode 100644 index 7f4176f1..741c32af --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerUniverseObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerUniverseObjectTemplate.cpp @@ -17,8 +17,7 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include -#include +#include @@ -86,10 +85,10 @@ Tag ServerUniverseObjectTemplate::getTemplateVersion(void) const */ Tag ServerUniverseObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerUniverseObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerUniverseObjectTemplate::getHighestTemplateVersion diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerUniverseObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/ServerUniverseObjectTemplate.h old mode 100755 new mode 100644 diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerVehicleObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerVehicleObjectTemplate.cpp old mode 100755 new mode 100644 index e204aa23..aac5cad7 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerVehicleObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerVehicleObjectTemplate.cpp @@ -17,8 +17,7 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include -#include +#include @@ -86,10 +85,10 @@ Tag ServerVehicleObjectTemplate::getTemplateVersion(void) const */ Tag ServerVehicleObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerVehicleObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerVehicleObjectTemplate::getHighestTemplateVersion diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerVehicleObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/ServerVehicleObjectTemplate.h old mode 100755 new mode 100644 diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerWaypointObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerWaypointObjectTemplate.cpp old mode 100755 new mode 100644 index 23c83cd5..27bb6577 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerWaypointObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerWaypointObjectTemplate.cpp @@ -17,8 +17,7 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include -#include +#include @@ -86,10 +85,10 @@ Tag ServerWaypointObjectTemplate::getTemplateVersion(void) const */ Tag ServerWaypointObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerWaypointObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerWaypointObjectTemplate::getHighestTemplateVersion @@ -195,12 +194,12 @@ char paramName[MAX_NAME_SIZE]; file.read_string(baseFilename); file.exitChunk(); const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); - DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); - if (m_baseData == base && base != nullptr) + DEBUG_WARNING(base == NULL, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != NULL) base->releaseReference(); else { - if (m_baseData != nullptr) + if (m_baseData != NULL) m_baseData->releaseReference(); m_baseData = base; } diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerWaypointObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/ServerWaypointObjectTemplate.h old mode 100755 new mode 100644 diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerWeaponObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerWeaponObjectTemplate.cpp old mode 100755 new mode 100644 index 65775fd0..7f88b2c7 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerWeaponObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerWeaponObjectTemplate.cpp @@ -17,8 +17,7 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include -#include +#include @@ -86,10 +85,10 @@ Tag ServerWeaponObjectTemplate::getTemplateVersion(void) const */ Tag ServerWeaponObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerWeaponObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerWeaponObjectTemplate::getHighestTemplateVersion diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerWeaponObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/ServerWeaponObjectTemplate.h old mode 100755 new mode 100644 index d8d05d37..ef8125dd --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerWeaponObjectTemplate.h +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerWeaponObjectTemplate.h @@ -72,7 +72,9 @@ public: WT_1handLightsaber, WT_2handLightsaber, WT_polearmLightsaber, - WeaponType_Last = WT_polearmLightsaber, + WT_groundTargetting, + WT_directionTargetting, + WeaponType_Last = WT_directionTargetting, }; public: diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerXpManagerObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerXpManagerObjectTemplate.cpp old mode 100755 new mode 100644 index 0725fed2..00ec67ce --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerXpManagerObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerXpManagerObjectTemplate.cpp @@ -17,8 +17,7 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include -#include +#include @@ -86,10 +85,10 @@ Tag ServerXpManagerObjectTemplate::getTemplateVersion(void) const */ Tag ServerXpManagerObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerXpManagerObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerXpManagerObjectTemplate::getHighestTemplateVersion diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerXpManagerObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/ServerXpManagerObjectTemplate.h old mode 100755 new mode 100644 diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedBattlefieldMarkerObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedBattlefieldMarkerObjectTemplate.cpp old mode 100755 new mode 100644 index a5bd8fe4..ad0b5c14 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedBattlefieldMarkerObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedBattlefieldMarkerObjectTemplate.cpp @@ -17,8 +17,7 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include -#include +#include @@ -86,10 +85,10 @@ Tag SharedBattlefieldMarkerObjectTemplate::getTemplateVersion(void) const */ Tag SharedBattlefieldMarkerObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const SharedBattlefieldMarkerObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedBattlefieldMarkerObjectTemplate::getHighestTemplateVersion diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedBattlefieldMarkerObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/SharedBattlefieldMarkerObjectTemplate.h old mode 100755 new mode 100644 diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedBuildingObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedBuildingObjectTemplate.cpp old mode 100755 new mode 100644 index f4bba6f0..92c9a476 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedBuildingObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedBuildingObjectTemplate.cpp @@ -17,8 +17,7 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include -#include +#include @@ -86,10 +85,10 @@ Tag SharedBuildingObjectTemplate::getTemplateVersion(void) const */ Tag SharedBuildingObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const SharedBuildingObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedBuildingObjectTemplate::getHighestTemplateVersion diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedBuildingObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/SharedBuildingObjectTemplate.h old mode 100755 new mode 100644 diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedCellObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedCellObjectTemplate.cpp old mode 100755 new mode 100644 index 1a71a06d..878c9ca2 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedCellObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedCellObjectTemplate.cpp @@ -17,8 +17,7 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include -#include +#include @@ -86,10 +85,10 @@ Tag SharedCellObjectTemplate::getTemplateVersion(void) const */ Tag SharedCellObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const SharedCellObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedCellObjectTemplate::getHighestTemplateVersion diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedCellObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/SharedCellObjectTemplate.h old mode 100755 new mode 100644 diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedConstructionContractObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedConstructionContractObjectTemplate.cpp old mode 100755 new mode 100644 index 5c4b79e2..d1f352cd --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedConstructionContractObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedConstructionContractObjectTemplate.cpp @@ -17,8 +17,7 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include -#include +#include @@ -86,10 +85,10 @@ Tag SharedConstructionContractObjectTemplate::getTemplateVersion(void) const */ Tag SharedConstructionContractObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const SharedConstructionContractObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedConstructionContractObjectTemplate::getHighestTemplateVersion diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedConstructionContractObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/SharedConstructionContractObjectTemplate.h old mode 100755 new mode 100644 diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedCreatureObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedCreatureObjectTemplate.cpp old mode 100755 new mode 100644 index e4034d22..2cd81c03 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedCreatureObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedCreatureObjectTemplate.cpp @@ -17,8 +17,7 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include -#include +#include @@ -86,10 +85,10 @@ Tag SharedCreatureObjectTemplate::getTemplateVersion(void) const */ Tag SharedCreatureObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const SharedCreatureObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedCreatureObjectTemplate::getHighestTemplateVersion diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedCreatureObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/SharedCreatureObjectTemplate.h old mode 100755 new mode 100644 diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedDraftSchematicObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedDraftSchematicObjectTemplate.cpp old mode 100755 new mode 100644 index 30332171..161d3c36 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedDraftSchematicObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedDraftSchematicObjectTemplate.cpp @@ -17,8 +17,9 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include -#include +#include + + /** * Class constructor. @@ -26,13 +27,11 @@ SharedDraftSchematicObjectTemplate::SharedDraftSchematicObjectTemplate(const std::string & filename) //@BEGIN TFD INIT : SharedIntangibleObjectTemplate(filename) - , m_slotsLoaded(false) - , m_slotsAppend(false) - , m_attributesLoaded(false) - , m_attributesAppend(false) - , m_templateVersion(0) - , m_versionOk(false) - //@END TFD INIT + ,m_slotsLoaded(false) + ,m_slotsAppend(false) + ,m_attributesLoaded(false) + ,m_attributesAppend(false) +//@END TFD INIT { } // SharedDraftSchematicObjectTemplate::SharedDraftSchematicObjectTemplate @@ -41,7 +40,7 @@ SharedDraftSchematicObjectTemplate::SharedDraftSchematicObjectTemplate(const std */ SharedDraftSchematicObjectTemplate::~SharedDraftSchematicObjectTemplate() { - //@BEGIN TFD CLEANUP +//@BEGIN TFD CLEANUP { std::vector::iterator iter; for (iter = m_slots.begin(); iter != m_slots.end(); ++iter) @@ -60,7 +59,7 @@ SharedDraftSchematicObjectTemplate::~SharedDraftSchematicObjectTemplate() } m_attributes.clear(); } - //@END TFD CLEANUP +//@END TFD CLEANUP } // SharedDraftSchematicObjectTemplate::~SharedDraftSchematicObjectTemplate /** @@ -108,10 +107,10 @@ Tag SharedDraftSchematicObjectTemplate::getTemplateVersion(void) const */ Tag SharedDraftSchematicObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const SharedDraftSchematicObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedDraftSchematicObjectTemplate::getHighestTemplateVersion @@ -252,6 +251,7 @@ bool SharedDraftSchematicObjectTemplate::isAppend(const char *name) const return SharedIntangibleObjectTemplate::isAppend(name); } // SharedDraftSchematicObjectTemplate::isAppend + int SharedDraftSchematicObjectTemplate::getListLength(const char *name) const { if (strcmp(name, "slots") == 0) @@ -274,8 +274,8 @@ int SharedDraftSchematicObjectTemplate::getListLength(const char *name) const */ void SharedDraftSchematicObjectTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != SharedDraftSchematicObjectTemplate_tag) { @@ -285,7 +285,7 @@ void SharedDraftSchematicObjectTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -305,7 +305,7 @@ void SharedDraftSchematicObjectTemplate::load(Iff &file) file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 0, 3)) + if (getHighestTemplateVersion() != TAG(0,0,0,3)) { if (DataLint::isEnabled()) DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); @@ -377,18 +377,18 @@ void SharedDraftSchematicObjectTemplate::load(Iff &file) */ void SharedDraftSchematicObjectTemplate::save(Iff &file) { - int count; +int count; file.insertForm(SharedDraftSchematicObjectTemplate_tag); if (m_baseTemplateName.size() != 0) { - file.insertForm(TAG(D, E, R, V)); + file.insertForm(TAG(D,E,R,V)); file.insertChunk(TAG(X, X, X, X)); file.insertChunkData(m_baseTemplateName.c_str(), m_baseTemplateName.size() + 1); file.exitChunk(); file.exitForm(); } - file.insertForm(TAG(0, 0, 0, 3)); + file.insertForm(TAG(0,0,0,3)); file.allowNonlinearFunctions(); int paramCount = 0; @@ -405,7 +405,7 @@ void SharedDraftSchematicObjectTemplate::save(Iff &file) count = m_slots.size(); file.insertChunkData(&count, sizeof(count)); {for (int i = 0; i < count; ++i) - m_slots[i]->saveToIff(file); } + m_slots[i]->saveToIff(file);} file.exitChunk(); ++paramCount; if (!m_attributesLoaded) @@ -420,7 +420,7 @@ void SharedDraftSchematicObjectTemplate::save(Iff &file) count = m_attributes.size(); file.insertChunkData(&count, sizeof(count)); {for (int i = 0; i < count; ++i) - m_attributes[i]->saveToIff(file); } + m_attributes[i]->saveToIff(file);} file.exitChunk(); ++paramCount; // save craftedSharedTemplate @@ -441,6 +441,7 @@ void SharedDraftSchematicObjectTemplate::save(Iff &file) file.exitForm(); } // SharedDraftSchematicObjectTemplate::save + //============================================================================= // class SharedDraftSchematicObjectTemplate::_IngredientSlot @@ -586,6 +587,7 @@ bool SharedDraftSchematicObjectTemplate::_IngredientSlot::isAppend(const char *n return TpfTemplate::isAppend(name); } // SharedDraftSchematicObjectTemplate::_IngredientSlot::isAppend + int SharedDraftSchematicObjectTemplate::_IngredientSlot::getListLength(const char *name) const { return TpfTemplate::getListLength(name); @@ -599,8 +601,8 @@ int SharedDraftSchematicObjectTemplate::_IngredientSlot::getListLength(const cha */ void SharedDraftSchematicObjectTemplate::_IngredientSlot::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; file.enterForm(); @@ -630,7 +632,7 @@ void SharedDraftSchematicObjectTemplate::_IngredientSlot::load(Iff &file) */ void SharedDraftSchematicObjectTemplate::_IngredientSlot::save(Iff &file) { - int count; +int count; file.insertForm(_IngredientSlot_tag); @@ -659,6 +661,7 @@ void SharedDraftSchematicObjectTemplate::_IngredientSlot::save(Iff &file) UNREF(count); } // SharedDraftSchematicObjectTemplate::_IngredientSlot::save + //============================================================================= // class SharedDraftSchematicObjectTemplate::_SchematicAttribute @@ -818,6 +821,7 @@ bool SharedDraftSchematicObjectTemplate::_SchematicAttribute::isAppend(const cha return TpfTemplate::isAppend(name); } // SharedDraftSchematicObjectTemplate::_SchematicAttribute::isAppend + int SharedDraftSchematicObjectTemplate::_SchematicAttribute::getListLength(const char *name) const { return TpfTemplate::getListLength(name); @@ -831,8 +835,8 @@ int SharedDraftSchematicObjectTemplate::_SchematicAttribute::getListLength(const */ void SharedDraftSchematicObjectTemplate::_SchematicAttribute::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; file.enterForm(); @@ -864,7 +868,7 @@ void SharedDraftSchematicObjectTemplate::_SchematicAttribute::load(Iff &file) */ void SharedDraftSchematicObjectTemplate::_SchematicAttribute::save(Iff &file) { - int count; +int count; file.insertForm(_SchematicAttribute_tag); @@ -899,4 +903,4 @@ void SharedDraftSchematicObjectTemplate::_SchematicAttribute::save(Iff &file) UNREF(count); } // SharedDraftSchematicObjectTemplate::_SchematicAttribute::save -//@END TFD \ No newline at end of file +//@END TFD diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedDraftSchematicObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/SharedDraftSchematicObjectTemplate.h old mode 100755 new mode 100644 index ecf99a85..5de4aead --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedDraftSchematicObjectTemplate.h +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedDraftSchematicObjectTemplate.h @@ -53,7 +53,6 @@ public: enum DamageType { - DT_none = 0x000000, DT_kinetic = 0x00000001, DT_energy = 0x00000002, DT_blast = 0x00000004, diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedFactoryObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedFactoryObjectTemplate.cpp old mode 100755 new mode 100644 index 3088f935..256ba289 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedFactoryObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedFactoryObjectTemplate.cpp @@ -17,8 +17,7 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include -#include +#include @@ -86,10 +85,10 @@ Tag SharedFactoryObjectTemplate::getTemplateVersion(void) const */ Tag SharedFactoryObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const SharedFactoryObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedFactoryObjectTemplate::getHighestTemplateVersion diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedFactoryObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/SharedFactoryObjectTemplate.h old mode 100755 new mode 100644 diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedGroupObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedGroupObjectTemplate.cpp old mode 100755 new mode 100644 index 6eecfb9e..cf2db859 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedGroupObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedGroupObjectTemplate.cpp @@ -17,8 +17,7 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include -#include +#include @@ -86,10 +85,10 @@ Tag SharedGroupObjectTemplate::getTemplateVersion(void) const */ Tag SharedGroupObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const SharedGroupObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedGroupObjectTemplate::getHighestTemplateVersion diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedGroupObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/SharedGroupObjectTemplate.h old mode 100755 new mode 100644 diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedGuildObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedGuildObjectTemplate.cpp old mode 100755 new mode 100644 index be710a73..5a5d3d49 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedGuildObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedGuildObjectTemplate.cpp @@ -17,8 +17,7 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include -#include +#include @@ -86,10 +85,10 @@ Tag SharedGuildObjectTemplate::getTemplateVersion(void) const */ Tag SharedGuildObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const SharedGuildObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedGuildObjectTemplate::getHighestTemplateVersion diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedGuildObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/SharedGuildObjectTemplate.h old mode 100755 new mode 100644 diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedInstallationObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedInstallationObjectTemplate.cpp old mode 100755 new mode 100644 index 3b396c5a..923f901d --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedInstallationObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedInstallationObjectTemplate.cpp @@ -17,8 +17,7 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include -#include +#include @@ -86,10 +85,10 @@ Tag SharedInstallationObjectTemplate::getTemplateVersion(void) const */ Tag SharedInstallationObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const SharedInstallationObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedInstallationObjectTemplate::getHighestTemplateVersion diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedInstallationObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/SharedInstallationObjectTemplate.h old mode 100755 new mode 100644 diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedIntangibleObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedIntangibleObjectTemplate.cpp old mode 100755 new mode 100644 index 077b284d..303456ee --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedIntangibleObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedIntangibleObjectTemplate.cpp @@ -17,8 +17,7 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include -#include +#include @@ -86,10 +85,10 @@ Tag SharedIntangibleObjectTemplate::getTemplateVersion(void) const */ Tag SharedIntangibleObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const SharedIntangibleObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedIntangibleObjectTemplate::getHighestTemplateVersion diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedIntangibleObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/SharedIntangibleObjectTemplate.h old mode 100755 new mode 100644 diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedJediManagerObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedJediManagerObjectTemplate.cpp old mode 100755 new mode 100644 index 66b0ddfa..d3a9c465 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedJediManagerObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedJediManagerObjectTemplate.cpp @@ -17,8 +17,7 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include -#include +#include @@ -86,10 +85,10 @@ Tag SharedJediManagerObjectTemplate::getTemplateVersion(void) const */ Tag SharedJediManagerObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const SharedJediManagerObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedJediManagerObjectTemplate::getHighestTemplateVersion diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedJediManagerObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/SharedJediManagerObjectTemplate.h old mode 100755 new mode 100644 diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedManufactureSchematicObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedManufactureSchematicObjectTemplate.cpp old mode 100755 new mode 100644 index e1fa62c8..b0616fa3 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedManufactureSchematicObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedManufactureSchematicObjectTemplate.cpp @@ -17,8 +17,7 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include -#include +#include @@ -86,10 +85,10 @@ Tag SharedManufactureSchematicObjectTemplate::getTemplateVersion(void) const */ Tag SharedManufactureSchematicObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const SharedManufactureSchematicObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedManufactureSchematicObjectTemplate::getHighestTemplateVersion diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedManufactureSchematicObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/SharedManufactureSchematicObjectTemplate.h old mode 100755 new mode 100644 diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedMissionDataObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedMissionDataObjectTemplate.cpp new file mode 100644 index 00000000..57d181fa --- /dev/null +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedMissionDataObjectTemplate.cpp @@ -0,0 +1,266 @@ +//======================================================================== +// +// SharedMissionDataObjectTemplate.cpp +// +//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be +//overwritten the next time the template definition is compiled. Do not +//make changes to code inside these blocks. +// +// copyright 2001 Sony Online Entertainment +// +//======================================================================== + +#include "sharedTemplate/FirstSharedTemplate.h" +#include "sharedTemplateDefinition/TemplateData.h" +#include "sharedTemplateDefinition/TemplateGlobals.h" +#include "SharedMissionDataObjectTemplate.h" +#include "sharedDebug/DataLint.h" +#include "sharedFile/Iff.h" +#include "sharedTemplateDefinition/ObjectTemplate.h" +#include + + + +/** + * Class constructor. + */ +SharedMissionDataObjectTemplate::SharedMissionDataObjectTemplate(const std::string & filename) +//@BEGIN TFD INIT + : SharedIntangibleObjectTemplate(filename) +//@END TFD INIT +{ +} // SharedMissionDataObjectTemplate::SharedMissionDataObjectTemplate + +/** + * Class destructor. + */ +SharedMissionDataObjectTemplate::~SharedMissionDataObjectTemplate() +{ +//@BEGIN TFD CLEANUP +//@END TFD CLEANUP +} // SharedMissionDataObjectTemplate::~SharedMissionDataObjectTemplate + +/** + * Static function used to register this template. + */ +void SharedMissionDataObjectTemplate::registerMe(void) +{ + ObjectTemplateList::registerTemplate(SharedMissionDataObjectTemplate_tag, create); +} // SharedMissionDataObjectTemplate::registerMe + +/** + * Creates a SharedMissionDataObjectTemplate template. + * + * @return a new instance of the template + */ +ObjectTemplate * SharedMissionDataObjectTemplate::create(const std::string & filename) +{ + return new SharedMissionDataObjectTemplate(filename); +} // SharedMissionDataObjectTemplate::create + +/** + * Returns the template id. + * + * @return the template id + */ +Tag SharedMissionDataObjectTemplate::getId(void) const +{ + return SharedMissionDataObjectTemplate_tag; +} // SharedMissionDataObjectTemplate::getId + +/** + * Returns this template's version. + * + * @return the version + */ +Tag SharedMissionDataObjectTemplate::getTemplateVersion(void) const +{ + return m_templateVersion; +} // SharedMissionDataObjectTemplate::getTemplateVersion + +/** + * Returns the highest version of this template or it's base templates. + * + * @return the highest version + */ +Tag SharedMissionDataObjectTemplate::getHighestTemplateVersion(void) const +{ + if (m_baseData == nullptr) + return m_templateVersion; + const SharedMissionDataObjectTemplate * base = dynamic_cast(m_baseData); + if (base == nullptr) + return m_templateVersion; + return std::max(m_templateVersion, base->getHighestTemplateVersion()); +} // SharedMissionDataObjectTemplate::getHighestTemplateVersion + +//@BEGIN TFD +CompilerIntegerParam * SharedMissionDataObjectTemplate::getCompilerIntegerParam(const char *name, bool deepCheck, int index) +{ + return SharedIntangibleObjectTemplate::getCompilerIntegerParam(name, deepCheck, index); +} //SharedMissionDataObjectTemplate::getCompilerIntegerParam + +FloatParam * SharedMissionDataObjectTemplate::getFloatParam(const char *name, bool deepCheck, int index) +{ + return SharedIntangibleObjectTemplate::getFloatParam(name, deepCheck, index); +} //SharedMissionDataObjectTemplate::getFloatParam + +BoolParam * SharedMissionDataObjectTemplate::getBoolParam(const char *name, bool deepCheck, int index) +{ + return SharedIntangibleObjectTemplate::getBoolParam(name, deepCheck, index); +} //SharedMissionDataObjectTemplate::getBoolParam + +StringParam * SharedMissionDataObjectTemplate::getStringParam(const char *name, bool deepCheck, int index) +{ + return SharedIntangibleObjectTemplate::getStringParam(name, deepCheck, index); +} //SharedMissionDataObjectTemplate::getStringParam + +StringIdParam * SharedMissionDataObjectTemplate::getStringIdParam(const char *name, bool deepCheck, int index) +{ + return SharedIntangibleObjectTemplate::getStringIdParam(name, deepCheck, index); +} //SharedMissionDataObjectTemplate::getStringIdParam + +VectorParam * SharedMissionDataObjectTemplate::getVectorParam(const char *name, bool deepCheck, int index) +{ + return SharedIntangibleObjectTemplate::getVectorParam(name, deepCheck, index); +} //SharedMissionDataObjectTemplate::getVectorParam + +DynamicVariableParam * SharedMissionDataObjectTemplate::getDynamicVariableParam(const char *name, bool deepCheck, int index) +{ + return SharedIntangibleObjectTemplate::getDynamicVariableParam(name, deepCheck, index); +} //SharedMissionDataObjectTemplate::getDynamicVariableParam + +StructParamOT * SharedMissionDataObjectTemplate::getStructParamOT(const char *name, bool deepCheck, int index) +{ + return SharedIntangibleObjectTemplate::getStructParamOT(name, deepCheck, index); +} //SharedMissionDataObjectTemplate::getStructParamOT + +TriggerVolumeParam * SharedMissionDataObjectTemplate::getTriggerVolumeParam(const char *name, bool deepCheck, int index) +{ + return SharedIntangibleObjectTemplate::getTriggerVolumeParam(name, deepCheck, index); +} //SharedMissionDataObjectTemplate::getTriggerVolumeParam + +void SharedMissionDataObjectTemplate::initStructParamOT(StructParamOT ¶m, const char *name) +{ + if (param.isInitialized()) + return; + SharedIntangibleObjectTemplate::initStructParamOT(param, name); +} // SharedMissionDataObjectTemplate::initStructParamOT + +void SharedMissionDataObjectTemplate::setAsEmptyList(const char *name) +{ + SharedIntangibleObjectTemplate::setAsEmptyList(name); +} // SharedMissionDataObjectTemplate::setAsEmptyList + +void SharedMissionDataObjectTemplate::setAppend(const char *name) +{ + SharedIntangibleObjectTemplate::setAppend(name); +} // SharedMissionDataObjectTemplate::setAppend + +bool SharedMissionDataObjectTemplate::isAppend(const char *name) const +{ + return SharedIntangibleObjectTemplate::isAppend(name); +} // SharedMissionDataObjectTemplate::isAppend + + +int SharedMissionDataObjectTemplate::getListLength(const char *name) const +{ + return SharedIntangibleObjectTemplate::getListLength(name); +} // SharedMissionDataObjectTemplate::getListLength + +/** + * Loads the template data from an iff file. We should already be in the form + * for this template. + * + * @param file file to load from + */ +void SharedMissionDataObjectTemplate::load(Iff &file) +{ +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; + + if (file.getCurrentName() != SharedMissionDataObjectTemplate_tag) + { + SharedIntangibleObjectTemplate::load(file); + return; + } + + file.enterForm(); + m_templateVersion = file.getCurrentName(); + if (m_templateVersion == TAG(D,E,R,V)) + { + file.enterForm(); + file.enterChunk(); + std::string baseFilename; + file.read_string(baseFilename); + file.exitChunk(); + const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) + base->releaseReference(); + else + { + if (m_baseData != nullptr) + m_baseData->releaseReference(); + m_baseData = base; + } + file.exitForm(); + m_templateVersion = file.getCurrentName(); + } + if (getHighestTemplateVersion() != TAG(0,0,0,0)) + { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); + } + + file.enterForm(); + + file.enterChunk(); + int paramCount = file.read_int32(); + file.exitChunk(); + UNREF(paramName); + UNREF(paramCount); + + file.exitForm(); + SharedIntangibleObjectTemplate::load(file); + file.exitForm(); + return; +} // SharedMissionDataObjectTemplate::load + +/** + * Saves the template data to an iff file. + * + * @param file file to save to + * @param location file type (client or server) + */ +void SharedMissionDataObjectTemplate::save(Iff &file) +{ +int count; + + file.insertForm(SharedMissionDataObjectTemplate_tag); + if (m_baseTemplateName.size() != 0) + { + file.insertForm(TAG(D,E,R,V)); + file.insertChunk(TAG(X, X, X, X)); + file.insertChunkData(m_baseTemplateName.c_str(), m_baseTemplateName.size() + 1); + file.exitChunk(); + file.exitForm(); + } + file.insertForm(TAG(0,0,0,0)); + file.allowNonlinearFunctions(); + + int paramCount = 0; + + + // write number of parameters + file.goToTopOfForm(); + file.insertChunk(TAG(P, C, N, T)); + file.insertChunkData(¶mCount, sizeof(paramCount)); + file.exitChunk(); + + file.exitForm(true); + SharedIntangibleObjectTemplate::save(file); + file.exitForm(); + UNREF(count); +} // SharedMissionDataObjectTemplate::save + +//@END TFD diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedMissionDataObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/SharedMissionDataObjectTemplate.h new file mode 100644 index 00000000..851a6d91 --- /dev/null +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedMissionDataObjectTemplate.h @@ -0,0 +1,88 @@ +//======================================================================== +// +// SharedMissionDataObjectTemplate.h +// +//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be +//overwritten the next time the template definition is compiled. Do not +//make changes to code inside these blocks. +// +// copyright 2001 Sony Online Entertainment +// +//======================================================================== + +#ifndef _INCLUDED_SharedMissionDataObjectTemplate_H +#define _INCLUDED_SharedMissionDataObjectTemplate_H + +#include "SharedIntangibleObjectTemplate.h" +#include "sharedFoundation/DynamicVariable.h" +#include "sharedTemplateDefinition/TpfTemplate.h" + + +class Vector; +typedef StructParam StructParamOT; + + +class SharedMissionDataObjectTemplate : public SharedIntangibleObjectTemplate +{ +public: +//@BEGIN TFD ID + enum + { + SharedMissionDataObjectTemplate_tag = TAG(S,M,S,D) + }; +//@END TFD ID +public: + SharedMissionDataObjectTemplate(const std::string & filename); + virtual ~SharedMissionDataObjectTemplate(); + + virtual Tag getId(void) const; + virtual Tag getTemplateVersion(void) const; + virtual Tag getHighestTemplateVersion(void) const; + static void install(void); + +//@BEGIN TFD +public: + virtual CompilerIntegerParam *getCompilerIntegerParam(const char *name, bool deepCheck = true, int index = 0); + virtual FloatParam *getFloatParam(const char *name, bool deepCheck = true, int index = 0); + virtual BoolParam *getBoolParam(const char *name, bool deepCheck = true, int index = 0); + virtual StringParam *getStringParam(const char *name, bool deepCheck = true, int index = 0); + virtual StringIdParam *getStringIdParam(const char *name, bool deepCheck = true, int index = 0); + virtual VectorParam *getVectorParam(const char *name, bool deepCheck = true, int index = 0); + virtual DynamicVariableParam *getDynamicVariableParam(const char *name, bool deepCheck = true, int index = 0); + virtual StructParamOT *getStructParamOT(const char *name, bool deepCheck = true, int index = 0); + virtual TriggerVolumeParam *getTriggerVolumeParam(const char *name, bool deepCheck = true, int index = 0); + virtual void initStructParamOT(StructParamOT ¶m, const char *name); + virtual void setAsEmptyList(const char *name); + virtual void setAppend(const char *name); + virtual bool isAppend(const char *name) const; + virtual int getListLength(const char *name) const; + +protected: + virtual void load(Iff &file); + virtual void save(Iff &file); + +private: +//@END TFD + +private: + Tag m_templateVersion; // the template version + bool m_versionOk; // flag that the template version loaded is the one we expect + + static void registerMe(void); + static ObjectTemplate * create(const std::string & filename); + + // no copying + SharedMissionDataObjectTemplate(const SharedMissionDataObjectTemplate &); + SharedMissionDataObjectTemplate & operator =(const SharedMissionDataObjectTemplate &); +}; + + +inline void SharedMissionDataObjectTemplate::install(void) +{ +//@BEGIN TFD INSTALL + SharedMissionDataObjectTemplate::registerMe(); +//@END TFD INSTALL +} + + +#endif // _INCLUDED_SharedMissionDataObjectTemplate_H diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedMissionListEntryObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedMissionListEntryObjectTemplate.cpp new file mode 100644 index 00000000..39192464 --- /dev/null +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedMissionListEntryObjectTemplate.cpp @@ -0,0 +1,266 @@ +//======================================================================== +// +// SharedMissionListEntryObjectTemplate.cpp +// +//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be +//overwritten the next time the template definition is compiled. Do not +//make changes to code inside these blocks. +// +// copyright 2001 Sony Online Entertainment +// +//======================================================================== + +#include "sharedTemplate/FirstSharedTemplate.h" +#include "sharedTemplateDefinition/TemplateData.h" +#include "sharedTemplateDefinition/TemplateGlobals.h" +#include "SharedMissionListEntryObjectTemplate.h" +#include "sharedDebug/DataLint.h" +#include "sharedFile/Iff.h" +#include "sharedTemplateDefinition/ObjectTemplate.h" +#include + + + +/** + * Class constructor. + */ +SharedMissionListEntryObjectTemplate::SharedMissionListEntryObjectTemplate(const std::string & filename) +//@BEGIN TFD INIT + : SharedIntangibleObjectTemplate(filename) +//@END TFD INIT +{ +} // SharedMissionListEntryObjectTemplate::SharedMissionListEntryObjectTemplate + +/** + * Class destructor. + */ +SharedMissionListEntryObjectTemplate::~SharedMissionListEntryObjectTemplate() +{ +//@BEGIN TFD CLEANUP +//@END TFD CLEANUP +} // SharedMissionListEntryObjectTemplate::~SharedMissionListEntryObjectTemplate + +/** + * Static function used to register this template. + */ +void SharedMissionListEntryObjectTemplate::registerMe(void) +{ + ObjectTemplateList::registerTemplate(SharedMissionListEntryObjectTemplate_tag, create); +} // SharedMissionListEntryObjectTemplate::registerMe + +/** + * Creates a SharedMissionListEntryObjectTemplate template. + * + * @return a new instance of the template + */ +ObjectTemplate * SharedMissionListEntryObjectTemplate::create(const std::string & filename) +{ + return new SharedMissionListEntryObjectTemplate(filename); +} // SharedMissionListEntryObjectTemplate::create + +/** + * Returns the template id. + * + * @return the template id + */ +Tag SharedMissionListEntryObjectTemplate::getId(void) const +{ + return SharedMissionListEntryObjectTemplate_tag; +} // SharedMissionListEntryObjectTemplate::getId + +/** + * Returns this template's version. + * + * @return the version + */ +Tag SharedMissionListEntryObjectTemplate::getTemplateVersion(void) const +{ + return m_templateVersion; +} // SharedMissionListEntryObjectTemplate::getTemplateVersion + +/** + * Returns the highest version of this template or it's base templates. + * + * @return the highest version + */ +Tag SharedMissionListEntryObjectTemplate::getHighestTemplateVersion(void) const +{ + if (m_baseData == nullptr) + return m_templateVersion; + const SharedMissionListEntryObjectTemplate * base = dynamic_cast(m_baseData); + if (base == nullptr) + return m_templateVersion; + return std::max(m_templateVersion, base->getHighestTemplateVersion()); +} // SharedMissionListEntryObjectTemplate::getHighestTemplateVersion + +//@BEGIN TFD +CompilerIntegerParam * SharedMissionListEntryObjectTemplate::getCompilerIntegerParam(const char *name, bool deepCheck, int index) +{ + return SharedIntangibleObjectTemplate::getCompilerIntegerParam(name, deepCheck, index); +} //SharedMissionListEntryObjectTemplate::getCompilerIntegerParam + +FloatParam * SharedMissionListEntryObjectTemplate::getFloatParam(const char *name, bool deepCheck, int index) +{ + return SharedIntangibleObjectTemplate::getFloatParam(name, deepCheck, index); +} //SharedMissionListEntryObjectTemplate::getFloatParam + +BoolParam * SharedMissionListEntryObjectTemplate::getBoolParam(const char *name, bool deepCheck, int index) +{ + return SharedIntangibleObjectTemplate::getBoolParam(name, deepCheck, index); +} //SharedMissionListEntryObjectTemplate::getBoolParam + +StringParam * SharedMissionListEntryObjectTemplate::getStringParam(const char *name, bool deepCheck, int index) +{ + return SharedIntangibleObjectTemplate::getStringParam(name, deepCheck, index); +} //SharedMissionListEntryObjectTemplate::getStringParam + +StringIdParam * SharedMissionListEntryObjectTemplate::getStringIdParam(const char *name, bool deepCheck, int index) +{ + return SharedIntangibleObjectTemplate::getStringIdParam(name, deepCheck, index); +} //SharedMissionListEntryObjectTemplate::getStringIdParam + +VectorParam * SharedMissionListEntryObjectTemplate::getVectorParam(const char *name, bool deepCheck, int index) +{ + return SharedIntangibleObjectTemplate::getVectorParam(name, deepCheck, index); +} //SharedMissionListEntryObjectTemplate::getVectorParam + +DynamicVariableParam * SharedMissionListEntryObjectTemplate::getDynamicVariableParam(const char *name, bool deepCheck, int index) +{ + return SharedIntangibleObjectTemplate::getDynamicVariableParam(name, deepCheck, index); +} //SharedMissionListEntryObjectTemplate::getDynamicVariableParam + +StructParamOT * SharedMissionListEntryObjectTemplate::getStructParamOT(const char *name, bool deepCheck, int index) +{ + return SharedIntangibleObjectTemplate::getStructParamOT(name, deepCheck, index); +} //SharedMissionListEntryObjectTemplate::getStructParamOT + +TriggerVolumeParam * SharedMissionListEntryObjectTemplate::getTriggerVolumeParam(const char *name, bool deepCheck, int index) +{ + return SharedIntangibleObjectTemplate::getTriggerVolumeParam(name, deepCheck, index); +} //SharedMissionListEntryObjectTemplate::getTriggerVolumeParam + +void SharedMissionListEntryObjectTemplate::initStructParamOT(StructParamOT ¶m, const char *name) +{ + if (param.isInitialized()) + return; + SharedIntangibleObjectTemplate::initStructParamOT(param, name); +} // SharedMissionListEntryObjectTemplate::initStructParamOT + +void SharedMissionListEntryObjectTemplate::setAsEmptyList(const char *name) +{ + SharedIntangibleObjectTemplate::setAsEmptyList(name); +} // SharedMissionListEntryObjectTemplate::setAsEmptyList + +void SharedMissionListEntryObjectTemplate::setAppend(const char *name) +{ + SharedIntangibleObjectTemplate::setAppend(name); +} // SharedMissionListEntryObjectTemplate::setAppend + +bool SharedMissionListEntryObjectTemplate::isAppend(const char *name) const +{ + return SharedIntangibleObjectTemplate::isAppend(name); +} // SharedMissionListEntryObjectTemplate::isAppend + + +int SharedMissionListEntryObjectTemplate::getListLength(const char *name) const +{ + return SharedIntangibleObjectTemplate::getListLength(name); +} // SharedMissionListEntryObjectTemplate::getListLength + +/** + * Loads the template data from an iff file. We should already be in the form + * for this template. + * + * @param file file to load from + */ +void SharedMissionListEntryObjectTemplate::load(Iff &file) +{ +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; + + if (file.getCurrentName() != SharedMissionListEntryObjectTemplate_tag) + { + SharedIntangibleObjectTemplate::load(file); + return; + } + + file.enterForm(); + m_templateVersion = file.getCurrentName(); + if (m_templateVersion == TAG(D,E,R,V)) + { + file.enterForm(); + file.enterChunk(); + std::string baseFilename; + file.read_string(baseFilename); + file.exitChunk(); + const ObjectTemplate *base = ObjectTemplateList::fetch(baseFilename); + DEBUG_WARNING(base == nullptr, ("was unable to load base template %s", baseFilename.c_str())); + if (m_baseData == base && base != nullptr) + base->releaseReference(); + else + { + if (m_baseData != nullptr) + m_baseData->releaseReference(); + m_baseData = base; + } + file.exitForm(); + m_templateVersion = file.getCurrentName(); + } + if (getHighestTemplateVersion() != TAG(0,0,0,0)) + { + if (DataLint::isEnabled()) + DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); + } + + file.enterForm(); + + file.enterChunk(); + int paramCount = file.read_int32(); + file.exitChunk(); + UNREF(paramName); + UNREF(paramCount); + + file.exitForm(); + SharedIntangibleObjectTemplate::load(file); + file.exitForm(); + return; +} // SharedMissionListEntryObjectTemplate::load + +/** + * Saves the template data to an iff file. + * + * @param file file to save to + * @param location file type (client or server) + */ +void SharedMissionListEntryObjectTemplate::save(Iff &file) +{ +int count; + + file.insertForm(SharedMissionListEntryObjectTemplate_tag); + if (m_baseTemplateName.size() != 0) + { + file.insertForm(TAG(D,E,R,V)); + file.insertChunk(TAG(X, X, X, X)); + file.insertChunkData(m_baseTemplateName.c_str(), m_baseTemplateName.size() + 1); + file.exitChunk(); + file.exitForm(); + } + file.insertForm(TAG(0,0,0,0)); + file.allowNonlinearFunctions(); + + int paramCount = 0; + + + // write number of parameters + file.goToTopOfForm(); + file.insertChunk(TAG(P, C, N, T)); + file.insertChunkData(¶mCount, sizeof(paramCount)); + file.exitChunk(); + + file.exitForm(true); + SharedIntangibleObjectTemplate::save(file); + file.exitForm(); + UNREF(count); +} // SharedMissionListEntryObjectTemplate::save + +//@END TFD diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedMissionListEntryObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/SharedMissionListEntryObjectTemplate.h new file mode 100644 index 00000000..1e18f556 --- /dev/null +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedMissionListEntryObjectTemplate.h @@ -0,0 +1,88 @@ +//======================================================================== +// +// SharedMissionListEntryObjectTemplate.h +// +//IMPORTANT: Any code between //@BEGIN TFD... and //@END TFD... will be +//overwritten the next time the template definition is compiled. Do not +//make changes to code inside these blocks. +// +// copyright 2001 Sony Online Entertainment +// +//======================================================================== + +#ifndef _INCLUDED_SharedMissionListEntryObjectTemplate_H +#define _INCLUDED_SharedMissionListEntryObjectTemplate_H + +#include "SharedIntangibleObjectTemplate.h" +#include "sharedFoundation/DynamicVariable.h" +#include "sharedTemplateDefinition/TpfTemplate.h" + + +class Vector; +typedef StructParam StructParamOT; + + +class SharedMissionListEntryObjectTemplate : public SharedIntangibleObjectTemplate +{ +public: +//@BEGIN TFD ID + enum + { + SharedMissionListEntryObjectTemplate_tag = TAG(S,M,L,E) + }; +//@END TFD ID +public: + SharedMissionListEntryObjectTemplate(const std::string & filename); + virtual ~SharedMissionListEntryObjectTemplate(); + + virtual Tag getId(void) const; + virtual Tag getTemplateVersion(void) const; + virtual Tag getHighestTemplateVersion(void) const; + static void install(void); + +//@BEGIN TFD +public: + virtual CompilerIntegerParam *getCompilerIntegerParam(const char *name, bool deepCheck = true, int index = 0); + virtual FloatParam *getFloatParam(const char *name, bool deepCheck = true, int index = 0); + virtual BoolParam *getBoolParam(const char *name, bool deepCheck = true, int index = 0); + virtual StringParam *getStringParam(const char *name, bool deepCheck = true, int index = 0); + virtual StringIdParam *getStringIdParam(const char *name, bool deepCheck = true, int index = 0); + virtual VectorParam *getVectorParam(const char *name, bool deepCheck = true, int index = 0); + virtual DynamicVariableParam *getDynamicVariableParam(const char *name, bool deepCheck = true, int index = 0); + virtual StructParamOT *getStructParamOT(const char *name, bool deepCheck = true, int index = 0); + virtual TriggerVolumeParam *getTriggerVolumeParam(const char *name, bool deepCheck = true, int index = 0); + virtual void initStructParamOT(StructParamOT ¶m, const char *name); + virtual void setAsEmptyList(const char *name); + virtual void setAppend(const char *name); + virtual bool isAppend(const char *name) const; + virtual int getListLength(const char *name) const; + +protected: + virtual void load(Iff &file); + virtual void save(Iff &file); + +private: +//@END TFD + +private: + Tag m_templateVersion; // the template version + bool m_versionOk; // flag that the template version loaded is the one we expect + + static void registerMe(void); + static ObjectTemplate * create(const std::string & filename); + + // no copying + SharedMissionListEntryObjectTemplate(const SharedMissionListEntryObjectTemplate &); + SharedMissionListEntryObjectTemplate & operator =(const SharedMissionListEntryObjectTemplate &); +}; + + +inline void SharedMissionListEntryObjectTemplate::install(void) +{ +//@BEGIN TFD INSTALL + SharedMissionListEntryObjectTemplate::registerMe(); +//@END TFD INSTALL +} + + +#endif // _INCLUDED_SharedMissionListEntryObjectTemplate_H diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedMissionObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedMissionObjectTemplate.cpp old mode 100755 new mode 100644 index 23330fc7..51a8a808 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedMissionObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedMissionObjectTemplate.cpp @@ -17,8 +17,7 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include -#include +#include @@ -86,10 +85,10 @@ Tag SharedMissionObjectTemplate::getTemplateVersion(void) const */ Tag SharedMissionObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const SharedMissionObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedMissionObjectTemplate::getHighestTemplateVersion diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedMissionObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/SharedMissionObjectTemplate.h old mode 100755 new mode 100644 diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedObjectTemplate.cpp old mode 100755 new mode 100644 index 250ddd5c..1961d665 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedObjectTemplate.cpp @@ -17,8 +17,7 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include -#include +#include @@ -86,10 +85,10 @@ Tag SharedObjectTemplate::getTemplateVersion(void) const */ Tag SharedObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const SharedObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedObjectTemplate::getHighestTemplateVersion diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/SharedObjectTemplate.h old mode 100755 new mode 100644 diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedPlayerObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedPlayerObjectTemplate.cpp old mode 100755 new mode 100644 index 5d99e4c9..1f685453 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedPlayerObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedPlayerObjectTemplate.cpp @@ -17,8 +17,7 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include -#include +#include @@ -86,10 +85,10 @@ Tag SharedPlayerObjectTemplate::getTemplateVersion(void) const */ Tag SharedPlayerObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const SharedPlayerObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedPlayerObjectTemplate::getHighestTemplateVersion diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedPlayerObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/SharedPlayerObjectTemplate.h old mode 100755 new mode 100644 diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedPlayerQuestObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedPlayerQuestObjectTemplate.cpp old mode 100755 new mode 100644 index f3b04e88..37e6e9fa --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedPlayerQuestObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedPlayerQuestObjectTemplate.cpp @@ -18,8 +18,7 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include -#include +#include @@ -87,10 +86,10 @@ Tag SharedPlayerQuestObjectTemplate::getTemplateVersion(void) const */ Tag SharedPlayerQuestObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const SharedPlayerQuestObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedPlayerQuestObjectTemplate::getHighestTemplateVersion diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedPlayerQuestObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/SharedPlayerQuestObjectTemplate.h old mode 100755 new mode 100644 diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedResourceContainerObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedResourceContainerObjectTemplate.cpp old mode 100755 new mode 100644 index 3ea96d3d..a8435f87 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedResourceContainerObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedResourceContainerObjectTemplate.cpp @@ -17,8 +17,7 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include -#include +#include @@ -86,10 +85,10 @@ Tag SharedResourceContainerObjectTemplate::getTemplateVersion(void) const */ Tag SharedResourceContainerObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const SharedResourceContainerObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedResourceContainerObjectTemplate::getHighestTemplateVersion diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedResourceContainerObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/SharedResourceContainerObjectTemplate.h old mode 100755 new mode 100644 diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedShipObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedShipObjectTemplate.cpp old mode 100755 new mode 100644 index d7705d97..9ef7b561 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedShipObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedShipObjectTemplate.cpp @@ -17,8 +17,7 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include -#include +#include @@ -86,10 +85,10 @@ Tag SharedShipObjectTemplate::getTemplateVersion(void) const */ Tag SharedShipObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const SharedShipObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedShipObjectTemplate::getHighestTemplateVersion diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedShipObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/SharedShipObjectTemplate.h old mode 100755 new mode 100644 diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedStaticObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedStaticObjectTemplate.cpp old mode 100755 new mode 100644 index 19de68be..8a4defc4 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedStaticObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedStaticObjectTemplate.cpp @@ -17,8 +17,7 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include -#include +#include @@ -86,10 +85,10 @@ Tag SharedStaticObjectTemplate::getTemplateVersion(void) const */ Tag SharedStaticObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const SharedStaticObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedStaticObjectTemplate::getHighestTemplateVersion diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedStaticObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/SharedStaticObjectTemplate.h old mode 100755 new mode 100644 diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedTangibleObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedTangibleObjectTemplate.cpp old mode 100755 new mode 100644 index 4d25f625..62846274 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedTangibleObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedTangibleObjectTemplate.cpp @@ -17,8 +17,9 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include -#include +#include + + /** * Class constructor. @@ -26,21 +27,19 @@ SharedTangibleObjectTemplate::SharedTangibleObjectTemplate(const std::string & filename) //@BEGIN TFD INIT : SharedObjectTemplate(filename) - , m_paletteColorCustomizationVariablesLoaded(false) - , m_paletteColorCustomizationVariablesAppend(false) - , m_rangedIntCustomizationVariablesLoaded(false) - , m_rangedIntCustomizationVariablesAppend(false) - , m_constStringCustomizationVariablesLoaded(false) - , m_constStringCustomizationVariablesAppend(false) - , m_socketDestinationsLoaded(false) - , m_socketDestinationsAppend(false) - , m_certificationsRequiredLoaded(false) - , m_certificationsRequiredAppend(false) - , m_customizationVariableMappingLoaded(false) - , m_customizationVariableMappingAppend(false) - , m_templateVersion(0) - , m_versionOk(false) - //@END TFD INIT + ,m_paletteColorCustomizationVariablesLoaded(false) + ,m_paletteColorCustomizationVariablesAppend(false) + ,m_rangedIntCustomizationVariablesLoaded(false) + ,m_rangedIntCustomizationVariablesAppend(false) + ,m_constStringCustomizationVariablesLoaded(false) + ,m_constStringCustomizationVariablesAppend(false) + ,m_socketDestinationsLoaded(false) + ,m_socketDestinationsAppend(false) + ,m_certificationsRequiredLoaded(false) + ,m_certificationsRequiredAppend(false) + ,m_customizationVariableMappingLoaded(false) + ,m_customizationVariableMappingAppend(false) +//@END TFD INIT { } // SharedTangibleObjectTemplate::SharedTangibleObjectTemplate @@ -49,7 +48,7 @@ SharedTangibleObjectTemplate::SharedTangibleObjectTemplate(const std::string & f */ SharedTangibleObjectTemplate::~SharedTangibleObjectTemplate() { - //@BEGIN TFD CLEANUP +//@BEGIN TFD CLEANUP { std::vector::iterator iter; for (iter = m_paletteColorCustomizationVariables.begin(); iter != m_paletteColorCustomizationVariables.end(); ++iter) @@ -104,7 +103,7 @@ SharedTangibleObjectTemplate::~SharedTangibleObjectTemplate() } m_customizationVariableMapping.clear(); } - //@END TFD CLEANUP +//@END TFD CLEANUP } // SharedTangibleObjectTemplate::~SharedTangibleObjectTemplate /** @@ -152,10 +151,10 @@ Tag SharedTangibleObjectTemplate::getTemplateVersion(void) const */ Tag SharedTangibleObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const SharedTangibleObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedTangibleObjectTemplate::getHighestTemplateVersion @@ -430,6 +429,7 @@ bool SharedTangibleObjectTemplate::isAppend(const char *name) const return SharedObjectTemplate::isAppend(name); } // SharedTangibleObjectTemplate::isAppend + int SharedTangibleObjectTemplate::getListLength(const char *name) const { if (strcmp(name, "paletteColorCustomizationVariables") == 0) @@ -468,8 +468,8 @@ int SharedTangibleObjectTemplate::getListLength(const char *name) const */ void SharedTangibleObjectTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != SharedTangibleObjectTemplate_tag) { @@ -479,7 +479,7 @@ void SharedTangibleObjectTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -499,7 +499,7 @@ void SharedTangibleObjectTemplate::load(Iff &file) file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 1, 0)) + if (getHighestTemplateVersion() != TAG(0,0,1,0)) { if (DataLint::isEnabled()) DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); @@ -653,18 +653,18 @@ void SharedTangibleObjectTemplate::load(Iff &file) */ void SharedTangibleObjectTemplate::save(Iff &file) { - int count; +int count; file.insertForm(SharedTangibleObjectTemplate_tag); if (m_baseTemplateName.size() != 0) { - file.insertForm(TAG(D, E, R, V)); + file.insertForm(TAG(D,E,R,V)); file.insertChunk(TAG(X, X, X, X)); file.insertChunkData(m_baseTemplateName.c_str(), m_baseTemplateName.size() + 1); file.exitChunk(); file.exitForm(); } - file.insertForm(TAG(0, 0, 1, 0)); + file.insertForm(TAG(0,0,1,0)); file.allowNonlinearFunctions(); int paramCount = 0; @@ -681,7 +681,7 @@ void SharedTangibleObjectTemplate::save(Iff &file) count = m_paletteColorCustomizationVariables.size(); file.insertChunkData(&count, sizeof(count)); {for (int i = 0; i < count; ++i) - m_paletteColorCustomizationVariables[i]->saveToIff(file); } + m_paletteColorCustomizationVariables[i]->saveToIff(file);} file.exitChunk(); ++paramCount; if (!m_rangedIntCustomizationVariablesLoaded) @@ -696,7 +696,7 @@ void SharedTangibleObjectTemplate::save(Iff &file) count = m_rangedIntCustomizationVariables.size(); file.insertChunkData(&count, sizeof(count)); {for (int i = 0; i < count; ++i) - m_rangedIntCustomizationVariables[i]->saveToIff(file); } + m_rangedIntCustomizationVariables[i]->saveToIff(file);} file.exitChunk(); ++paramCount; if (!m_constStringCustomizationVariablesLoaded) @@ -711,7 +711,7 @@ void SharedTangibleObjectTemplate::save(Iff &file) count = m_constStringCustomizationVariables.size(); file.insertChunkData(&count, sizeof(count)); {for (int i = 0; i < count; ++i) - m_constStringCustomizationVariables[i]->saveToIff(file); } + m_constStringCustomizationVariables[i]->saveToIff(file);} file.exitChunk(); ++paramCount; if (!m_socketDestinationsLoaded) @@ -726,7 +726,7 @@ void SharedTangibleObjectTemplate::save(Iff &file) count = m_socketDestinations.size(); file.insertChunkData(&count, sizeof(count)); {for (int i = 0; i < count; ++i) - m_socketDestinations[i]->saveToIff(file); } + m_socketDestinations[i]->saveToIff(file);} file.exitChunk(); ++paramCount; // save structureFootprintFileName @@ -759,7 +759,7 @@ void SharedTangibleObjectTemplate::save(Iff &file) count = m_certificationsRequired.size(); file.insertChunkData(&count, sizeof(count)); {for (int i = 0; i < count; ++i) - m_certificationsRequired[i]->saveToIff(file); } + m_certificationsRequired[i]->saveToIff(file);} file.exitChunk(); ++paramCount; if (!m_customizationVariableMappingLoaded) @@ -774,7 +774,7 @@ void SharedTangibleObjectTemplate::save(Iff &file) count = m_customizationVariableMapping.size(); file.insertChunkData(&count, sizeof(count)); {for (int i = 0; i < count; ++i) - m_customizationVariableMapping[i]->saveToIff(file); } + m_customizationVariableMapping[i]->saveToIff(file);} file.exitChunk(); ++paramCount; // save clientVisabilityFlag @@ -795,6 +795,7 @@ void SharedTangibleObjectTemplate::save(Iff &file) file.exitForm(); } // SharedTangibleObjectTemplate::save + //============================================================================= // class SharedTangibleObjectTemplate::_ConstStringCustomizationVariable @@ -938,6 +939,7 @@ bool SharedTangibleObjectTemplate::_ConstStringCustomizationVariable::isAppend(c return TpfTemplate::isAppend(name); } // SharedTangibleObjectTemplate::_ConstStringCustomizationVariable::isAppend + int SharedTangibleObjectTemplate::_ConstStringCustomizationVariable::getListLength(const char *name) const { return TpfTemplate::getListLength(name); @@ -951,8 +953,8 @@ int SharedTangibleObjectTemplate::_ConstStringCustomizationVariable::getListLeng */ void SharedTangibleObjectTemplate::_ConstStringCustomizationVariable::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; file.enterForm(); @@ -982,7 +984,7 @@ void SharedTangibleObjectTemplate::_ConstStringCustomizationVariable::load(Iff & */ void SharedTangibleObjectTemplate::_ConstStringCustomizationVariable::save(Iff &file) { - int count; +int count; file.insertForm(_ConstStringCustomizationVariable_tag); @@ -1011,6 +1013,7 @@ void SharedTangibleObjectTemplate::_ConstStringCustomizationVariable::save(Iff & UNREF(count); } // SharedTangibleObjectTemplate::_ConstStringCustomizationVariable::save + //============================================================================= // class SharedTangibleObjectTemplate::_CustomizationVariableMapping @@ -1154,6 +1157,7 @@ bool SharedTangibleObjectTemplate::_CustomizationVariableMapping::isAppend(const return TpfTemplate::isAppend(name); } // SharedTangibleObjectTemplate::_CustomizationVariableMapping::isAppend + int SharedTangibleObjectTemplate::_CustomizationVariableMapping::getListLength(const char *name) const { return TpfTemplate::getListLength(name); @@ -1167,8 +1171,8 @@ int SharedTangibleObjectTemplate::_CustomizationVariableMapping::getListLength(c */ void SharedTangibleObjectTemplate::_CustomizationVariableMapping::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; file.enterForm(); @@ -1198,7 +1202,7 @@ void SharedTangibleObjectTemplate::_CustomizationVariableMapping::load(Iff &file */ void SharedTangibleObjectTemplate::_CustomizationVariableMapping::save(Iff &file) { - int count; +int count; file.insertForm(_CustomizationVariableMapping_tag); @@ -1227,6 +1231,7 @@ void SharedTangibleObjectTemplate::_CustomizationVariableMapping::save(Iff &file UNREF(count); } // SharedTangibleObjectTemplate::_CustomizationVariableMapping::save + //============================================================================= // class SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable @@ -1386,6 +1391,7 @@ bool SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable::isAppend( return TpfTemplate::isAppend(name); } // SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable::isAppend + int SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable::getListLength(const char *name) const { return TpfTemplate::getListLength(name); @@ -1399,8 +1405,8 @@ int SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable::getListLen */ void SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; file.enterForm(); @@ -1432,7 +1438,7 @@ void SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable::load(Iff */ void SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable::save(Iff &file) { - int count; +int count; file.insertForm(_PaletteColorCustomizationVariable_tag); @@ -1467,6 +1473,7 @@ void SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable::save(Iff UNREF(count); } // SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable::save + //============================================================================= // class SharedTangibleObjectTemplate::_RangedIntCustomizationVariable @@ -1640,6 +1647,7 @@ bool SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::isAppend(con return TpfTemplate::isAppend(name); } // SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::isAppend + int SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::getListLength(const char *name) const { return TpfTemplate::getListLength(name); @@ -1653,8 +1661,8 @@ int SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::getListLength */ void SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; file.enterForm(); @@ -1688,7 +1696,7 @@ void SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::load(Iff &fi */ void SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::save(Iff &file) { - int count; +int count; file.insertForm(_RangedIntCustomizationVariable_tag); @@ -1729,4 +1737,4 @@ void SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::save(Iff &fi UNREF(count); } // SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::save -//@END TFD \ No newline at end of file +//@END TFD diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedTangibleObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/SharedTangibleObjectTemplate.h old mode 100755 new mode 100644 diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedTerrainSurfaceObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedTerrainSurfaceObjectTemplate.cpp old mode 100755 new mode 100644 index aeaeff99..3823a815 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedTerrainSurfaceObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedTerrainSurfaceObjectTemplate.cpp @@ -17,8 +17,7 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include -#include +#include @@ -86,10 +85,10 @@ Tag SharedTerrainSurfaceObjectTemplate::getTemplateVersion(void) const */ Tag SharedTerrainSurfaceObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const SharedTerrainSurfaceObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedTerrainSurfaceObjectTemplate::getHighestTemplateVersion diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedTerrainSurfaceObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/SharedTerrainSurfaceObjectTemplate.h old mode 100755 new mode 100644 diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedTokenObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedTokenObjectTemplate.cpp old mode 100755 new mode 100644 index 03f9ec94..f627c2c9 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedTokenObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedTokenObjectTemplate.cpp @@ -17,8 +17,7 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include -#include +#include @@ -86,10 +85,10 @@ Tag SharedTokenObjectTemplate::getTemplateVersion(void) const */ Tag SharedTokenObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const SharedTokenObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedTokenObjectTemplate::getHighestTemplateVersion diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedTokenObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/SharedTokenObjectTemplate.h old mode 100755 new mode 100644 diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedUniverseObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedUniverseObjectTemplate.cpp old mode 100755 new mode 100644 index d429becf..6c08a87d --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedUniverseObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedUniverseObjectTemplate.cpp @@ -17,8 +17,7 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include -#include +#include @@ -86,10 +85,10 @@ Tag SharedUniverseObjectTemplate::getTemplateVersion(void) const */ Tag SharedUniverseObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const SharedUniverseObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedUniverseObjectTemplate::getHighestTemplateVersion diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedUniverseObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/SharedUniverseObjectTemplate.h old mode 100755 new mode 100644 diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedVehicleObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedVehicleObjectTemplate.cpp old mode 100755 new mode 100644 index b1f83b74..a63cda29 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedVehicleObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedVehicleObjectTemplate.cpp @@ -17,8 +17,7 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include -#include +#include @@ -86,10 +85,10 @@ Tag SharedVehicleObjectTemplate::getTemplateVersion(void) const */ Tag SharedVehicleObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const SharedVehicleObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedVehicleObjectTemplate::getHighestTemplateVersion diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedVehicleObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/SharedVehicleObjectTemplate.h old mode 100755 new mode 100644 diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedWaypointObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedWaypointObjectTemplate.cpp old mode 100755 new mode 100644 index 69ad3053..466cea0c --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedWaypointObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedWaypointObjectTemplate.cpp @@ -17,8 +17,7 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include -#include +#include @@ -86,10 +85,10 @@ Tag SharedWaypointObjectTemplate::getTemplateVersion(void) const */ Tag SharedWaypointObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const SharedWaypointObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedWaypointObjectTemplate::getHighestTemplateVersion diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedWaypointObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/SharedWaypointObjectTemplate.h old mode 100755 new mode 100644 diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedWeaponObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedWeaponObjectTemplate.cpp old mode 100755 new mode 100644 index 690d160e..751db1f5 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedWeaponObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedWeaponObjectTemplate.cpp @@ -17,8 +17,7 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include -#include +#include @@ -86,10 +85,10 @@ Tag SharedWeaponObjectTemplate::getTemplateVersion(void) const */ Tag SharedWeaponObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const SharedWeaponObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // SharedWeaponObjectTemplate::getHighestTemplateVersion diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedWeaponObjectTemplate.h b/engine/shared/library/sharedTemplate/src/shared/template/SharedWeaponObjectTemplate.h old mode 100755 new mode 100644 diff --git a/game/server/application/SwgGameServer/src/shared/objectTemplate/ServerJediManagerObjectTemplate.cpp b/game/server/application/SwgGameServer/src/shared/objectTemplate/ServerJediManagerObjectTemplate.cpp old mode 100755 new mode 100644 index 734633e2..3fac08d1 --- a/game/server/application/SwgGameServer/src/shared/objectTemplate/ServerJediManagerObjectTemplate.cpp +++ b/game/server/application/SwgGameServer/src/shared/objectTemplate/ServerJediManagerObjectTemplate.cpp @@ -23,20 +23,20 @@ const std::string DefaultString(""); const StringId DefaultStringId("", 0); -const Vector DefaultVector(0, 0, 0); +const Vector DefaultVector(0,0,0); const TriggerVolumeData DefaultTriggerVolumeData; bool ServerJediManagerObjectTemplate::ms_allowDefaultTemplateParams = true; + /** * Class constructor. */ ServerJediManagerObjectTemplate::ServerJediManagerObjectTemplate(const std::string & filename) //@BEGIN TFD INIT : ServerUniverseObjectTemplate(filename) - , m_versionOk(true) - , m_templateVersion(0) - //@END TFD INIT + ,m_versionOk(true) +//@END TFD INIT { } // ServerJediManagerObjectTemplate::ServerJediManagerObjectTemplate @@ -45,8 +45,8 @@ ServerJediManagerObjectTemplate::ServerJediManagerObjectTemplate(const std::stri */ ServerJediManagerObjectTemplate::~ServerJediManagerObjectTemplate() { - //@BEGIN TFD CLEANUP - //@END TFD CLEANUP +//@BEGIN TFD CLEANUP +//@END TFD CLEANUP } // ServerJediManagerObjectTemplate::~ServerJediManagerObjectTemplate /** @@ -94,10 +94,10 @@ Tag ServerJediManagerObjectTemplate::getTemplateVersion(void) const */ Tag ServerJediManagerObjectTemplate::getHighestTemplateVersion(void) const { - if (m_baseData == nullptr) + if (m_baseData == NULL) return m_templateVersion; const ServerJediManagerObjectTemplate * base = dynamic_cast(m_baseData); - if (base == nullptr) + if (base == NULL) return m_templateVersion; return std::max(m_templateVersion, base->getHighestTemplateVersion()); } // ServerJediManagerObjectTemplate::getHighestTemplateVersion @@ -131,8 +131,8 @@ void ServerJediManagerObjectTemplate::testValues(void) const */ void ServerJediManagerObjectTemplate::load(Iff &file) { - static const int MAX_NAME_SIZE = 256; - char paramName[MAX_NAME_SIZE]; +static const int MAX_NAME_SIZE = 256; +char paramName[MAX_NAME_SIZE]; if (file.getCurrentName() != ServerJediManagerObjectTemplate_tag) { @@ -142,7 +142,7 @@ void ServerJediManagerObjectTemplate::load(Iff &file) file.enterForm(); m_templateVersion = file.getCurrentName(); - if (m_templateVersion == TAG(D, E, R, V)) + if (m_templateVersion == TAG(D,E,R,V)) { file.enterForm(); file.enterChunk(); @@ -162,7 +162,7 @@ void ServerJediManagerObjectTemplate::load(Iff &file) file.exitForm(); m_templateVersion = file.getCurrentName(); } - if (getHighestTemplateVersion() != TAG(0, 0, 0, 0)) + if (getHighestTemplateVersion() != TAG(0,0,0,0)) { if (DataLint::isEnabled()) DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); @@ -183,4 +183,4 @@ void ServerJediManagerObjectTemplate::load(Iff &file) return; } // ServerJediManagerObjectTemplate::load -//@END TFD \ No newline at end of file +//@END TFD diff --git a/game/server/application/SwgGameServer/src/shared/objectTemplate/ServerJediManagerObjectTemplate.h b/game/server/application/SwgGameServer/src/shared/objectTemplate/ServerJediManagerObjectTemplate.h old mode 100755 new mode 100644