diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-10-29 09:36:32 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-10-29 09:36:32 (GMT) |
| commit | 48be91e4df50ecb5cc52e21556dce0df8474666e (patch) | |
| tree | 9465115c666da9413fac882ec8b9b1813c5c83eb /src/simulation/elements | |
| parent | e08bc6680bb766305486fdbe1d8e6cb6482993af (diff) | |
| parent | 32bdcb89e8609b43e24493d54c57d0fb552a5331 (diff) | |
| download | powder-48be91e4df50ecb5cc52e21556dce0df8474666e.zip powder-48be91e4df50ecb5cc52e21556dce0df8474666e.tar.gz | |
Merge branch 'master' of github.com:FacialTurd/PowderToypp
Diffstat (limited to 'src/simulation/elements')
| -rw-r--r-- | src/simulation/elements/ELEC.cpp | 1 | ||||
| -rw-r--r-- | src/simulation/elements/SPNG.cpp | 4 | ||||
| -rw-r--r-- | src/simulation/elements/VIBR.cpp | 8 |
3 files changed, 7 insertions, 6 deletions
diff --git a/src/simulation/elements/ELEC.cpp b/src/simulation/elements/ELEC.cpp index e9d1f5a..c602da8 100644 --- a/src/simulation/elements/ELEC.cpp +++ b/src/simulation/elements/ELEC.cpp @@ -123,7 +123,6 @@ int Element_ELEC::update(UPDATE_FUNC_ARGS) if(parts[r>>8].life < 6000) parts[r>>8].life += 1; parts[r>>8].temp = 0; - parts[i].temp = 0; sim->kill_part(i); return 1; } diff --git a/src/simulation/elements/SPNG.cpp b/src/simulation/elements/SPNG.cpp index 37f5a08..95dd12f 100644 --- a/src/simulation/elements/SPNG.cpp +++ b/src/simulation/elements/SPNG.cpp @@ -53,7 +53,7 @@ int Element_SPNG::update(UPDATE_FUNC_ARGS) int limit = 50; if (parts[i].life<limit && sim->pv[y/CELL][x/CELL]<=3&&sim->pv[y/CELL][x/CELL]>=-3&&parts[i].temp<=374.0f) { - int absorbChanceDenom = parts[i].life*1000/limit + 500; + int absorbChanceDenom = parts[i].life*10000/limit + 500; for (rx=-1; rx<2; rx++) for (ry=-1; ry<2; ry++) if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry)) @@ -195,4 +195,4 @@ int Element_SPNG::graphics(GRAPHICS_FUNC_ARGS) } -Element_SPNG::~Element_SPNG() {}
\ No newline at end of file +Element_SPNG::~Element_SPNG() {} diff --git a/src/simulation/elements/VIBR.cpp b/src/simulation/elements/VIBR.cpp index 370c69f..02c97fa 100644 --- a/src/simulation/elements/VIBR.cpp +++ b/src/simulation/elements/VIBR.cpp @@ -161,11 +161,13 @@ int Element_VIBR::update(UPDATE_FUNC_ARGS) { sim->pv[y/CELL][x/CELL]=200; } //Neighbor check loop - for (rx=-2; rx<3; rx++) - for (ry=-2; ry<3; ry++) + for (rx=-3; rx<4; rx++) + for (ry=-3; ry<4; ry++) if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry)) { r = pmap[y+ry][x+rx]; + if (!r || (r & (abs(rx) == 3 || abs(ry) == 3)) ) + r = sim->photons[y+ry][x+rx]; if (!r) continue; //Melts into EXOT @@ -229,4 +231,4 @@ int Element_VIBR::graphics(GRAPHICS_FUNC_ARGS) return 0; } -Element_VIBR::~Element_VIBR() {}
\ No newline at end of file +Element_VIBR::~Element_VIBR() {} |