diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-04-19 16:01:17 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-04-19 16:01:17 (GMT) |
| commit | 456fca22c692cd5199e17e9b6d4279a04ce7da25 (patch) | |
| tree | 88e8a16909a44c6e4af2d21ace552f17154a7d67 /src/elements/stor.cpp | |
| parent | ceb25440cbbb1c6b712985770a0379c4da57cdd4 (diff) | |
| download | powder-456fca22c692cd5199e17e9b6d4279a04ce7da25.zip powder-456fca22c692cd5199e17e9b6d4279a04ce7da25.tar.gz | |
TPT: Change STOR, PIPE, DUST to make correct use of .flags field.
Diffstat (limited to 'src/elements/stor.cpp')
| -rw-r--r-- | src/elements/stor.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/elements/stor.cpp b/src/elements/stor.cpp index cf64255..01c3415 100644 --- a/src/elements/stor.cpp +++ b/src/elements/stor.cpp @@ -15,7 +15,7 @@ int update_STOR(UPDATE_FUNC_ARGS) { { parts[i].tmp = parts[r>>8].type; parts[i].temp = parts[r>>8].temp; - parts[i].flags = parts[r>>8].life; + parts[i].tmp2 = parts[r>>8].life; parts[i].pavg[0] = parts[r>>8].tmp; parts[i].pavg[1] = parts[r>>8].ctype; sim->kill_part(r>>8); @@ -28,7 +28,7 @@ int update_STOR(UPDATE_FUNC_ARGS) { if (np!=-1) { parts[np].temp = parts[i].temp; - parts[np].life = parts[i].flags; + parts[np].life = parts[i].tmp2; parts[np].tmp = parts[i].pavg[0]; parts[np].ctype = parts[i].pavg[1]; parts[i].tmp = 0; |
