matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make pipe save ctype and tmp

Browse Source
This commit is contained in:
jacksonmj 2011-06-24 23:53:18 +01:00 committed by Simon Robertshaw
parent 6c3093cabf
commit f3927f7202
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/elements/pipe.c
View File

@ -48,6 +48,8 @@ int update_PIPE(UPDATE_FUNC_ARGS) {
{ {
parts[np].temp = parts[i].temp;//pipe saves temp and life now parts[np].temp = parts[i].temp;//pipe saves temp and life now
parts[np].life = parts[i].flags; parts[np].life = parts[i].flags;
parts[np].tmp = parts[i].pavg[0];
parts[np].ctype = parts[i].pavg[1];
} }
parts[i].tmp = 0; parts[i].tmp = 0;
continue; continue;
@ -59,6 +61,8 @@ int update_PIPE(UPDATE_FUNC_ARGS) {
parts[i].tmp = parts[r>>8].type; parts[i].tmp = parts[r>>8].type;
parts[i].temp = parts[r>>8].temp; parts[i].temp = parts[r>>8].temp;
parts[i].flags = parts[r>>8].life; 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); kill_part(r>>8);
} }
else if ((r&0xFF)==PT_PIPE && parts[r>>8].ctype!=ctype && parts[r>>8].tmp==0&&parts[i].tmp>0) 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].tmp = parts[i].tmp;
parts[r>>8].temp = parts[i].temp; parts[r>>8].temp = parts[i].temp;
parts[r>>8].flags = parts[i].flags; 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; parts[i].tmp = 0;
} }
} }