Changed: Merge changes from next patch

This commit is contained in:
kervala 2011-05-31 22:16:29 +02:00
parent 73bf79340d
commit 2c1cc5cbee

View file

@ -461,11 +461,9 @@ void CFaberPhrase::apply()
for( uint mp = 0; mp < neededMp; ++mp )
{
nlinfo("MP #%d\n", mp);
//for each type of Mp needed
for( uint k = 0; k < _RootFaberPlan->Faber->NeededMps[ mp ].Quantity; ++k )
{
nlinfo(" usedmps : %d", usedMps.size());
bool found_mp = false;
for(uint u_mp = 0; u_mp < usedMps.size(); ++u_mp)
{
@ -540,7 +538,6 @@ void CFaberPhrase::apply()
}
if (!usedMps.empty())
{
nlinfo("final usedmps : %d", usedMps.size());
nlwarning( "<CFaberPhrase build> could not build action for plan brick %s", _RootFaberPlan->SheetId.toString().c_str() );
stop();
return;