diff options
| author | jacksonmj <mj-pt@jacksonmj.co.uk> | 2011-02-26 19:32:51 (GMT) |
|---|---|---|
| committer | jacksonmj <mj-pt@jacksonmj.co.uk> | 2011-02-26 19:32:51 (GMT) |
| commit | ded7bdf30d87601e125ce06fee0a6614cd424f73 (patch) | |
| tree | 9b9004facb67d6276e9a2c8f6c79449834c5a229 /src/elements | |
| parent | a972644c4ffda6774ecea2798ff6d76f09d8f04e (diff) | |
| parent | 669a672b3d083af22c6aeb37a636903ce30bcf6c (diff) | |
| download | powder-ded7bdf30d87601e125ce06fee0a6614cd424f73.zip powder-ded7bdf30d87601e125ce06fee0a6614cd424f73.tar.gz | |
Merge branch 'upstream' into dev
Conflicts:
src/main.c
Diffstat (limited to 'src/elements')
| -rw-r--r-- | src/elements/glow.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/elements/glow.c b/src/elements/glow.c index 621e5b1..d692233 100644 --- a/src/elements/glow.c +++ b/src/elements/glow.c @@ -16,6 +16,10 @@ int update_GLOW(UPDATE_FUNC_ARGS) { parts[r>>8].life = 10; } } + parts[i].ctype = pv[y/CELL][x/CELL]*16; + + parts[i].tmp = abs((int)((vx[y/CELL][x/CELL]+vy[y/CELL][x/CELL])*16.0f)) + abs((int)((parts[i].vx+parts[i].vy)*64.0f)); + //printf("%f %f\n", parts[i].vx, parts[i].vy); if (parts[i].type==PT_NONE) { kill_part(i); return 1; |