diff options
| author | Philip <philip@philip-linuxlaptop.(none)> | 2010-11-20 03:03:52 (GMT) |
|---|---|---|
| committer | Philip <philip@philip-linuxlaptop.(none)> | 2010-11-20 03:03:52 (GMT) |
| commit | a38dddaf5a2106ffb3d112584f657a6c3d97c4fb (patch) | |
| tree | 5bb5260a5cc00e14ec257f8b07ed6230623fcaf6 /src/main.c | |
| parent | c1182db42d609a181128b818da28d323c39445fc (diff) | |
| download | powder-a38dddaf5a2106ffb3d112584f657a6c3d97c4fb.zip powder-a38dddaf5a2106ffb3d112584f657a6c3d97c4fb.tar.gz | |
Made wall code use #defines. small fix for adjustabl brush.
Diffstat (limited to 'src/main.c')
| -rw-r--r-- | src/main.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -250,7 +250,7 @@ void *build_save(int *size, int x0, int y0, int w, int h) d[p++] = bmap[y][x]; for(y=by0; y<by0+bh; y++) for(x=bx0; x<bx0+bw; x++) - if(bmap[y][x]==4) + if(bmap[y][x]==WL_FAN) { i = (int)(fvx[y][x]*64.0f+127.5f); if(i<0) i=0; @@ -259,7 +259,7 @@ void *build_save(int *size, int x0, int y0, int w, int h) } for(y=by0; y<by0+bh; y++) for(x=bx0; x<bx0+bw; x++) - if(bmap[y][x]==4) + if(bmap[y][x]==WL_FAN) { i = (int)(fvy[y][x]*64.0f+127.5f); if(i<0) i=0; @@ -1108,7 +1108,7 @@ int main(int argc, char *argv[]) { for(i=1; i<XRES/CELL; i++) { - if(bmap[j][i]==1 || bmap[j][i]==8 || (bmap[j][i]==7 && !emap[j][i])) + if(bmap[j][i]==WL_WALL || bmap[j][i]==WL_WALLELEC || (bmap[j][i]==WL_EWALL && !emap[j][i])) { vx[j][i] = 0.0f; vx[j][i-1] = 0.0f; @@ -1874,7 +1874,7 @@ int main(int argc, char *argv[]) if(lm == 1) { xor_line(lx, ly, x, y, vid_buf); - if(c==127 && lx>=0 && ly>=0 && lx<XRES && ly<YRES && bmap[ly/CELL][lx/CELL]==4) + if(c==127 && lx>=0 && ly>=0 && lx<XRES && ly<YRES && bmap[ly/CELL][lx/CELL]==WL_FAN) { nfvx = (x-lx)*0.005f; nfvy = (y-ly)*0.005f; @@ -1885,7 +1885,7 @@ int main(int argc, char *argv[]) { fvx[j][i] = nfvx; fvy[j][i] = nfvy; - bmap[j][i] = 4; + bmap[j][i] = WL_FAN; } } } @@ -1991,7 +1991,7 @@ int main(int argc, char *argv[]) su = c; if(lm == 1) { - if(c!=127 || lx<0 || ly<0 || lx>=XRES || ly>=YRES || bmap[ly/CELL][lx/CELL]!=4) + if(c!=127 || lx<0 || ly<0 || lx>=XRES || ly>=YRES || bmap[ly/CELL][lx/CELL]!=WL_FAN) create_line(lx, ly, x, y, bsx, bsy, c); } else |