mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-29 19:00:33 +02:00
Code Issues 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
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -122,15 +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);
if(type != -1)
{ {
v = type;
#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 else
{ {
@@ -138,22 +137,18 @@ void PropertyWindow::SetProperty()
buffer.exceptions(std::stringstream::failbit | std::stringstream::badbit); buffer.exceptions(std::stringstream::failbit | std::stringstream::badbit);
buffer >> v; buffer >> v;
} }
if (property->GetOption().first == "type" && (v < 0 || v >= PT_NUM || !sim->elements[v].Enabled)) }
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"); new ErrorMessage("Could not set property", "Invalid particle type");
return; return;
} }
}
else
{
std::stringstream buffer(value);
buffer.exceptions(std::stringstream::failbit | std::stringstream::badbit);
buffer >> v;
}
}
#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;
} }