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

FLAG_STAGNANT usage lost during rewrite

Browse Source
This commit is contained in:
jacksonmj 2011-02-14 05:59:45 +08:00 committed by FacialTurd
parent dab9f85024
commit 1b23302513
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/powder.c
View File

@ -1780,6 +1780,9 @@ killed:
} }
} }
rt = parts[i].flags & FLAG_STAGNANT;
parts[i].flags &= ~FLAG_STAGNANT;
if ((t==PT_PHOT||t==PT_NEUT)) { if ((t==PT_PHOT||t==PT_NEUT)) {
if (t == PT_PHOT) { if (t == PT_PHOT) {
rt = pmap[fin_y][fin_x] & 0xFF; rt = pmap[fin_y][fin_x] & 0xFF;
@ -2008,24 +2011,25 @@ killed:
break; break;
} }
} }
else if (clear_x!=x&&clear_y!=y && try_move(i, x, y, clear_x, clear_y)) { else if ((clear_x!=x||clear_y!=y) && try_move(i, x, y, clear_x, clear_y)) {
// if interpolation was done and haven't yet moved, try moving to last clear position // if interpolation was done and haven't yet moved, try moving to last clear position
parts[i].x = clear_xf; parts[i].x = clear_xf;
parts[i].y = clear_yf; parts[i].y = clear_yf;
} }
else
parts[i].flags |= FLAG_STAGNANT;
parts[i].vx *= ptypes[t].collision; parts[i].vx *= ptypes[t].collision;
parts[i].vy *= ptypes[t].collision; parts[i].vy *= ptypes[t].collision;
if (!s)
parts[i].flags |= FLAG_STAGNANT;
} }
else else
{ {
if (clear_x!=x&&clear_y!=y && try_move(i, x, y, clear_x, clear_y)) { if ((clear_x!=x||clear_y!=y) && try_move(i, x, y, clear_x, clear_y)) {
// if interpolation was done, try moving to last clear position // if interpolation was done, try moving to last clear position
parts[i].x = clear_xf; parts[i].x = clear_xf;
parts[i].y = clear_yf; parts[i].y = clear_yf;
} }
parts[i].flags |= FLAG_STAGNANT; else
parts[i].flags |= FLAG_STAGNANT;
parts[i].vx *= ptypes[t].collision; parts[i].vx *= ptypes[t].collision;
parts[i].vy *= ptypes[t].collision; parts[i].vy *= ptypes[t].collision;
} }