diff options
| author | jacksonmj <mj-pt@jacksonmj.co.uk> | 2011-06-24 22:53:18 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2011-06-25 21:30:49 (GMT) |
| commit | f3927f7202d67366872c85d132b2f8266d5220b5 (patch) | |
| tree | 488bc44e42ccf8353db803c673fa41fe6bffe5ac /src/elements | |
| parent | 6c3093cabf7cb16cf95eba2b7ea5bbb5ed33c863 (diff) | |
| download | powder-f3927f7202d67366872c85d132b2f8266d5220b5.zip powder-f3927f7202d67366872c85d132b2f8266d5220b5.tar.gz | |
Make pipe save ctype and tmp
Diffstat (limited to 'src/elements')
| -rw-r--r-- | src/elements/pipe.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/elements/pipe.c b/src/elements/pipe.c index bc7ff00..bb75195 100644 --- a/src/elements/pipe.c +++ b/src/elements/pipe.c @@ -48,6 +48,8 @@ int update_PIPE(UPDATE_FUNC_ARGS) { { parts[np].temp = parts[i].temp;//pipe saves temp and life now parts[np].life = parts[i].flags; + parts[np].tmp = parts[i].pavg[0]; + parts[np].ctype = parts[i].pavg[1]; } parts[i].tmp = 0; continue; @@ -59,6 +61,8 @@ int update_PIPE(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].pavg[0] = parts[r>>8].tmp; + parts[i].pavg[1] = parts[r>>8].ctype; kill_part(r>>8); } else if ((r&0xFF)==PT_PIPE && parts[r>>8].ctype!=ctype && parts[r>>8].tmp==0&&parts[i].tmp>0) @@ -66,6 +70,8 @@ int update_PIPE(UPDATE_FUNC_ARGS) { parts[r>>8].tmp = parts[i].tmp; parts[r>>8].temp = parts[i].temp; parts[r>>8].flags = parts[i].flags; + parts[r>>8].pavg[0] = parts[i].pavg[0]; + parts[r>>8].pavg[1] = parts[i].pavg[1]; parts[i].tmp = 0; } } |
