diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2013-01-26 17:15:02 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2013-01-26 17:15:02 (GMT) |
| commit | 8e689fdd080ff24b9beb68852ff9b7c74594f119 (patch) | |
| tree | 0260bce01d5e49427c6cfc364845b1f9e8c0c1d4 /src/simulation/elements | |
| parent | 3e60181dbe8fe291c27f909738a8210111557665 (diff) | |
| parent | 46b767da0c14745a6cd807637249ec0b5b57b8f1 (diff) | |
| download | powder-8e689fdd080ff24b9beb68852ff9b7c74594f119.zip powder-8e689fdd080ff24b9beb68852ff9b7c74594f119.tar.gz | |
Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy
Diffstat (limited to 'src/simulation/elements')
| -rw-r--r-- | src/simulation/elements/LIGH.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/simulation/elements/LIGH.cpp b/src/simulation/elements/LIGH.cpp index f697ebe..a6b77de 100644 --- a/src/simulation/elements/LIGH.cpp +++ b/src/simulation/elements/LIGH.cpp @@ -296,7 +296,7 @@ bool Element_LIGH::create_LIGH(Simulation * sim, int x, int y, int c, int temp, sim->parts[p].tmp = tmp; sim->parts[p].tmp2 = tmp2; } - else + else if (x >= 0 && x < XRES && y >= 0 && y < YRES) { int r = sim->pmap[y][x]; if ((((r&0xFF)==PT_VOID || ((r&0xFF)==PT_PVOD && sim->parts[r>>8].life >= 10)) && (!sim->parts[r>>8].ctype || (sim->parts[r>>8].ctype==c)!=(sim->parts[r>>8].tmp&1))) || (r&0xFF)==PT_BHOL || (r&0xFF)==PT_NBHL) // VOID, PVOD, VACU, and BHOL eat LIGH here |