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

Fix bugs with energy particles in PIPE

Browse Source
This commit is contained in:
jacksonmj 2012-09-05 08:35:51 +01:00
parent 6f1b80ead5
commit 8233d60906
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/elements/pipe.c
View File

@ -134,8 +134,13 @@ void PIPE_transfer_pipe_to_part(particle *pipe, particle *part)
part->ctype = pipe->pavg[1]; part->ctype = pipe->pavg[1];
pipe->tmp &= ~0xFF; pipe->tmp &= ~0xFF;
part->vx = 0.0f; if (!ptypes[part->type].properties & TYPE_ENERGY)
part->vy = 0.0f; {
part->vx = 0.0f;
part->vy = 0.0f;
}
else if (part->type == PT_PHOT && part->ctype == 0x40000000)
part->ctype = 0x3FFFFFFF;
part->tmp2 = 0; part->tmp2 = 0;
part->flags = 0; part->flags = 0;
part->dcolour = 0; part->dcolour = 0;
@ -479,6 +484,8 @@ int graphics_PIPE(GRAPHICS_FUNC_ARGS)
tpart.life = cpart->tmp2; tpart.life = cpart->tmp2;
tpart.tmp = cpart->pavg[0]; tpart.tmp = cpart->pavg[0];
tpart.ctype = cpart->pavg[1]; tpart.ctype = cpart->pavg[1];
if (tpart.type == PT_PHOT && tpart.ctype == 0x40000000)
tpart.ctype = 0x3FFFFFFF;
t = tpart.type; t = tpart.type;
if (graphicscache[t].isready) if (graphicscache[t].isready)
{ {