summaryrefslogtreecommitdiff
path: root/src/graphics/Renderer.cpp
diff options
context:
space:
mode:
authorcracker64 <cracker642@gmail.com>2013-03-03 21:32:11 (GMT)
committer cracker64 <cracker642@gmail.com>2013-03-03 21:32:11 (GMT)
commit2be0b222111240cca189288a6a6da2141c5a8a2f (patch)
tree835779268f34c8feb870960fe5a9390e34c2525c /src/graphics/Renderer.cpp
parent5e1c7d7932aead512549bacb6fa8847da2530e9f (diff)
parentcca1898ee8c2091833661f97748defb298cc77b9 (diff)
downloadpowder-2be0b222111240cca189288a6a6da2141c5a8a2f.zip
powder-2be0b222111240cca189288a6a6da2141c5a8a2f.tar.gz
Merge branch 'master' of git@github.com:FacialTurd/The-Powder-Toy.git
Diffstat (limited to 'src/graphics/Renderer.cpp')
-rw-r--r--src/graphics/Renderer.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/graphics/Renderer.cpp b/src/graphics/Renderer.cpp
index 486a0d4..3a1a2cd 100644
--- a/src/graphics/Renderer.cpp
+++ b/src/graphics/Renderer.cpp
@@ -1172,10 +1172,10 @@ void Renderer::render_parts()
fnx = sim->parts[i].x;
fny = sim->parts[i].y;
- if((sim->photons[ny][nx]&0xFF) && !(sim->elements[t].Properties & TYPE_ENERGY) && t!=PT_STKM && t!=PT_STKM2 && t!=PT_FIGH)
- continue;
if(nx >= XRES || nx < 0 || ny >= YRES || ny < 0)
continue;
+ if((sim->photons[ny][nx]&0xFF) && !(sim->elements[t].Properties & TYPE_ENERGY) && t!=PT_STKM && t!=PT_STKM2 && t!=PT_FIGH)
+ continue;
//Defaults
pixel_mode = 0 | PMODE_FLAT;