diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2011-05-24 13:55:29 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2011-05-24 13:55:29 (GMT) |
| commit | 453c69d39aa565ba61aef98f0f7b7bc8f3b94da0 (patch) | |
| tree | 3675b28e5774d1b9f72eccaa4ac554f380b666c7 /src/elements | |
| parent | eafcdf8ec94b058707f1a6b8a2b9b5076c6275ca (diff) | |
| parent | 956218736b557eb91bb4d841006ddce0d3cdbeed (diff) | |
| download | powder-453c69d39aa565ba61aef98f0f7b7bc8f3b94da0.zip powder-453c69d39aa565ba61aef98f0f7b7bc8f3b94da0.tar.gz | |
Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy
Diffstat (limited to 'src/elements')
| -rw-r--r-- | src/elements/neut.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/elements/neut.c b/src/elements/neut.c index 9e77898..20d4618 100644 --- a/src/elements/neut.c +++ b/src/elements/neut.c @@ -2,9 +2,9 @@ #if defined(WIN32) && !defined(__GNUC__) -_inline int create_n_parts(int n, int x, int y, float vx, float vy, int t) +_inline int create_n_parts(int n, int x, int y, float vx, float vy, float temp, int t) #else -inline int create_n_parts(int n, int x, int y, float vx, float vy, int t)//testing a new deut create part +inline int create_n_parts(int n, int x, int y, float vx, float vy, float temp, int t)//testing a new deut create part #endif { int i, c; @@ -33,7 +33,7 @@ inline int create_n_parts(int n, int x, int y, float vx, float vy, int t)//testi parts[i].vx = r*cosf(a); parts[i].vy = r*sinf(a); parts[i].ctype = 0; - parts[i].temp += (n*170); + parts[i].temp = temp; parts[i].tmp = 0; if (t!=PT_STKM&&t!=PT_STKM2 && t!=PT_PHOT && t!=PT_NEUT && !pmap[y][x]) pmap[y][x] = t|(i<<8); @@ -81,9 +81,9 @@ int update_NEUT(UPDATE_FUNC_ARGS) { update_PYRO(UPDATE_FUNC_SUBCALL_ARGS); } #ifdef SDEUT - else if ((r&0xFF)==PT_DEUT && (pressureFactor+1+(parts[i].life/100))>(rand()%1000)) + else if ((r&0xFF)==PT_DEUT && (pressureFactor+1+(parts[r>>8].life/100))>(rand()%1000)) { - create_n_parts(parts[r>>8].life, x+rx, y+ry, parts[i].vx, parts[i].vy, PT_NEUT); + create_n_parts(parts[r>>8].life, x+rx, y+ry, parts[i].vx, parts[i].vy, restrict_flt(parts[r>>8].temp + parts[r>>8].life*500, MIN_TEMP, MAX_TEMP), PT_NEUT); kill_part(r>>8); } #else |