diff options
| author | jacob1 <jfu614@gmail.com> | 2013-02-22 16:54:32 (GMT) |
|---|---|---|
| committer | jacob1 <jfu614@gmail.com> | 2013-02-22 16:54:32 (GMT) |
| commit | 11f45e3e992adc83447375f3b4e3d340970c91e5 (patch) | |
| tree | b82a3afb54f945f2b22d153d58c5713561c163a8 /src/simulation/elements/CRAY.cpp | |
| parent | 40c4289ce87f31cbc9f5194d37f068d89416d4c8 (diff) | |
| download | powder-11f45e3e992adc83447375f3b4e3d340970c91e5.zip powder-11f45e3e992adc83447375f3b4e3d340970c91e5.tar.gz | |
CRAY spawns elements at its temp, fix color glitch with ARAY too, move FRME to force
Diffstat (limited to 'src/simulation/elements/CRAY.cpp')
| -rw-r--r-- | src/simulation/elements/CRAY.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/simulation/elements/CRAY.cpp b/src/simulation/elements/CRAY.cpp index 3088f7a..55c9bf8 100644 --- a/src/simulation/elements/CRAY.cpp +++ b/src/simulation/elements/CRAY.cpp @@ -65,7 +65,7 @@ int Element_CRAY::update(UPDATE_FUNC_ARGS) if ((r&0xFF)!=PT_CRAY && (r&0xFF)!=PT_PSCN && (r&0xFF)!=PT_INST && (r&0xFF)!=PT_METL && (r&0xFF)!=PT_SPRK && (r&0xFF)<PT_NUM) { parts[i].ctype = r&0xFF; - //parts[i].temp = parts[r>>8].temp; + parts[i].temp = parts[r>>8].temp; } } } else if (parts[i].life==0) { // only fire when life is 0, but nothing sets the life right now @@ -96,6 +96,7 @@ int Element_CRAY::update(UPDATE_FUNC_ARGS) nr = sim->create_part(-1, x+nxi+nxx, y+nyi+nyy, parts[i].ctype); if (nr!=-1) { parts[nr].dcolour = colored; + parts[nr].temp = parts[i].temp; } if((!destroy || parts[i].ctype != PT_SPRK) && !--partsRemaining) docontinue = 0; |