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

Make sample tool sample different life types. Fixes #184

Browse Source
This commit is contained in:
Simon Robertshaw 2012-09-13 16:41:35 +01:00
parent 44c55fbd45
commit f7f51d5045
1 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/game/SampleTool.cpp
View File

@ -30,16 +30,38 @@ void SampleTool::Draw(Simulation * sim, Brush * brush, ui::Point position)
else
{
int particleType = 0;
int particleCtype = 0;
if(sim->pmap[position.Y][position.X])
{
particleType = sim->parts[sim->pmap[position.Y][position.X]>>8].type;
particleCtype = sim->parts[sim->pmap[position.Y][position.X]>>8].ctype;
}
else if(sim->photons[position.Y][position.X])
{
particleType = sim->parts[sim->photons[position.Y][position.X]>>8].type;
particleCtype = sim->parts[sim->pmap[position.Y][position.X]>>8].ctype;
}
if(particleType)
{
Tool * elementTool = gameModel->GetElementTool(particleType);
if(elementTool)
gameModel->SetActiveTool(0, elementTool);
if(particleType == PT_LIFE)
{
Menu * lifeMenu = gameModel->GetMenuList()[SC_LIFE];
std::vector<Tool*> elementTools = lifeMenu->GetToolList();
for(std::vector<Tool*>::iterator iter = elementTools.begin(), end = elementTools.end(); iter != end; ++iter)
{
Tool * elementTool = *iter;
if(elementTool && elementTool->GetToolID() == particleCtype)
gameModel->SetActiveTool(0, elementTool);
}
}
else
{
Tool * elementTool = gameModel->GetElementTool(particleType);
if(elementTool)
gameModel->SetActiveTool(0, elementTool);
}
}
}
}