diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-12-16 16:38:29 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-12-16 16:38:29 (GMT) |
| commit | 0c5e99aef6c997b8bce53189537523e7f742d64b (patch) | |
| tree | fbe46aa7b53660b6c399728f1adc1504b188dc98 /src/simulation/elements | |
| parent | 00190b4aabad65531ee0e859c3e4f358841238f6 (diff) | |
| parent | 06f8f88374a1b9e288da30d754ba4bf02768d863 (diff) | |
| download | powder-0c5e99aef6c997b8bce53189537523e7f742d64b.zip powder-0c5e99aef6c997b8bce53189537523e7f742d64b.tar.gz | |
Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy
Diffstat (limited to 'src/simulation/elements')
| -rw-r--r-- | src/simulation/elements/MERC.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/simulation/elements/MERC.cpp b/src/simulation/elements/MERC.cpp index 1fec32a..655a8b9 100644 --- a/src/simulation/elements/MERC.cpp +++ b/src/simulation/elements/MERC.cpp @@ -80,13 +80,14 @@ int Element_MERC::update(UPDATE_FUNC_ARGS) r = pmap[y+ry][x+rx]; if (parts[i].tmp<=maxtmp) continue; - if ((!r)&&parts[i].tmp>=1)//if nothing then create deut + if ((!r)&&parts[i].tmp>=1)//if nothing then create MERC { np = sim->create_part(-1,x+rx,y+ry,PT_MERC); if (np<0) continue; parts[i].tmp--; parts[np].temp = parts[i].temp; parts[np].tmp = 0; + parts[np].dcolour = parts[i].dcolour; } } for ( trade = 0; trade<4; trade ++) @@ -118,4 +119,4 @@ int Element_MERC::update(UPDATE_FUNC_ARGS) } -Element_MERC::~Element_MERC() {}
\ No newline at end of file +Element_MERC::~Element_MERC() {} |