Permalink
Browse files

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

  • Loading branch information...
jacob1 committed Jul 3, 2014
1 parent 45a051d commit f68fadb3f4dd190ed06d327718a06d971c97c772
Showing with 2 additions and 2 deletions.
  1. +2 −2 src/simulation/Simulation.cpp
@@ -2778,7 +2778,7 @@ int Simulation::create_part(int p, int x, int y, int tv)
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;
if (t==PT_LIFE && v<NGOL)
@@ -4241,7 +4241,7 @@ void Simulation::update_particles_i(int start, int inc)
clear_y = (int)(clear_yf+0.5f);
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
clear_xf = fin_xf-dx;

0 comments on commit f68fadb

Please sign in to comment.