diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-10-10 20:27:36 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-10-10 20:27:36 (GMT) |
| commit | 0b09d2e0f3261c5db41136315df070673780553d (patch) | |
| tree | 8df8df5856ca23d41ce58389f0d216e2cd960652 /src/simulation | |
| parent | da07c22ee457899236c8c6d457696daa019fd07e (diff) | |
| download | powder-0b09d2e0f3261c5db41136315df070673780553d.zip powder-0b09d2e0f3261c5db41136315df070673780553d.tar.gz | |
Allow TSNS and DTEC to detect photons and other energy particles. Set default TSNS radius to 1 to make it easier to avoid detecting the wire connections
Diffstat (limited to 'src/simulation')
| -rw-r--r-- | src/simulation/Simulation.cpp | 2 | ||||
| -rw-r--r-- | src/simulation/elements/DTEC.cpp | 4 | ||||
| -rw-r--r-- | src/simulation/elements/TSNS.cpp | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp index 023d90c..c87f16a 100644 --- a/src/simulation/Simulation.cpp +++ b/src/simulation/Simulation.cpp @@ -2933,7 +2933,7 @@ int Simulation::create_part(int p, int x, int y, int tv) case PT_DTEC: parts[i].tmp2 = 2; case PT_TSNS: - parts[i].tmp2 = 2; + parts[i].tmp2 = 1; break; default: if (t==PT_FIGH) diff --git a/src/simulation/elements/DTEC.cpp b/src/simulation/elements/DTEC.cpp index 38161cf..6d67cf2 100644 --- a/src/simulation/elements/DTEC.cpp +++ b/src/simulation/elements/DTEC.cpp @@ -84,7 +84,9 @@ int Element_DTEC::update(UPDATE_FUNC_ARGS) if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry)) { r = pmap[y+ry][x+rx]; - if (!r) + if(!r) + r = sim->photons[y+ry][x+rx]; + if(!r) continue; if (parts[r>>8].type == parts[i].ctype && (parts[i].ctype != PT_LIFE || parts[i].tmp == parts[r>>8].tmp)) parts[i].life = 1; diff --git a/src/simulation/elements/TSNS.cpp b/src/simulation/elements/TSNS.cpp index 5c8a23b..ceedbb4 100644 --- a/src/simulation/elements/TSNS.cpp +++ b/src/simulation/elements/TSNS.cpp @@ -78,7 +78,9 @@ int Element_TSNS::update(UPDATE_FUNC_ARGS) if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry)) { r = pmap[y+ry][x+rx]; - if (!r) + if(!r) + r = sim->photons[y+ry][x+rx]; + if(!r) continue; if (parts[r>>8].temp >= parts[i].temp && parts[r>>8].type != PT_TSNS) parts[i].life = 1; |