summaryrefslogtreecommitdiff
path: root/src/simulation/elements/GOLD.cpp
diff options
context:
space:
mode:
authorjacksonmj <mj-pt@jacksonmj.co.uk>2013-04-27 12:54:16 (GMT)
committer jacksonmj <mj-pt@jacksonmj.co.uk>2013-04-27 12:55:41 (GMT)
commit9bc939d4223ce0d7e7209f2192dbc5779d7d6217 (patch)
tree7e179ba9937d7d8b92ac60943f65ea2b16c16501 /src/simulation/elements/GOLD.cpp
parent828569415f678d03087883876e0c18efc0068ac5 (diff)
downloadpowder-9bc939d4223ce0d7e7209f2192dbc5779d7d6217.zip
powder-9bc939d4223ce0d7e7209f2192dbc5779d7d6217.tar.gz
Less dependence on particle order for GOLD fast electricity conduction
Diffstat (limited to 'src/simulation/elements/GOLD.cpp')
-rw-r--r--src/simulation/elements/GOLD.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/simulation/elements/GOLD.cpp b/src/simulation/elements/GOLD.cpp
index 00eb7bf..e3837d7 100644
--- a/src/simulation/elements/GOLD.cpp
+++ b/src/simulation/elements/GOLD.cpp
@@ -76,7 +76,7 @@ int Element_GOLD::update(UPDATE_FUNC_ARGS)
if ((!rx != !ry) && BOUNDS_CHECK) {
r = pmap[y+ry][x+rx];
if(!r) continue;
- if((r&0xFF)==PT_SPRK && parts[r>>8].life)
+ if((r&0xFF)==PT_SPRK && parts[r>>8].life && parts[r>>8].life<4)
{
parts[i].life = 4;
parts[i].type = PT_SPRK;