stockpiles: animals list still shown even when disabled

develop
Casey Link 2014-11-21 18:14:12 +01:00
parent 4f2851199e
commit f1ce575be3
1 changed files with 13 additions and 19 deletions

@ -1045,8 +1045,8 @@ private:
debug() << "animals:" << endl; debug() << "animals:" << endl;
mPile->settings.animals.empty_cages = mBuffer.animals().empty_cages(); mPile->settings.animals.empty_cages = mBuffer.animals().empty_cages();
mPile->settings.animals.empty_traps = mBuffer.animals().empty_traps(); mPile->settings.animals.empty_traps = mBuffer.animals().empty_traps();
if ( mBuffer.animals().enabled_size() > 0 )
{ mPile->settings.animals.enabled.clear();
mPile->settings.animals.enabled.resize ( world->raws.creatures.all.size(), '\0' ); mPile->settings.animals.enabled.resize ( world->raws.creatures.all.size(), '\0' );
debug() << " pile has " << mPile->settings.animals.enabled.size() << endl; debug() << " pile has " << mPile->settings.animals.enabled.size() << endl;
for ( auto i = 0; i < mBuffer.animals().enabled_size(); ++i ) for ( auto i = 0; i < mBuffer.animals().enabled_size(); ++i )
@ -1063,12 +1063,6 @@ private:
} }
} }
else else
{
mPile->settings.animals.enabled.clear();
}
}
else
{ {
mPile->settings.animals.enabled.clear(); mPile->settings.animals.enabled.clear();
mPile->settings.flags.bits.animals = 0; mPile->settings.flags.bits.animals = 0;