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

TPT: Gel won't move solids any more 68ab2e3148

Browse Source
This commit is contained in:
Simon Robertshaw 2012-06-12 16:02:09 +01:00
parent 96ec616442
commit 14cb5cf765
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/simulation/elements/GEL.cpp
View File

@ -98,8 +98,13 @@ int Element_GEL::update(UPDATE_FUNC_ARGS)
per *= 0.1;
dx *= per; dy *= per;
parts[i].vx += dx; parts[r>>8].vx -= dx;
parts[i].vy += dy; parts[r>>8].vy -= dy;
parts[i].vx += dx;
parts[i].vy += dy;
if ((sim->elements[r&0xFF].State!=ST_SOLID && sim->elements[r&0xFF].State!=ST_NONE) || (r&0xFF)==PT_GOO)
{
parts[r>>8].vx -= dx;
parts[r>>8].vy -= dy;
}
}
}
return 0;
@ -120,4 +125,4 @@ int Element_GEL::graphics(GRAPHICS_FUNC_ARGS)
Element_GEL::~Element_GEL() {}
Element_GEL::~Element_GEL() {}