matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moving conditional branches around

Browse Source
This commit is contained in:
LBPHacker 2017-05-05 17:42:01 +02:00 committed by jacob1
parent ce054bfc3f
commit e15bfac60f
1 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/gui/game/PropertyTool.cpp
View File

@ -122,27 +122,14 @@ void PropertyWindow::SetProperty()
} }
else else
{ {
if(properties[property->GetOption().second].Type == StructProperty::ParticleType) int type;
if (properties[property->GetOption().second].Type == StructProperty::ParticleType && (type = sim->GetParticleType(value)) != -1)
{ {
int type = sim->GetParticleType(value); v = type;
if(type != -1)
{
#ifdef DEBUG #ifdef DEBUG
std::cout << "Got type from particle name" << std::endl; std::cout << "Got type from particle name" << std::endl;
#endif #endif
v = type;
}
else
{
std::stringstream buffer(value);
buffer.exceptions(std::stringstream::failbit | std::stringstream::badbit);
buffer >> v;
}
if (property->GetOption().first == "type" && (v < 0 || v >= PT_NUM || !sim->elements[v].Enabled))
{
new ErrorMessage("Could not set property", "Invalid particle type");
return;
}
} }
else else
{ {
@ -151,9 +138,17 @@ void PropertyWindow::SetProperty()
buffer >> v; buffer >> v;
} }
} }
if (properties[property->GetOption().second].Type == StructProperty::ParticleType && (v < 0 || v >= PT_NUM || !sim->elements[v].Enabled))
{
new ErrorMessage("Could not set property", "Invalid particle type");
return;
}
#ifdef DEBUG #ifdef DEBUG
std::cout << "Got int value " << v << std::endl; std::cout << "Got int value " << v << std::endl;
#endif #endif
tool->propValue.Integer = v; tool->propValue.Integer = v;
break; break;
} }