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

make PHOT only able to move 2 pixels at a time through things again

Browse Source
This commit is contained in:
jacob1 2014-07-03 12:05:26 -04:00
parent 45a051d4ea
commit f68fadb3f4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/simulation/Simulation.cpp
View File

@ -2778,7 +2778,7 @@ int Simulation::create_part(int p, int x, int y, int tv)
parts[pmap[y][x]>>8].ctype |= v<<8; parts[pmap[y][x]>>8].ctype |= v<<8;
} }
} }
else if (drawOn == PT_CRAY && drawOn != t && drawOn != PT_PSCN && drawOn != PT_INST && drawOn != PT_METL) else if (drawOn == PT_CRAY && drawOn != t && t != PT_PSCN && t != PT_INST && t != PT_METL)
{ {
parts[pmap[y][x]>>8].ctype = t; parts[pmap[y][x]>>8].ctype = t;
if (t==PT_LIFE && v<NGOL) if (t==PT_LIFE && v<NGOL)
@ -4241,7 +4241,7 @@ killed:
clear_y = (int)(clear_yf+0.5f); clear_y = (int)(clear_yf+0.5f);
break; break;
} }
if (!eval_move(t, fin_x, fin_y, NULL)) if (!eval_move(t, fin_x, fin_y, NULL) || (t == PT_PHOT && pmap[fin_y][fin_x]))
{ {
// found an obstacle // found an obstacle
clear_xf = fin_xf-dx; clear_xf = fin_xf-dx;