summaryrefslogtreecommitdiff
path: root/src/elements/phot.c
diff options
context:
space:
mode:
authorSimon <simon@hardwired.org.uk>2011-02-04 10:24:35 (GMT)
committer Simon <simon@hardwired.org.uk>2011-02-04 10:24:35 (GMT)
commit9469a3b46a80970fc1d2a11df8c8692de90b6c00 (patch)
treeac8069712226ab150076c3af32cd2b1ab3a71d7b /src/elements/phot.c
parent525a59e28011cf26993c8e3f040a36ba7b7bf5e2 (diff)
parent9064cabf288be8ecb2fbc1c15bb4071cf3df1c22 (diff)
downloadpowder-9469a3b46a80970fc1d2a11df8c8692de90b6c00.zip
powder-9469a3b46a80970fc1d2a11df8c8692de90b6c00.tar.gz
Merge with cracker, also fix version
Diffstat (limited to 'src/elements/phot.c')
-rw-r--r--src/elements/phot.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/elements/phot.c b/src/elements/phot.c
index 11585f9..a6a5d07 100644
--- a/src/elements/phot.c
+++ b/src/elements/phot.c
@@ -6,7 +6,8 @@ int update_PHOT(UPDATE_FUNC_ARGS) {
if (1>rand()%10) update_PYRO(UPDATE_FUNC_SUBCALL_ARGS);
for (rx=-1; rx<2; rx++)
for (ry=-1; ry<2; ry++)
- if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry)) {
+ if (x+rx>=0 && y+ry>=0 && x+rx<XRES && y+ry<YRES && (rx || ry)) {
+ r = pmap[y+ry][x+rx];
if ((r>>8)>=NPART || !r)
continue;
if ((r&0xFF)==PT_ISOZ && 5>(rand()%2000))