swg-source/src
1
0
Fork 0
mirror of https://github.com/SWG-Source/src.git synced 2026-10-05 22:12:52 -04:00
Code Issues Projects Releases Wiki Activity

cleanup all the "#if 1" macro blocks

Browse Source
This commit is contained in:
DarthArgus
2016-03-24 21:27:54 +00:00
parent 01cdf52bc0
commit cd997925eb
9 changed files with 5 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/shared/library/sharedGame/src/shared/core/PlayerCreationManager.cpp
-2
View File
@@ -121,7 +121,6 @@ namespace PlayerCreationManagerNamespace
for (; iff.enterForm (Tags::PTMP, true); ++ptmp_count)
{
#if 1
std::string playerTemplateStr;
if (iff.enterChunk (TAG_NAME, true))
{
@@ -148,7 +147,6 @@ namespace PlayerCreationManagerNamespace
}
eq.insert (std::make_pair (playerTemplateStr, v));
#endif
iff.exitForm (true);
}
engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTangibleObjectTemplate.cpp
-75
View File
@@ -236,7 +236,6 @@ const StructureFootprint* SharedTangibleObjectTemplate::getStructureFootprint ()
*/
void SharedTangibleObjectTemplate::createCustomizationDataPropertyAsNeeded(Object &object, bool /* forceCreation */) const
{
#if 1
//-- Properties cannot be added while an object is in the world. Some callers may be in the world,
// so temporarily remove the object from the world if necessary.
bool shouldBeInWorld = object.isInWorld();
@@ -266,80 +265,6 @@ void SharedTangibleObjectTemplate::createCustomizationDataPropertyAsNeeded(Objec
//-- release local reference to the CustomizationData instance
customizationData->release();
}
#else
// @todo -TRF- remove this code as soon as asset customization manager is working properly.
const size_t paletteColorCount = getPaletteColorCustomizationVariablesCount();
const size_t rangedIntCount = getRangedIntCustomizationVariablesCount();
//-- Return if caller isn't forcing customization data creation and no customization variables are declared for the ObjectTemplate.
const bool makeCustomizationData = forceCreation || (paletteColorCount > 0) || (rangedIntCount > 0);
if (!makeCustomizationData)
return;
//-- Properties cannot be added while an object is in the world. Some callers may be in the world,
// so temporarily remove the object from the world if necessary.
bool shouldBeInWorld = object.isInWorld();
if (shouldBeInWorld)
object.removeFromWorld();
//-- create the CustomizationDataProperty, add to Object property collection
CustomizationDataProperty *const cdProperty = new CustomizationDataProperty(object);
object.addProperty(*cdProperty);
//-- Put object back in world if it was originally there.
if (shouldBeInWorld)
object.addToWorld();
//-- fetch the CustomizationData instance
CustomizationData *const customizationData = cdProperty->fetchCustomizationData();
//-- create PaletteColorCustomizationVariable variables as specified
{
SharedTangibleObjectTemplate::PaletteColorCustomizationVariable variableData;
for (int i = 0; i < static_cast<int>(paletteColorCount); ++i)
{
//-- get the palette variable data
getPaletteColorCustomizationVariables(variableData, i);
//-- fetch the palette
const PaletteArgb *const palette = PaletteArgbList::fetch(TemporaryCrcString(variableData.palettePathName.c_str(), true));
if (!palette)
{
DEBUG_WARNING(true, ("failed to retrieve color palette [%s] for [%s], skipping variable [%s].\n", variableData.palettePathName.c_str(), getName (), variableData.variableName.c_str()));
continue;
}
//-- create the variable, add to CustomizationData
::PaletteColorCustomizationVariable * const palColorVar = new ::PaletteColorCustomizationVariable(palette, variableData.defaultPaletteIndex);
if (variableData.defaultPaletteIndex != palColorVar->getValue ())
DEBUG_WARNING (true, ("Error loading PaletteColorCustomizationVariable [%s] for [%s]", variableData.variableName.c_str(), getName ()));
customizationData->addVariableTakeOwnership(variableData.variableName, palColorVar);
//-- release local palette reference
palette->release();
}
}
//-- create BasicRangedIntCustomizationVariable variables as specified
{
SharedTangibleObjectTemplate::RangedIntCustomizationVariable variableData;
for (int i = 0; i < static_cast<int>(rangedIntCount); ++i)
{
//-- get the palette variable data
getRangedIntCustomizationVariables(variableData, i);
//-- create the variable, add to CustomizationData
customizationData->addVariableTakeOwnership(variableData.variableName, new ::BasicRangedIntCustomizationVariable(variableData.minValueInclusive, variableData.defaultValue, variableData.maxValueExclusive));
}
}
//-- release local reference to the CustomizationData instance
customizationData->release();
#endif
}
//@BEGIN TFD