swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-07-31 01:15:48 -04:00
Code Issues Projects Releases Wiki Activity

remove unnecessary null checks

Browse Source
This commit is contained in:
DarthArgus
2014-10-26 22:53:42 -07:00
parent eb2e7c78d8
commit 594b3a4254
56 changed files with 98 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/server/library/serverGame/src/shared/object/ManufactureSchematicObject.cpp
+27 -29
View File
@@ -298,38 +298,37 @@ void ManufactureSchematicObject::endBaselines()
ServerSynchronizedUi * ManufactureSchematicObject::createSynchronizedUi ()
{
ManufactureSchematicSynchronizedUi * sync = new ManufactureSchematicSynchronizedUi(*this);
if (sync)
{
// set up the sync ui for our slots
int i;
int count;
const DraftSchematicObject * draft = DraftSchematicObject::getSchematic(
m_draftSchematic.get());
NOT_NULL(draft);
DynamicVariableList::NestedList slots(getObjVars(),OBJVAR_SLOTS);
{
Crafting::IngredientSlot slotData;
count = slots.getCount();
for (i = 0; i < count; ++i)
{
if (getSlot(i, slotData, false))
{
sync->createNewSlot(slotData.name, slotData.complexity);
sync->setSlotType(slotData.name, slotData.ingredientType);
sync->setSlotOption(slotData.name, slotData.draftSlotOption);
sync->setSlotIndex(slotData.name, slotData.draftSlotIndex);
}
}
}
count = draft->getExperimentalAttributesCount();
// set up the sync ui for our slots
int i;
int count;
const DraftSchematicObject * draft = DraftSchematicObject::getSchematic(
m_draftSchematic.get());
NOT_NULL(draft);
DynamicVariableList::NestedList slots(getObjVars(),OBJVAR_SLOTS);
{
Crafting::IngredientSlot slotData;
count = slots.getCount();
for (i = 0; i < count; ++i)
{
sync->setAttribute(draft->getExperimentalAttribute(i), 0);
if (getSlot(i, slotData, false))
{
sync->createNewSlot(slotData.name, slotData.complexity);
sync->setSlotType(slotData.name, slotData.ingredientType);
sync->setSlotOption(slotData.name, slotData.draftSlotOption);
sync->setSlotIndex(slotData.name, slotData.draftSlotIndex);
}
}
sync->setReady();
}
count = draft->getExperimentalAttributesCount();
for (i = 0; i < count; ++i)
{
sync->setAttribute(draft->getExperimentalAttribute(i), 0);
}
sync->setReady();
return sync;
}
@@ -647,8 +646,7 @@ bool ManufactureSchematicObject::getSlot(int index, Crafting::IngredientSlot & d
const DynamicVariableList::NestedList ingredient(slotIngredients,buffer);
Crafting::ComponentIngredient * const component = new Crafting::ComponentIngredient();
if (component == NULL)
return false;
data.ingredients.push_back(Crafting::SimpleIngredientPtr(component));
component->count = 1;
if (!ingredient.hasItem(OBJVAR_COMPONENT_NAME))