From fe8b531b42e3e30e5d4dd079b357e2a2607a49e9 Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Thu, 24 Mar 2016 16:53:59 +0000 Subject: [PATCH] remove all the set but not used testDataValue warnings - coan is a great tool! http://coan2.sourceforge.net/ --- .../SharedBattlefieldMarkerObjectTemplate.cpp | 121 +-- .../SharedBattlefieldMarkerObjectTemplate.h | 17 +- .../SharedBuildingObjectTemplate.cpp | 49 +- .../SharedBuildingObjectTemplate.h | 9 +- .../SharedCellObjectTemplate.cpp | 13 +- .../objectTemplate/SharedCellObjectTemplate.h | 5 - ...aredConstructionContractObjectTemplate.cpp | 13 +- ...SharedConstructionContractObjectTemplate.h | 5 - .../SharedCreatureObjectTemplate.cpp | 757 ++---------------- .../SharedCreatureObjectTemplate.h | 89 +- .../SharedDraftSchematicObjectTemplate.cpp | 172 +--- .../SharedDraftSchematicObjectTemplate.h | 31 +- .../SharedFactoryObjectTemplate.cpp | 13 +- .../SharedFactoryObjectTemplate.h | 5 - .../SharedGroupObjectTemplate.cpp | 13 +- .../SharedGroupObjectTemplate.h | 5 - .../SharedGuildObjectTemplate.cpp | 13 +- .../SharedGuildObjectTemplate.h | 5 - .../SharedInstallationObjectTemplate.cpp | 13 +- .../SharedInstallationObjectTemplate.h | 5 - .../SharedIntangibleObjectTemplate.cpp | 13 +- .../SharedIntangibleObjectTemplate.h | 5 - .../SharedJediManagerObjectTemplate.cpp | 15 +- .../SharedJediManagerObjectTemplate.h | 5 - ...aredManufactureSchematicObjectTemplate.cpp | 13 +- ...SharedManufactureSchematicObjectTemplate.h | 5 - .../SharedMissionObjectTemplate.cpp | 13 +- .../SharedMissionObjectTemplate.h | 5 - .../objectTemplate/SharedObjectTemplate.cpp | 618 ++------------ .../objectTemplate/SharedObjectTemplate.h | 73 +- .../SharedPlayerObjectTemplate.cpp | 15 +- .../SharedPlayerObjectTemplate.h | 5 - .../SharedPlayerQuestObjectTemplate.cpp | 15 +- .../SharedPlayerQuestObjectTemplate.h | 5 - .../SharedResourceContainerObjectTemplate.cpp | 13 +- .../SharedResourceContainerObjectTemplate.h | 5 - .../SharedShipObjectTemplate.cpp | 87 +- .../objectTemplate/SharedShipObjectTemplate.h | 13 +- .../SharedStaticObjectTemplate.cpp | 13 +- .../SharedStaticObjectTemplate.h | 5 - .../SharedTangibleObjectTemplate.cpp | 465 ++--------- .../SharedTangibleObjectTemplate.h | 71 +- .../SharedTerrainSurfaceObjectTemplate.cpp | 93 +-- .../SharedTerrainSurfaceObjectTemplate.h | 13 +- .../SharedUniverseObjectTemplate.cpp | 15 +- .../SharedUniverseObjectTemplate.h | 5 - .../SharedVehicleObjectTemplate.cpp | 331 +------- .../SharedVehicleObjectTemplate.h | 41 +- .../SharedWaypointObjectTemplate.cpp | 13 +- .../SharedWaypointObjectTemplate.h | 5 - .../SharedWeaponObjectTemplate.cpp | 102 +-- .../SharedWeaponObjectTemplate.h | 15 +- 52 files changed, 497 insertions(+), 2966 deletions(-) diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedBattlefieldMarkerObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedBattlefieldMarkerObjectTemplate.cpp index a83d8b7f..5219f6c2 100755 --- 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" @@ -104,22 +104,14 @@ Tag SharedBattlefieldMarkerObjectTemplate::getHighestTemplateVersion(void) const } // SharedBattlefieldMarkerObjectTemplate::getHighestTemplateVersion //@BEGIN TFD -int SharedBattlefieldMarkerObjectTemplate::getNumberOfPoles(bool testData) const +int SharedBattlefieldMarkerObjectTemplate::getNumberOfPoles() 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()) @@ -159,31 +151,18 @@ UNREF(testData); 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(bool testData) const +int SharedBattlefieldMarkerObjectTemplate::getNumberOfPolesMin() 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()) @@ -223,31 +202,18 @@ UNREF(testData); 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(bool testData) const +int SharedBattlefieldMarkerObjectTemplate::getNumberOfPolesMax() 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()) @@ -287,31 +253,18 @@ UNREF(testData); 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(bool testData) const +float SharedBattlefieldMarkerObjectTemplate::getRadius() 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()) @@ -351,31 +304,18 @@ UNREF(testData); 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(bool testData) const +float SharedBattlefieldMarkerObjectTemplate::getRadiusMin() 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()) @@ -415,31 +355,18 @@ UNREF(testData); 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(bool testData) const +float SharedBattlefieldMarkerObjectTemplate::getRadiusMax() 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()) @@ -479,28 +406,10 @@ UNREF(testData); 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 @@ -543,8 +452,8 @@ char paramName[MAX_NAME_SIZE]; } if (getHighestTemplateVersion() != TAG(0,0,0,1)) { - if (DataLint::isEnabled()) - DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); + + m_versionOk = false; } diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedBattlefieldMarkerObjectTemplate.h b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedBattlefieldMarkerObjectTemplate.h index 29672636..52200959 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedBattlefieldMarkerObjectTemplate.h +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedBattlefieldMarkerObjectTemplate.h @@ -44,18 +44,13 @@ public: //@BEGIN TFD public: - 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; + int getNumberOfPoles() const; + int getNumberOfPolesMin() const; + int getNumberOfPolesMax() const; + float getRadius() const; + float getRadiusMin() const; + float getRadiusMax() 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 index 89b64952..b666e7d3 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedBuildingObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedBuildingObjectTemplate.cpp @@ -103,22 +103,14 @@ Tag SharedBuildingObjectTemplate::getHighestTemplateVersion(void) const } // SharedBuildingObjectTemplate::getHighestTemplateVersion //@BEGIN TFD -const std::string & SharedBuildingObjectTemplate::getTerrainModificationFileName(bool testData) const +const std::string & SharedBuildingObjectTemplate::getTerrainModificationFileName() 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()) @@ -136,31 +128,18 @@ UNREF(testData); } const std::string & value = m_terrainModificationFileName.getValue(); -#ifdef _DEBUG - if (testData && base != nullptr) - { - } -#endif return value; } // SharedBuildingObjectTemplate::getTerrainModificationFileName -const std::string & SharedBuildingObjectTemplate::getInteriorLayoutFileName(bool testData) const +const std::string & SharedBuildingObjectTemplate::getInteriorLayoutFileName() 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()) @@ -178,26 +157,10 @@ UNREF(testData); } 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 @@ -240,8 +203,8 @@ char paramName[MAX_NAME_SIZE]; } if (getHighestTemplateVersion() != TAG(0,0,0,1)) { - if (DataLint::isEnabled()) - DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); + + m_versionOk = false; } diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedBuildingObjectTemplate.h b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedBuildingObjectTemplate.h index 1c37d84e..9405f059 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedBuildingObjectTemplate.h +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedBuildingObjectTemplate.h @@ -44,14 +44,9 @@ public: //@BEGIN TFD public: - const std::string & getTerrainModificationFileName(bool testData = false) const; - const std::string & getInteriorLayoutFileName(bool testData = false) const; + const std::string & getTerrainModificationFileName() const; + const std::string & getInteriorLayoutFileName() 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 index 0c319760..adee55bf 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedCellObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedCellObjectTemplate.cpp @@ -103,15 +103,6 @@ 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 @@ -154,8 +145,8 @@ char paramName[MAX_NAME_SIZE]; } if (getHighestTemplateVersion() != TAG(0,0,0,0)) { - if (DataLint::isEnabled()) - DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); + + m_versionOk = false; } diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedCellObjectTemplate.h b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedCellObjectTemplate.h index 01c05587..c7489b64 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedCellObjectTemplate.h +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedCellObjectTemplate.h @@ -45,11 +45,6 @@ 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 index ab455e20..8f6a8531 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedConstructionContractObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedConstructionContractObjectTemplate.cpp @@ -103,15 +103,6 @@ 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 @@ -154,8 +145,8 @@ char paramName[MAX_NAME_SIZE]; } if (getHighestTemplateVersion() != TAG(0,0,0,0)) { - if (DataLint::isEnabled()) - DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); + + m_versionOk = false; } diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedConstructionContractObjectTemplate.h b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedConstructionContractObjectTemplate.h index 20804df0..8e72f49a 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedConstructionContractObjectTemplate.h +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedConstructionContractObjectTemplate.h @@ -45,11 +45,6 @@ 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 index 6c5c3db1..a6f21c63 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedCreatureObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedCreatureObjectTemplate.cpp @@ -167,22 +167,14 @@ void SharedCreatureObjectTemplate::createCustomizationDataPropertyAsNeeded(Objec // ---------------------------------------------------------------------- //@BEGIN TFD -SharedCreatureObjectTemplate::Gender SharedCreatureObjectTemplate::getGender(bool testData) const +SharedCreatureObjectTemplate::Gender SharedCreatureObjectTemplate::getGender() 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()) @@ -200,31 +192,18 @@ UNREF(testData); } Gender value = static_cast(m_gender.getValue()); -#ifdef _DEBUG - if (testData && base != nullptr) - { - } -#endif return value; } // SharedCreatureObjectTemplate::getGender -SharedCreatureObjectTemplate::Niche SharedCreatureObjectTemplate::getNiche(bool testData) const +SharedCreatureObjectTemplate::Niche SharedCreatureObjectTemplate::getNiche() 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()) @@ -242,31 +221,18 @@ UNREF(testData); } Niche value = static_cast(m_niche.getValue()); -#ifdef _DEBUG - if (testData && base != nullptr) - { - } -#endif return value; } // SharedCreatureObjectTemplate::getNiche -SharedCreatureObjectTemplate::Species SharedCreatureObjectTemplate::getSpecies(bool testData) const +SharedCreatureObjectTemplate::Species SharedCreatureObjectTemplate::getSpecies() 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()) @@ -284,31 +250,18 @@ UNREF(testData); } Species value = static_cast(m_species.getValue()); -#ifdef _DEBUG - if (testData && base != nullptr) - { - } -#endif return value; } // SharedCreatureObjectTemplate::getSpecies -SharedCreatureObjectTemplate::Race SharedCreatureObjectTemplate::getRace(bool testData) const +SharedCreatureObjectTemplate::Race SharedCreatureObjectTemplate::getRace() 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()) @@ -326,11 +279,6 @@ UNREF(testData); } Race value = static_cast(m_race.getValue()); -#ifdef _DEBUG - if (testData && base != nullptr) - { - } -#endif return value; } // SharedCreatureObjectTemplate::getRace @@ -776,22 +724,14 @@ float SharedCreatureObjectTemplate::getTurnRateMax(MovementTypes index) const return value; } // SharedCreatureObjectTemplate::getTurnRateMax -const std::string & SharedCreatureObjectTemplate::getAnimationMapFilename(bool testData) const +const std::string & SharedCreatureObjectTemplate::getAnimationMapFilename() 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()) @@ -809,31 +749,18 @@ UNREF(testData); } const std::string & value = m_animationMapFilename.getValue(); -#ifdef _DEBUG - if (testData && base != nullptr) - { - } -#endif return value; } // SharedCreatureObjectTemplate::getAnimationMapFilename -float SharedCreatureObjectTemplate::getSlopeModAngle(bool testData) const +float SharedCreatureObjectTemplate::getSlopeModAngle() 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()) @@ -873,31 +800,18 @@ UNREF(testData); 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(bool testData) const +float SharedCreatureObjectTemplate::getSlopeModAngleMin() 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()) @@ -937,31 +851,18 @@ UNREF(testData); 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(bool testData) const +float SharedCreatureObjectTemplate::getSlopeModAngleMax() 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()) @@ -1001,31 +902,18 @@ UNREF(testData); 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(bool testData) const +float SharedCreatureObjectTemplate::getSlopeModPercent() 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()) @@ -1065,31 +953,18 @@ UNREF(testData); 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(bool testData) const +float SharedCreatureObjectTemplate::getSlopeModPercentMin() 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()) @@ -1129,31 +1004,18 @@ UNREF(testData); 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(bool testData) const +float SharedCreatureObjectTemplate::getSlopeModPercentMax() 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()) @@ -1193,31 +1055,18 @@ UNREF(testData); 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(bool testData) const +float SharedCreatureObjectTemplate::getWaterModPercent() 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()) @@ -1257,31 +1106,18 @@ UNREF(testData); 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(bool testData) const +float SharedCreatureObjectTemplate::getWaterModPercentMin() 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()) @@ -1321,31 +1157,18 @@ UNREF(testData); 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(bool testData) const +float SharedCreatureObjectTemplate::getWaterModPercentMax() 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()) @@ -1385,31 +1208,18 @@ UNREF(testData); 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(bool testData) const +float SharedCreatureObjectTemplate::getStepHeight() 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()) @@ -1449,31 +1259,18 @@ UNREF(testData); 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(bool testData) const +float SharedCreatureObjectTemplate::getStepHeightMin() 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()) @@ -1513,31 +1310,18 @@ UNREF(testData); 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(bool testData) const +float SharedCreatureObjectTemplate::getStepHeightMax() 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()) @@ -1577,31 +1361,18 @@ UNREF(testData); 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(bool testData) const +float SharedCreatureObjectTemplate::getCollisionHeight() 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()) @@ -1641,31 +1412,18 @@ UNREF(testData); 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(bool testData) const +float SharedCreatureObjectTemplate::getCollisionHeightMin() 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()) @@ -1705,31 +1463,18 @@ UNREF(testData); 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(bool testData) const +float SharedCreatureObjectTemplate::getCollisionHeightMax() 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()) @@ -1769,31 +1514,18 @@ UNREF(testData); 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(bool testData) const +float SharedCreatureObjectTemplate::getCollisionRadius() 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()) @@ -1833,31 +1565,18 @@ UNREF(testData); 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(bool testData) const +float SharedCreatureObjectTemplate::getCollisionRadiusMin() 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()) @@ -1897,31 +1616,18 @@ UNREF(testData); 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(bool testData) const +float SharedCreatureObjectTemplate::getCollisionRadiusMax() 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()) @@ -1961,31 +1667,18 @@ UNREF(testData); 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(bool testData) const +const std::string & SharedCreatureObjectTemplate::getMovementDatatable() 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()) @@ -2003,11 +1696,6 @@ UNREF(testData); } const std::string & value = m_movementDatatable.getValue(); -#ifdef _DEBUG - if (testData && base != nullptr) - { - } -#endif return value; } // SharedCreatureObjectTemplate::getMovementDatatable @@ -2039,22 +1727,14 @@ bool SharedCreatureObjectTemplate::getPostureAlignToTerrain(Postures index) cons return value; } // SharedCreatureObjectTemplate::getPostureAlignToTerrain -float SharedCreatureObjectTemplate::getSwimHeight(bool testData) const +float SharedCreatureObjectTemplate::getSwimHeight() 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()) @@ -2094,31 +1774,18 @@ UNREF(testData); 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(bool testData) const +float SharedCreatureObjectTemplate::getSwimHeightMin() 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()) @@ -2158,31 +1825,18 @@ UNREF(testData); 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(bool testData) const +float SharedCreatureObjectTemplate::getSwimHeightMax() 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()) @@ -2222,31 +1876,18 @@ UNREF(testData); 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(bool testData) const +float SharedCreatureObjectTemplate::getWarpTolerance() 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()) @@ -2286,31 +1927,18 @@ UNREF(testData); 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(bool testData) const +float SharedCreatureObjectTemplate::getWarpToleranceMin() 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()) @@ -2350,31 +1978,18 @@ UNREF(testData); 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(bool testData) const +float SharedCreatureObjectTemplate::getWarpToleranceMax() 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()) @@ -2414,31 +2029,18 @@ UNREF(testData); 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(bool testData) const +float SharedCreatureObjectTemplate::getCollisionOffsetX() 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()) @@ -2478,31 +2080,18 @@ UNREF(testData); 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(bool testData) const +float SharedCreatureObjectTemplate::getCollisionOffsetXMin() 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()) @@ -2542,31 +2131,18 @@ UNREF(testData); 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(bool testData) const +float SharedCreatureObjectTemplate::getCollisionOffsetXMax() 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()) @@ -2606,31 +2182,18 @@ UNREF(testData); 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(bool testData) const +float SharedCreatureObjectTemplate::getCollisionOffsetZ() 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()) @@ -2670,31 +2233,18 @@ UNREF(testData); 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(bool testData) const +float SharedCreatureObjectTemplate::getCollisionOffsetZMin() 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()) @@ -2734,31 +2284,18 @@ UNREF(testData); 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(bool testData) const +float SharedCreatureObjectTemplate::getCollisionOffsetZMax() 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()) @@ -2798,31 +2335,18 @@ UNREF(testData); 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(bool testData) const +float SharedCreatureObjectTemplate::getCollisionLength() 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()) @@ -2862,31 +2386,18 @@ UNREF(testData); 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(bool testData) const +float SharedCreatureObjectTemplate::getCollisionLengthMin() 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()) @@ -2926,31 +2437,18 @@ UNREF(testData); 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(bool testData) const +float SharedCreatureObjectTemplate::getCollisionLengthMax() 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()) @@ -2990,31 +2488,18 @@ UNREF(testData); 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(bool testData) const +float SharedCreatureObjectTemplate::getCameraHeight() 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()) @@ -3054,31 +2539,18 @@ UNREF(testData); 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(bool testData) const +float SharedCreatureObjectTemplate::getCameraHeightMin() 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()) @@ -3118,31 +2590,18 @@ UNREF(testData); 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(bool testData) const +float SharedCreatureObjectTemplate::getCameraHeightMax() 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()) @@ -3182,54 +2641,10 @@ UNREF(testData); 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 @@ -3272,8 +2687,8 @@ char paramName[MAX_NAME_SIZE]; } if (getHighestTemplateVersion() != TAG(0,0,1,3)) { - if (DataLint::isEnabled()) - DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); + + m_versionOk = false; } diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedCreatureObjectTemplate.h b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedCreatureObjectTemplate.h index 53645aa7..63164a08 100755 --- 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(bool testData = false) const; - Niche getNiche(bool testData = false) const; - Species getSpecies(bool testData = false) const; - Race getRace(bool testData = false) const; + Gender getGender() const; + Niche getNiche() const; + Species getSpecies() const; + Race getRace() const; float getAcceleration(MovementTypes index) const; float getAccelerationMin(MovementTypes index) const; float getAccelerationMax(MovementTypes index) const; @@ -374,51 +374,46 @@ public: float getTurnRate(MovementTypes index) const; float getTurnRateMin(MovementTypes index) const; float getTurnRateMax(MovementTypes index) 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; + 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; bool getPostureAlignToTerrain(Postures index) 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; + 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; -#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 index 961cebca..50b15cd6 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedDraftSchematicObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedDraftSchematicObjectTemplate.cpp @@ -434,22 +434,14 @@ size_t SharedDraftSchematicObjectTemplate::getAttributesCount(void) const return count; } // SharedDraftSchematicObjectTemplate::getAttributesCount -const std::string & SharedDraftSchematicObjectTemplate::getCraftedSharedTemplate(bool testData) const +const std::string & SharedDraftSchematicObjectTemplate::getCraftedSharedTemplate() 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()) @@ -467,25 +459,10 @@ UNREF(testData); } 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 @@ -528,8 +505,8 @@ char paramName[MAX_NAME_SIZE]; } if (getHighestTemplateVersion() != TAG(0,0,0,3)) { - if (DataLint::isEnabled()) - DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); + + m_versionOk = false; } @@ -638,22 +615,14 @@ Tag SharedDraftSchematicObjectTemplate::_IngredientSlot::getId(void) const return _IngredientSlot_tag; } // SharedDraftSchematicObjectTemplate::_IngredientSlot::getId -const StringId SharedDraftSchematicObjectTemplate::_IngredientSlot::getName(bool versionOk, bool testData) const +const StringId SharedDraftSchematicObjectTemplate::_IngredientSlot::getName(bool versionOk, ) 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()) @@ -671,31 +640,18 @@ UNREF(testData); } 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, bool testData) const +const std::string & SharedDraftSchematicObjectTemplate::_IngredientSlot::getHardpoint(bool versionOk, ) 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()) @@ -713,25 +669,10 @@ UNREF(testData); } 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 @@ -811,22 +752,14 @@ Tag SharedDraftSchematicObjectTemplate::_SchematicAttribute::getId(void) const return _SchematicAttribute_tag; } // SharedDraftSchematicObjectTemplate::_SchematicAttribute::getId -const StringId SharedDraftSchematicObjectTemplate::_SchematicAttribute::getName(bool versionOk, bool testData) const +const StringId SharedDraftSchematicObjectTemplate::_SchematicAttribute::getName(bool versionOk, ) 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()) @@ -844,31 +777,18 @@ UNREF(testData); } 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, bool testData) const +const StringId SharedDraftSchematicObjectTemplate::_SchematicAttribute::getExperiment(bool versionOk, ) 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()) @@ -886,31 +806,18 @@ UNREF(testData); } const StringId value = m_experiment.getValue(); -#ifdef _DEBUG - if (testData && base != nullptr) - { - } -#endif return value; } // SharedDraftSchematicObjectTemplate::_SchematicAttribute::getExperiment -int SharedDraftSchematicObjectTemplate::_SchematicAttribute::getValue(bool versionOk, bool testData) const +int SharedDraftSchematicObjectTemplate::_SchematicAttribute::getValue(bool versionOk, ) 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()) @@ -950,31 +857,18 @@ UNREF(testData); 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, bool testData) const +int SharedDraftSchematicObjectTemplate::_SchematicAttribute::getValueMin(bool versionOk, ) 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()) @@ -1014,31 +908,18 @@ UNREF(testData); 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, bool testData) const +int SharedDraftSchematicObjectTemplate::_SchematicAttribute::getValueMax(bool versionOk, ) 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()) @@ -1078,27 +959,10 @@ UNREF(testData); 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 diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedDraftSchematicObjectTemplate.h b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedDraftSchematicObjectTemplate.h index e84be62c..9d312500 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedDraftSchematicObjectTemplate.h +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedDraftSchematicObjectTemplate.h @@ -109,14 +109,9 @@ protected: virtual Tag getId(void) const; public: - const StringId getName(bool versionOk, bool testData = false) const; - const std::string & getHardpoint(bool versionOk, bool testData = false) const; + const StringId getName(bool versionOk) const; + const std::string & getHardpoint(bool versionOk) const; -#ifdef _DEBUG -public: - // special code used by datalint - virtual void testValues(void) const; -#endif protected: virtual void load(Iff &file); @@ -149,17 +144,12 @@ private: virtual Tag getId(void) const; public: - 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; + 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; -#ifdef _DEBUG -public: - // special code used by datalint - virtual void testValues(void) const; -#endif protected: virtual void load(Iff &file); @@ -186,13 +176,8 @@ public: void getAttributesMin(SchematicAttribute &data, int index) const; void getAttributesMax(SchematicAttribute &data, int index) const; size_t getAttributesCount(void) const; - const std::string & getCraftedSharedTemplate(bool testData = false) const; + const std::string & getCraftedSharedTemplate() 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 index 4a7e73fa..75390ff3 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedFactoryObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedFactoryObjectTemplate.cpp @@ -103,15 +103,6 @@ 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 @@ -154,8 +145,8 @@ char paramName[MAX_NAME_SIZE]; } if (getHighestTemplateVersion() != TAG(0,0,0,0)) { - if (DataLint::isEnabled()) - DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); + + m_versionOk = false; } diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedFactoryObjectTemplate.h b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedFactoryObjectTemplate.h index 3bab50b6..9333931b 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedFactoryObjectTemplate.h +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedFactoryObjectTemplate.h @@ -45,11 +45,6 @@ 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 index d3c1d6d0..3605fec1 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedGroupObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedGroupObjectTemplate.cpp @@ -103,15 +103,6 @@ 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 @@ -154,8 +145,8 @@ char paramName[MAX_NAME_SIZE]; } if (getHighestTemplateVersion() != TAG(0,0,0,0)) { - if (DataLint::isEnabled()) - DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); + + m_versionOk = false; } diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedGroupObjectTemplate.h b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedGroupObjectTemplate.h index a114b920..97298566 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedGroupObjectTemplate.h +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedGroupObjectTemplate.h @@ -45,11 +45,6 @@ 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 index e57241db..6a07324b 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedGuildObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedGuildObjectTemplate.cpp @@ -103,15 +103,6 @@ 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 @@ -154,8 +145,8 @@ char paramName[MAX_NAME_SIZE]; } if (getHighestTemplateVersion() != TAG(0,0,0,0)) { - if (DataLint::isEnabled()) - DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); + + m_versionOk = false; } diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedGuildObjectTemplate.h b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedGuildObjectTemplate.h index 43a7c2d3..b69a4dcc 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedGuildObjectTemplate.h +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedGuildObjectTemplate.h @@ -45,11 +45,6 @@ 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 index 5e66bbf1..64db45c4 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedInstallationObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedInstallationObjectTemplate.cpp @@ -103,15 +103,6 @@ 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 @@ -154,8 +145,8 @@ char paramName[MAX_NAME_SIZE]; } if (getHighestTemplateVersion() != TAG(0,0,0,0)) { - if (DataLint::isEnabled()) - DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); + + m_versionOk = false; } diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedInstallationObjectTemplate.h b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedInstallationObjectTemplate.h index 36e3aabe..528b98b5 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedInstallationObjectTemplate.h +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedInstallationObjectTemplate.h @@ -45,11 +45,6 @@ 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 index 4934dd40..ef0e1df9 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedIntangibleObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedIntangibleObjectTemplate.cpp @@ -103,15 +103,6 @@ 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 @@ -154,8 +145,8 @@ char paramName[MAX_NAME_SIZE]; } if (getHighestTemplateVersion() != TAG(0,0,0,0)) { - if (DataLint::isEnabled()) - DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); + + m_versionOk = false; } diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedIntangibleObjectTemplate.h b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedIntangibleObjectTemplate.h index bf0ae9d3..4d7d15e7 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedIntangibleObjectTemplate.h +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedIntangibleObjectTemplate.h @@ -45,11 +45,6 @@ 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 index 3c8ad274..9ee18be7 100755 --- 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" @@ -104,15 +104,6 @@ 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 @@ -155,8 +146,8 @@ char paramName[MAX_NAME_SIZE]; } if (getHighestTemplateVersion() != TAG(0,0,0,0)) { - if (DataLint::isEnabled()) - DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); + + m_versionOk = false; } diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedJediManagerObjectTemplate.h b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedJediManagerObjectTemplate.h index b2be5b14..91b5d4ef 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedJediManagerObjectTemplate.h +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedJediManagerObjectTemplate.h @@ -45,11 +45,6 @@ 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 index de9c8b4d..40779694 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedManufactureSchematicObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedManufactureSchematicObjectTemplate.cpp @@ -103,15 +103,6 @@ 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 @@ -154,8 +145,8 @@ char paramName[MAX_NAME_SIZE]; } if (getHighestTemplateVersion() != TAG(0,0,0,0)) { - if (DataLint::isEnabled()) - DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); + + m_versionOk = false; } diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedManufactureSchematicObjectTemplate.h b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedManufactureSchematicObjectTemplate.h index 71a6c26e..fc80e58d 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedManufactureSchematicObjectTemplate.h +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedManufactureSchematicObjectTemplate.h @@ -45,11 +45,6 @@ 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/SharedMissionObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedMissionObjectTemplate.cpp index 10eaba74..67ef6517 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedMissionObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedMissionObjectTemplate.cpp @@ -103,15 +103,6 @@ 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 @@ -154,8 +145,8 @@ char paramName[MAX_NAME_SIZE]; } if (getHighestTemplateVersion() != TAG(0,0,0,0)) { - if (DataLint::isEnabled()) - DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); + + m_versionOk = false; } diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedMissionObjectTemplate.h b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedMissionObjectTemplate.h index 7830dc89..554ebadc 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedMissionObjectTemplate.h +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedMissionObjectTemplate.h @@ -45,11 +45,6 @@ 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 index dc0fe57a..f23cc1e5 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedObjectTemplate.cpp @@ -266,22 +266,14 @@ void SharedObjectTemplate::postLoad(void) } // SharedObjectTemplate::postLoad //@BEGIN TFD -const StringId SharedObjectTemplate::getObjectName(bool testData) const +const StringId SharedObjectTemplate::getObjectName() 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()) @@ -299,31 +291,18 @@ UNREF(testData); } const StringId value = m_objectName.getValue(); -#ifdef _DEBUG - if (testData && base != nullptr) - { - } -#endif return value; } // SharedObjectTemplate::getObjectName -const StringId SharedObjectTemplate::getDetailedDescription(bool testData) const +const StringId SharedObjectTemplate::getDetailedDescription() 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()) @@ -341,31 +320,18 @@ UNREF(testData); } const StringId value = m_detailedDescription.getValue(); -#ifdef _DEBUG - if (testData && base != nullptr) - { - } -#endif return value; } // SharedObjectTemplate::getDetailedDescription -const StringId SharedObjectTemplate::getLookAtText(bool testData) const +const StringId SharedObjectTemplate::getLookAtText() 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()) @@ -383,31 +349,18 @@ UNREF(testData); } const StringId value = m_lookAtText.getValue(); -#ifdef _DEBUG - if (testData && base != nullptr) - { - } -#endif return value; } // SharedObjectTemplate::getLookAtText -bool SharedObjectTemplate::getSnapToTerrain(bool testData) const +bool SharedObjectTemplate::getSnapToTerrain() 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()) @@ -425,31 +378,18 @@ UNREF(testData); } bool value = m_snapToTerrain.getValue(); -#ifdef _DEBUG - if (testData && base != nullptr) - { - } -#endif return value; } // SharedObjectTemplate::getSnapToTerrain -SharedObjectTemplate::ContainerType SharedObjectTemplate::getContainerType(bool testData) const +SharedObjectTemplate::ContainerType SharedObjectTemplate::getContainerType() 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()) @@ -467,31 +407,18 @@ UNREF(testData); } ContainerType value = static_cast(m_containerType.getValue()); -#ifdef _DEBUG - if (testData && base != nullptr) - { - } -#endif return value; } // SharedObjectTemplate::getContainerType -int SharedObjectTemplate::getContainerVolumeLimit(bool testData) const +int SharedObjectTemplate::getContainerVolumeLimit() 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()) @@ -531,31 +458,18 @@ UNREF(testData); 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(bool testData) const +int SharedObjectTemplate::getContainerVolumeLimitMin() 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()) @@ -595,31 +509,18 @@ UNREF(testData); 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(bool testData) const +int SharedObjectTemplate::getContainerVolumeLimitMax() 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()) @@ -659,31 +560,18 @@ UNREF(testData); 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(bool testData) const +const std::string & SharedObjectTemplate::getTintPalette() 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()) @@ -701,31 +589,18 @@ UNREF(testData); } const std::string & value = m_tintPalette.getValue(); -#ifdef _DEBUG - if (testData && base != nullptr) - { - } -#endif return value; } // SharedObjectTemplate::getTintPalette -const std::string & SharedObjectTemplate::getSlotDescriptorFilename(bool testData) const +const std::string & SharedObjectTemplate::getSlotDescriptorFilename() 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()) @@ -743,31 +618,18 @@ UNREF(testData); } const std::string & value = m_slotDescriptorFilename.getValue(); -#ifdef _DEBUG - if (testData && base != nullptr) - { - } -#endif return value; } // SharedObjectTemplate::getSlotDescriptorFilename -const std::string & SharedObjectTemplate::getArrangementDescriptorFilename(bool testData) const +const std::string & SharedObjectTemplate::getArrangementDescriptorFilename() 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()) @@ -785,31 +647,18 @@ UNREF(testData); } const std::string & value = m_arrangementDescriptorFilename.getValue(); -#ifdef _DEBUG - if (testData && base != nullptr) - { - } -#endif return value; } // SharedObjectTemplate::getArrangementDescriptorFilename -const std::string & SharedObjectTemplate::getAppearanceFilename(bool testData) const +const std::string & SharedObjectTemplate::getAppearanceFilename() 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()) @@ -827,31 +676,18 @@ UNREF(testData); } const std::string & value = m_appearanceFilename.getValue(); -#ifdef _DEBUG - if (testData && base != nullptr) - { - } -#endif return value; } // SharedObjectTemplate::getAppearanceFilename -const std::string & SharedObjectTemplate::getPortalLayoutFilename(bool testData) const +const std::string & SharedObjectTemplate::getPortalLayoutFilename() 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()) @@ -869,31 +705,18 @@ UNREF(testData); } const std::string & value = m_portalLayoutFilename.getValue(); -#ifdef _DEBUG - if (testData && base != nullptr) - { - } -#endif return value; } // SharedObjectTemplate::getPortalLayoutFilename -const std::string & SharedObjectTemplate::getClientDataFile(bool testData) const +const std::string & SharedObjectTemplate::getClientDataFile() 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()) @@ -911,31 +734,18 @@ UNREF(testData); } const std::string & value = m_clientDataFile.getValue(); -#ifdef _DEBUG - if (testData && base != nullptr) - { - } -#endif return value; } // SharedObjectTemplate::getClientDataFile -float SharedObjectTemplate::getScale(bool testData) const +float SharedObjectTemplate::getScale() 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()) @@ -975,31 +785,18 @@ UNREF(testData); 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(bool testData) const +float SharedObjectTemplate::getScaleMin() 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()) @@ -1039,31 +836,18 @@ UNREF(testData); 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(bool testData) const +float SharedObjectTemplate::getScaleMax() 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()) @@ -1103,31 +887,18 @@ UNREF(testData); 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(bool testData) const +SharedObjectTemplate::GameObjectType SharedObjectTemplate::getGameObjectType() 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()) @@ -1145,31 +916,18 @@ UNREF(testData); } GameObjectType value = static_cast(m_gameObjectType.getValue()); -#ifdef _DEBUG - if (testData && base != nullptr) - { - } -#endif return value; } // SharedObjectTemplate::getGameObjectType -bool SharedObjectTemplate::getSendToClient(bool testData) const +bool SharedObjectTemplate::getSendToClient() 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()) @@ -1187,31 +945,18 @@ UNREF(testData); } bool value = m_sendToClient.getValue(); -#ifdef _DEBUG - if (testData && base != nullptr) - { - } -#endif return value; } // SharedObjectTemplate::getSendToClient -float SharedObjectTemplate::getScaleThresholdBeforeExtentTest(bool testData) const +float SharedObjectTemplate::getScaleThresholdBeforeExtentTest() 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()) @@ -1251,31 +996,18 @@ UNREF(testData); 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(bool testData) const +float SharedObjectTemplate::getScaleThresholdBeforeExtentTestMin() 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()) @@ -1315,31 +1047,18 @@ UNREF(testData); 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(bool testData) const +float SharedObjectTemplate::getScaleThresholdBeforeExtentTestMax() 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()) @@ -1379,31 +1098,18 @@ UNREF(testData); 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(bool testData) const +float SharedObjectTemplate::getClearFloraRadius() 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()) @@ -1443,31 +1149,18 @@ UNREF(testData); 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(bool testData) const +float SharedObjectTemplate::getClearFloraRadiusMin() 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()) @@ -1507,31 +1200,18 @@ UNREF(testData); 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(bool testData) const +float SharedObjectTemplate::getClearFloraRadiusMax() 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()) @@ -1571,31 +1251,18 @@ UNREF(testData); 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(bool testData) const +SharedObjectTemplate::SurfaceType SharedObjectTemplate::getSurfaceType() 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()) @@ -1613,31 +1280,18 @@ UNREF(testData); } SurfaceType value = static_cast(m_surfaceType.getValue()); -#ifdef _DEBUG - if (testData && base != nullptr) - { - } -#endif return value; } // SharedObjectTemplate::getSurfaceType -float SharedObjectTemplate::getNoBuildRadius(bool testData) const +float SharedObjectTemplate::getNoBuildRadius() 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()) @@ -1677,31 +1331,18 @@ UNREF(testData); 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(bool testData) const +float SharedObjectTemplate::getNoBuildRadiusMin() 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()) @@ -1741,31 +1382,18 @@ UNREF(testData); 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(bool testData) const +float SharedObjectTemplate::getNoBuildRadiusMax() 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()) @@ -1805,31 +1433,18 @@ UNREF(testData); 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(bool testData) const +bool SharedObjectTemplate::getOnlyVisibleInTools() 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()) @@ -1847,31 +1462,18 @@ UNREF(testData); } bool value = m_onlyVisibleInTools.getValue(); -#ifdef _DEBUG - if (testData && base != nullptr) - { - } -#endif return value; } // SharedObjectTemplate::getOnlyVisibleInTools -float SharedObjectTemplate::getLocationReservationRadius(bool testData) const +float SharedObjectTemplate::getLocationReservationRadius() 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()) @@ -1911,31 +1513,18 @@ UNREF(testData); 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(bool testData) const +float SharedObjectTemplate::getLocationReservationRadiusMin() 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()) @@ -1975,31 +1564,18 @@ UNREF(testData); 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(bool testData) const +float SharedObjectTemplate::getLocationReservationRadiusMax() 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()) @@ -2039,31 +1615,18 @@ UNREF(testData); 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(bool testData) const +bool SharedObjectTemplate::getForceNoCollision() 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()) @@ -2081,51 +1644,10 @@ UNREF(testData); } 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 @@ -2167,8 +1689,8 @@ char paramName[MAX_NAME_SIZE]; } if (getHighestTemplateVersion() != TAG(0,0,1,0)) { - if (DataLint::isEnabled()) - DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); + + m_versionOk = false; } diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedObjectTemplate.h b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedObjectTemplate.h index 5fc7686f..6eecadac 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedObjectTemplate.h +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedObjectTemplate.h @@ -339,46 +339,41 @@ public: }; public: - 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; + 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; -#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 index 7d020a59..4a744f52 100755 --- 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" @@ -104,15 +104,6 @@ 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 @@ -155,8 +146,8 @@ char paramName[MAX_NAME_SIZE]; } if (getHighestTemplateVersion() != TAG(0,0,0,0)) { - if (DataLint::isEnabled()) - DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); + + m_versionOk = false; } diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedPlayerObjectTemplate.h b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedPlayerObjectTemplate.h index 5b64f2f8..187e83b4 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedPlayerObjectTemplate.h +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedPlayerObjectTemplate.h @@ -45,11 +45,6 @@ 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 index 26380963..a68fab70 100755 --- 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" @@ -104,15 +104,6 @@ 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 @@ -155,8 +146,8 @@ char paramName[MAX_NAME_SIZE]; } if (getHighestTemplateVersion() != TAG(0,0,0,0)) { - if (DataLint::isEnabled()) - DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); + + m_versionOk = false; } diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedPlayerQuestObjectTemplate.h b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedPlayerQuestObjectTemplate.h index e5c9260c..c6b45a38 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedPlayerQuestObjectTemplate.h +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedPlayerQuestObjectTemplate.h @@ -45,11 +45,6 @@ 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 index dbb0635d..224c3c26 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedResourceContainerObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedResourceContainerObjectTemplate.cpp @@ -103,15 +103,6 @@ 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 @@ -154,8 +145,8 @@ char paramName[MAX_NAME_SIZE]; } if (getHighestTemplateVersion() != TAG(0,0,0,0)) { - if (DataLint::isEnabled()) - DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); + + m_versionOk = false; } diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedResourceContainerObjectTemplate.h b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedResourceContainerObjectTemplate.h index 86067879..19f45dd7 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedResourceContainerObjectTemplate.h +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedResourceContainerObjectTemplate.h @@ -45,11 +45,6 @@ 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 index e374302c..c4ef1930 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedShipObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedShipObjectTemplate.cpp @@ -13,7 +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" @@ -147,22 +147,14 @@ void SharedShipObjectTemplate::createCustomizationDataPropertyAsNeeded(Object &o } //@BEGIN TFD -const std::string & SharedShipObjectTemplate::getCockpitFilename(bool testData) const +const std::string & SharedShipObjectTemplate::getCockpitFilename() 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()) @@ -180,31 +172,18 @@ UNREF(testData); } const std::string & value = m_cockpitFilename.getValue(); -#ifdef _DEBUG - if (testData && base != nullptr) - { - } -#endif return value; } // SharedShipObjectTemplate::getCockpitFilename -bool SharedShipObjectTemplate::getHasWings(bool testData) const +bool SharedShipObjectTemplate::getHasWings() 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()) @@ -222,31 +201,18 @@ UNREF(testData); } bool value = m_hasWings.getValue(); -#ifdef _DEBUG - if (testData && base != nullptr) - { - } -#endif return value; } // SharedShipObjectTemplate::getHasWings -bool SharedShipObjectTemplate::getPlayerControlled(bool testData) const +bool SharedShipObjectTemplate::getPlayerControlled() 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()) @@ -264,31 +230,18 @@ UNREF(testData); } bool value = m_playerControlled.getValue(); -#ifdef _DEBUG - if (testData && base != nullptr) - { - } -#endif return value; } // SharedShipObjectTemplate::getPlayerControlled -const std::string & SharedShipObjectTemplate::getInteriorLayoutFileName(bool testData) const +const std::string & SharedShipObjectTemplate::getInteriorLayoutFileName() 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()) @@ -306,28 +259,10 @@ UNREF(testData); } 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 @@ -370,8 +305,8 @@ char paramName[MAX_NAME_SIZE]; } if (getHighestTemplateVersion() != TAG(0,0,0,4)) { - if (DataLint::isEnabled()) - DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); + + m_versionOk = false; } diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedShipObjectTemplate.h b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedShipObjectTemplate.h index abbdb08e..d5621428 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedShipObjectTemplate.h +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedShipObjectTemplate.h @@ -45,16 +45,11 @@ public: //@BEGIN TFD public: - 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; + const std::string & getCockpitFilename() const; + bool getHasWings() const; + bool getPlayerControlled() const; + const std::string & getInteriorLayoutFileName() 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 index 3de71cf2..d1b4ebea 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedStaticObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedStaticObjectTemplate.cpp @@ -103,15 +103,6 @@ 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 @@ -154,8 +145,8 @@ char paramName[MAX_NAME_SIZE]; } if (getHighestTemplateVersion() != TAG(0,0,0,0)) { - if (DataLint::isEnabled()) - DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); + + m_versionOk = false; } diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedStaticObjectTemplate.h b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedStaticObjectTemplate.h index cc22dc7e..6f76144f 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedStaticObjectTemplate.h +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedStaticObjectTemplate.h @@ -45,11 +45,6 @@ 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 index 95742f60..4adbfc5b 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTangibleObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTangibleObjectTemplate.cpp @@ -262,16 +262,6 @@ void SharedTangibleObjectTemplate::createCustomizationDataPropertyAsNeeded(Objec 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(); @@ -879,22 +869,14 @@ size_t SharedTangibleObjectTemplate::getSocketDestinationsCount(void) const return count; } // SharedTangibleObjectTemplate::getSocketDestinationsCount -const std::string & SharedTangibleObjectTemplate::getStructureFootprintFileName(bool testData) const +const std::string & SharedTangibleObjectTemplate::getStructureFootprintFileName() 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()) @@ -912,31 +894,18 @@ UNREF(testData); } const std::string & value = m_structureFootprintFileName.getValue(); -#ifdef _DEBUG - if (testData && base != nullptr) - { - } -#endif return value; } // SharedTangibleObjectTemplate::getStructureFootprintFileName -bool SharedTangibleObjectTemplate::getUseStructureFootprintOutline(bool testData) const +bool SharedTangibleObjectTemplate::getUseStructureFootprintOutline() 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()) @@ -954,31 +923,18 @@ UNREF(testData); } bool value = m_useStructureFootprintOutline.getValue(); -#ifdef _DEBUG - if (testData && base != nullptr) - { - } -#endif return value; } // SharedTangibleObjectTemplate::getUseStructureFootprintOutline -bool SharedTangibleObjectTemplate::getTargetable(bool testData) const +bool SharedTangibleObjectTemplate::getTargetable() 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()) @@ -996,11 +952,6 @@ UNREF(testData); } bool value = m_targetable.getValue(); -#ifdef _DEBUG - if (testData && base != nullptr) - { - } -#endif return value; } // SharedTangibleObjectTemplate::getTargetable @@ -1217,22 +1168,14 @@ size_t SharedTangibleObjectTemplate::getCustomizationVariableMappingCount(void) return count; } // SharedTangibleObjectTemplate::getCustomizationVariableMappingCount -SharedTangibleObjectTemplate::ClientVisabilityFlags SharedTangibleObjectTemplate::getClientVisabilityFlag(bool testData) const +SharedTangibleObjectTemplate::ClientVisabilityFlags SharedTangibleObjectTemplate::getClientVisabilityFlag() 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()) @@ -1250,28 +1193,10 @@ UNREF(testData); } 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 @@ -1314,8 +1239,8 @@ char paramName[MAX_NAME_SIZE]; } if (getHighestTemplateVersion() != TAG(0,0,1,0)) { - if (DataLint::isEnabled()) - DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); + + m_versionOk = false; } @@ -1506,22 +1431,14 @@ Tag SharedTangibleObjectTemplate::_ConstStringCustomizationVariable::getId(void) return _ConstStringCustomizationVariable_tag; } // SharedTangibleObjectTemplate::_ConstStringCustomizationVariable::getId -const std::string & SharedTangibleObjectTemplate::_ConstStringCustomizationVariable::getVariableName(bool versionOk, bool testData) const +const std::string & SharedTangibleObjectTemplate::_ConstStringCustomizationVariable::getVariableName(bool versionOk, ) 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()) @@ -1539,31 +1456,18 @@ UNREF(testData); } 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, bool testData) const +const std::string & SharedTangibleObjectTemplate::_ConstStringCustomizationVariable::getConstValue(bool versionOk, ) 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()) @@ -1581,25 +1485,10 @@ UNREF(testData); } 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 @@ -1679,22 +1568,14 @@ Tag SharedTangibleObjectTemplate::_CustomizationVariableMapping::getId(void) con return _CustomizationVariableMapping_tag; } // SharedTangibleObjectTemplate::_CustomizationVariableMapping::getId -const std::string & SharedTangibleObjectTemplate::_CustomizationVariableMapping::getSourceVariable(bool versionOk, bool testData) const +const std::string & SharedTangibleObjectTemplate::_CustomizationVariableMapping::getSourceVariable(bool versionOk, ) 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()) @@ -1712,31 +1593,18 @@ UNREF(testData); } 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, bool testData) const +const std::string & SharedTangibleObjectTemplate::_CustomizationVariableMapping::getDependentVariable(bool versionOk, ) 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()) @@ -1754,25 +1622,10 @@ UNREF(testData); } 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 @@ -1852,22 +1705,14 @@ Tag SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable::getId(void return _PaletteColorCustomizationVariable_tag; } // SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable::getId -const std::string & SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable::getVariableName(bool versionOk, bool testData) const +const std::string & SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable::getVariableName(bool versionOk, ) 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()) @@ -1885,31 +1730,18 @@ UNREF(testData); } 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, bool testData) const +const std::string & SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable::getPalettePathName(bool versionOk, ) 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()) @@ -1927,31 +1759,18 @@ UNREF(testData); } 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, bool testData) const +int SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable::getDefaultPaletteIndex(bool versionOk, ) 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()) @@ -1991,31 +1810,18 @@ UNREF(testData); 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, bool testData) const +int SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable::getDefaultPaletteIndexMin(bool versionOk, ) 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()) @@ -2055,31 +1861,18 @@ UNREF(testData); 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, bool testData) const +int SharedTangibleObjectTemplate::_PaletteColorCustomizationVariable::getDefaultPaletteIndexMax(bool versionOk, ) 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()) @@ -2119,27 +1912,10 @@ UNREF(testData); 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 @@ -2221,22 +1997,14 @@ Tag SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::getId(void) c return _RangedIntCustomizationVariable_tag; } // SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::getId -const std::string & SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::getVariableName(bool versionOk, bool testData) const +const std::string & SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::getVariableName(bool versionOk, ) 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()) @@ -2254,31 +2022,18 @@ UNREF(testData); } 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, bool testData) const +int SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::getMinValueInclusive(bool versionOk, ) 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()) @@ -2318,31 +2073,18 @@ UNREF(testData); 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, bool testData) const +int SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::getMinValueInclusiveMin(bool versionOk, ) 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()) @@ -2382,31 +2124,18 @@ UNREF(testData); 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, bool testData) const +int SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::getMinValueInclusiveMax(bool versionOk, ) 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()) @@ -2446,31 +2175,18 @@ UNREF(testData); 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, bool testData) const +int SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::getDefaultValue(bool versionOk, ) 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()) @@ -2510,31 +2226,18 @@ UNREF(testData); 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, bool testData) const +int SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::getDefaultValueMin(bool versionOk, ) 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()) @@ -2574,31 +2277,18 @@ UNREF(testData); 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, bool testData) const +int SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::getDefaultValueMax(bool versionOk, ) 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()) @@ -2638,31 +2328,18 @@ UNREF(testData); 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, bool testData) const +int SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::getMaxValueExclusive(bool versionOk, ) 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()) @@ -2702,31 +2379,18 @@ UNREF(testData); 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, bool testData) const +int SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::getMaxValueExclusiveMin(bool versionOk, ) 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()) @@ -2766,31 +2430,18 @@ UNREF(testData); 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, bool testData) const +int SharedTangibleObjectTemplate::_RangedIntCustomizationVariable::getMaxValueExclusiveMax(bool versionOk, ) 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()) @@ -2830,30 +2481,10 @@ UNREF(testData); 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 diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTangibleObjectTemplate.h b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTangibleObjectTemplate.h index 7cd54f53..a90413ce 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTangibleObjectTemplate.h +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTangibleObjectTemplate.h @@ -97,22 +97,17 @@ protected: virtual Tag getId(void) const; public: - 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; + 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; -#ifdef _DEBUG -public: - // special code used by datalint - virtual void testValues(void) const; -#endif protected: virtual void load(Iff &file); @@ -147,17 +142,12 @@ private: virtual Tag getId(void) const; public: - 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; + 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; -#ifdef _DEBUG -public: - // special code used by datalint - virtual void testValues(void) const; -#endif protected: virtual void load(Iff &file); @@ -191,14 +181,9 @@ private: virtual Tag getId(void) const; public: - const std::string & getVariableName(bool versionOk, bool testData = false) const; - const std::string & getConstValue(bool versionOk, bool testData = false) const; + const std::string & getVariableName(bool versionOk) const; + const std::string & getConstValue(bool versionOk) const; -#ifdef _DEBUG -public: - // special code used by datalint - virtual void testValues(void) const; -#endif protected: virtual void load(Iff &file); @@ -231,14 +216,9 @@ private: virtual Tag getId(void) const; public: - const std::string & getSourceVariable(bool versionOk, bool testData = false) const; - const std::string & getDependentVariable(bool versionOk, bool testData = false) const; + const std::string & getSourceVariable(bool versionOk) const; + const std::string & getDependentVariable(bool versionOk) const; -#ifdef _DEBUG -public: - // special code used by datalint - virtual void testValues(void) const; -#endif protected: virtual void load(Iff &file); @@ -270,22 +250,17 @@ public: size_t getConstStringCustomizationVariablesCount(void) const; GameObjectType getSocketDestinations(int index) const; size_t getSocketDestinationsCount(void) const; - const std::string & getStructureFootprintFileName(bool testData = false) const; - bool getUseStructureFootprintOutline(bool testData = false) const; - bool getTargetable(bool testData = false) const; + const std::string & getStructureFootprintFileName() const; + bool getUseStructureFootprintOutline() const; + bool getTargetable() 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(bool testData = false) const; + ClientVisabilityFlags getClientVisabilityFlag() 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 index b518a9f7..b0724d3a 100755 --- 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" @@ -103,22 +103,14 @@ Tag SharedTerrainSurfaceObjectTemplate::getHighestTemplateVersion(void) const } // SharedTerrainSurfaceObjectTemplate::getHighestTemplateVersion //@BEGIN TFD -float SharedTerrainSurfaceObjectTemplate::getCover(bool testData) const +float SharedTerrainSurfaceObjectTemplate::getCover() 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()) @@ -158,33 +150,18 @@ UNREF(testData); else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } -#ifdef _DEBUG - if (testData && base != nullptr) - { - if (testDataValue == value) - DEBUG_WARNING(true, ("Template %s, parameter cover is returning same value as base template.", DataResource::getName())); - } -#endif return value; } // SharedTerrainSurfaceObjectTemplate::getCover -float SharedTerrainSurfaceObjectTemplate::getCoverMin(bool testData) const +float SharedTerrainSurfaceObjectTemplate::getCoverMin() 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()) @@ -224,33 +201,18 @@ UNREF(testData); else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } -#ifdef _DEBUG - if (testData && base != nullptr) - { - if (testDataValue == value) - DEBUG_WARNING(true, ("Template %s, parameter cover is returning same value as base template.", DataResource::getName())); - } -#endif return value; } // SharedTerrainSurfaceObjectTemplate::getCoverMin -float SharedTerrainSurfaceObjectTemplate::getCoverMax(bool testData) const +float SharedTerrainSurfaceObjectTemplate::getCoverMax() 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()) @@ -290,33 +252,18 @@ UNREF(testData); else if (delta == '_') value = baseValue - static_cast(baseValue * (value / 100.0f)); } -#ifdef _DEBUG - if (testData && base != nullptr) - { - if (testDataValue == value) - DEBUG_WARNING(true, ("Template %s, parameter cover is returning same value as base template.", DataResource::getName())); - } -#endif return value; } // SharedTerrainSurfaceObjectTemplate::getCoverMax -const std::string & SharedTerrainSurfaceObjectTemplate::getSurfaceType(bool testData) const +const std::string & SharedTerrainSurfaceObjectTemplate::getSurfaceType() 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()) @@ -334,28 +281,10 @@ UNREF(testData); } const std::string & value = m_surfaceType.getValue(); -#ifdef _DEBUG - if (testData && base != nullptr) - { - if (testDataValue == value) - DEBUG_WARNING(true, ("Template %s, parameter surfaceType is returning same value as base template.", DataResource::getName())); - } -#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 @@ -397,8 +326,8 @@ char paramName[MAX_NAME_SIZE]; } if (getHighestTemplateVersion() != TAG(0,0,0,0)) { - if (DataLint::isEnabled()) - DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); + + m_versionOk = false; } diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTerrainSurfaceObjectTemplate.h b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTerrainSurfaceObjectTemplate.h index bf5265e7..4d2feaf9 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTerrainSurfaceObjectTemplate.h +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTerrainSurfaceObjectTemplate.h @@ -44,16 +44,11 @@ public: //@BEGIN TFD public: - 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; + float getCover() const; + float getCoverMin() const; + float getCoverMax() const; + const std::string & getSurfaceType() 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/SharedUniverseObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedUniverseObjectTemplate.cpp index c6e9b692..bb5fbff4 100755 --- 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" @@ -104,15 +104,6 @@ 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 @@ -155,8 +146,8 @@ char paramName[MAX_NAME_SIZE]; } if (getHighestTemplateVersion() != TAG(0,0,0,0)) { - if (DataLint::isEnabled()) - DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); + + m_versionOk = false; } diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedUniverseObjectTemplate.h b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedUniverseObjectTemplate.h index 1968e4eb..369199b4 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedUniverseObjectTemplate.h +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedUniverseObjectTemplate.h @@ -45,11 +45,6 @@ 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 index 7467cf59..b48e6d42 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedVehicleObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedVehicleObjectTemplate.cpp @@ -250,22 +250,14 @@ float SharedVehicleObjectTemplate::getSpeedMax(MovementTypes index) const return value; } // SharedVehicleObjectTemplate::getSpeedMax -float SharedVehicleObjectTemplate::getSlopeAversion(bool testData) const +float SharedVehicleObjectTemplate::getSlopeAversion() 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()) @@ -305,31 +297,18 @@ UNREF(testData); 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(bool testData) const +float SharedVehicleObjectTemplate::getSlopeAversionMin() 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()) @@ -369,31 +348,18 @@ UNREF(testData); 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(bool testData) const +float SharedVehicleObjectTemplate::getSlopeAversionMax() 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()) @@ -433,31 +399,18 @@ UNREF(testData); 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(bool testData) const +float SharedVehicleObjectTemplate::getHoverValue() 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()) @@ -497,31 +450,18 @@ UNREF(testData); 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(bool testData) const +float SharedVehicleObjectTemplate::getHoverValueMin() 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()) @@ -561,31 +501,18 @@ UNREF(testData); 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(bool testData) const +float SharedVehicleObjectTemplate::getHoverValueMax() 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()) @@ -625,31 +552,18 @@ UNREF(testData); 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(bool testData) const +float SharedVehicleObjectTemplate::getTurnRate() 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()) @@ -689,31 +603,18 @@ UNREF(testData); 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(bool testData) const +float SharedVehicleObjectTemplate::getTurnRateMin() 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()) @@ -753,31 +654,18 @@ UNREF(testData); 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(bool testData) const +float SharedVehicleObjectTemplate::getTurnRateMax() 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()) @@ -817,31 +705,18 @@ UNREF(testData); 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(bool testData) const +float SharedVehicleObjectTemplate::getMaxVelocity() 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()) @@ -881,31 +756,18 @@ UNREF(testData); 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(bool testData) const +float SharedVehicleObjectTemplate::getMaxVelocityMin() 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()) @@ -945,31 +807,18 @@ UNREF(testData); 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(bool testData) const +float SharedVehicleObjectTemplate::getMaxVelocityMax() 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()) @@ -1009,31 +858,18 @@ UNREF(testData); 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(bool testData) const +float SharedVehicleObjectTemplate::getAcceleration() 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()) @@ -1073,31 +909,18 @@ UNREF(testData); 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(bool testData) const +float SharedVehicleObjectTemplate::getAccelerationMin() 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()) @@ -1137,31 +960,18 @@ UNREF(testData); 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(bool testData) const +float SharedVehicleObjectTemplate::getAccelerationMax() 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()) @@ -1201,31 +1011,18 @@ UNREF(testData); 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(bool testData) const +float SharedVehicleObjectTemplate::getBraking() 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()) @@ -1265,31 +1062,18 @@ UNREF(testData); 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(bool testData) const +float SharedVehicleObjectTemplate::getBrakingMin() 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()) @@ -1329,31 +1113,18 @@ UNREF(testData); 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(bool testData) const +float SharedVehicleObjectTemplate::getBrakingMax() 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()) @@ -1393,36 +1164,10 @@ UNREF(testData); 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 @@ -1465,8 +1210,8 @@ char paramName[MAX_NAME_SIZE]; } if (getHighestTemplateVersion() != TAG(0,0,0,0)) { - if (DataLint::isEnabled()) - DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); + + m_versionOk = false; } diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedVehicleObjectTemplate.h b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedVehicleObjectTemplate.h index 4da4d4c1..739aec05 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedVehicleObjectTemplate.h +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedVehicleObjectTemplate.h @@ -58,30 +58,25 @@ public: float getSpeed(MovementTypes index) const; float getSpeedMin(MovementTypes index) const; float getSpeedMax(MovementTypes index) 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; + 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; -#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 index 2d82cd46..a5f730a2 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedWaypointObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedWaypointObjectTemplate.cpp @@ -103,15 +103,6 @@ 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 @@ -154,8 +145,8 @@ char paramName[MAX_NAME_SIZE]; } if (getHighestTemplateVersion() != TAG(0,0,0,0)) { - if (DataLint::isEnabled()) - DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); + + m_versionOk = false; } diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedWaypointObjectTemplate.h b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedWaypointObjectTemplate.h index 4fb31a6b..7bb0e2ec 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedWaypointObjectTemplate.h +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedWaypointObjectTemplate.h @@ -45,11 +45,6 @@ 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 index 193d4ac7..4b8d05b7 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedWeaponObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedWeaponObjectTemplate.cpp @@ -103,22 +103,14 @@ Tag SharedWeaponObjectTemplate::getHighestTemplateVersion(void) const } // SharedWeaponObjectTemplate::getHighestTemplateVersion //@BEGIN TFD -const std::string & SharedWeaponObjectTemplate::getWeaponEffect(bool testData) const +const std::string & SharedWeaponObjectTemplate::getWeaponEffect() 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()) @@ -136,31 +128,18 @@ UNREF(testData); } const std::string & value = m_weaponEffect.getValue(); -#ifdef _DEBUG - if (testData && base != nullptr) - { - } -#endif return value; } // SharedWeaponObjectTemplate::getWeaponEffect -int SharedWeaponObjectTemplate::getWeaponEffectIndex(bool testData) const +int SharedWeaponObjectTemplate::getWeaponEffectIndex() 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()) @@ -200,31 +179,18 @@ UNREF(testData); 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(bool testData) const +int SharedWeaponObjectTemplate::getWeaponEffectIndexMin() 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()) @@ -264,31 +230,18 @@ UNREF(testData); 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(bool testData) const +int SharedWeaponObjectTemplate::getWeaponEffectIndexMax() 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()) @@ -328,31 +281,18 @@ UNREF(testData); 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(bool testData) const +SharedWeaponObjectTemplate::AttackType SharedWeaponObjectTemplate::getAttackType() 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()) @@ -370,28 +310,10 @@ UNREF(testData); } 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 @@ -434,8 +356,8 @@ char paramName[MAX_NAME_SIZE]; } if (getHighestTemplateVersion() != TAG(0,0,0,4)) { - if (DataLint::isEnabled()) - DEBUG_WARNING(true, ("template %s version out of date", file.getFileName())); + + m_versionOk = false; } diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedWeaponObjectTemplate.h b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedWeaponObjectTemplate.h index ba4d771c..ddcf638c 100755 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedWeaponObjectTemplate.h +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedWeaponObjectTemplate.h @@ -54,17 +54,12 @@ public: }; public: - 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; + const std::string & getWeaponEffect() const; + int getWeaponEffectIndex() const; + int getWeaponEffectIndexMin() const; + int getWeaponEffectIndexMax() const; + AttackType getAttackType() const; -#ifdef _DEBUG -public: - // special code used by datalint - virtual void testValues(void) const; -#endif protected: virtual void load(Iff &file);