summaryrefslogtreecommitdiff
path: root/src/main.c
diff options
context:
space:
mode:
authorjacksonmj <mj-pt@jacksonmj.co.uk>2011-08-24 15:35:52 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2011-08-27 10:37:03 (GMT)
commit42cfb74c2bb82eb185962a17f848e47265a16316 (patch)
treed2185ba1276dd85144b7d26099f597833f0cc975 /src/main.c
parentf97e8e5c7caddadadf71f7635070777c6e1248ad (diff)
downloadpowder-42cfb74c2bb82eb185962a17f848e47265a16316.zip
powder-42cfb74c2bb82eb185962a17f848e47265a16316.tar.gz
Remove blocking walls from pmap
2.5% speed increase on a screen full of water
Diffstat (limited to 'src/main.c')
-rw-r--r--src/main.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main.c b/src/main.c
index 7caa7e9..88474bc 100644
--- a/src/main.c
+++ b/src/main.c
@@ -718,7 +718,7 @@ int parse_save(void *save, int size, int replace, int x0, int y0, unsigned char
gol[x][y]=0;
if (j)
{
- if (pmap[y][x] && (pmap[y][x]>>8)<NPART)
+ if (pmap[y][x])
{
k = pmap[y][x]>>8;
memset(parts+k, 0, sizeof(particle));
@@ -2571,7 +2571,7 @@ int main(int argc, char *argv[])
} else {
cr = pmap[y/sdl_scale][x/sdl_scale];
}
- if (!((cr>>8)>=NPART || !cr))
+ if (cr)
{
if ((cr&0xFF)==PT_LIFE && parts[cr>>8].ctype>=0 && parts[cr>>8].ctype<NGOLALT)
{
@@ -3160,9 +3160,9 @@ int main(int argc, char *argv[])
{
int cr;
cr = pmap[y][x];
- if ((cr>>8)>=NPART || !cr)
+ if (!cr)
cr = photons[y][x];
- if (!((cr>>8)>=NPART || !cr))
+ if (cr)
{
c = sl = cr&0xFF;
if (c==PT_LIFE)