diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-05-12 12:21:04 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-05-12 12:21:04 (GMT) |
| commit | 16d3895e9c054e908ca8b230719f4294e824a4a2 (patch) | |
| tree | 8246b0ebc3b94ed05427b8ffa5ea1e1764c7a37a /src/Renderer.cpp | |
| parent | 1c993435efc7fe6702d21c892e1d4dd8347d2e7f (diff) | |
| download | powder-16d3895e9c054e908ca8b230719f4294e824a4a2.zip powder-16d3895e9c054e908ca8b230719f4294e824a4a2.tar.gz | |
Redo Wall IDs
Diffstat (limited to 'src/Renderer.cpp')
| -rw-r--r-- | src/Renderer.cpp | 87 |
1 files changed, 4 insertions, 83 deletions
diff --git a/src/Renderer.cpp b/src/Renderer.cpp index 167b062..92cb376 100644 --- a/src/Renderer.cpp +++ b/src/Renderer.cpp @@ -369,7 +369,7 @@ void Renderer::DrawWalls() for (x=0; x<XRES/CELL; x++) if (bmap[y][x]) { - wt = bmap[y][x]-UI_ACTUALSTART; + wt = bmap[y][x]; if (wt<0 || wt>=UI_WALLCOUNT) continue; pc = wtypes[wt].colour; @@ -407,7 +407,7 @@ void Renderer::DrawWalls() } // special rendering for some walls - if (bmap[y][x]==WL_EWALL) + if (wt==WL_EWALL) { if (emap[y][x]) { @@ -424,7 +424,7 @@ void Renderer::DrawWalls() vid[(y*CELL+j)*(XRES+BARSIZE)+(x*CELL+i)] = pc; } } - else if (bmap[y][x]==WL_WALLELEC) + else if (wt==WL_WALLELEC) { for (j=0; j<CELL; j++) for (i=0; i<CELL; i++) @@ -435,7 +435,7 @@ void Renderer::DrawWalls() vid[(y*CELL+j)*(XRES+BARSIZE)+(x*CELL+i)] = PIXPACK(0x808080); } } - else if (bmap[y][x]==WL_EHOLE) + else if (wt==WL_EHOLE) { if (emap[y][x]) { @@ -453,85 +453,6 @@ void Renderer::DrawWalls() vid[(y*CELL+j)*(XRES+BARSIZE)+(x*CELL+i)] = PIXPACK(0x242424); } } - if (render_mode & PMODE_BLOB) - { - // when in blob view, draw some blobs... - if (wtypes[wt].drawstyle==1) - { - for (j=0; j<CELL; j+=2) - for (i=(j>>1)&1; i<CELL; i+=2) - drawblob((x*CELL+i), (y*CELL+j), PIXR(pc), PIXG(pc), PIXB(pc)); - } - else if (wtypes[wt].drawstyle==2) - { - for (j=0; j<CELL; j+=2) - for (i=0; i<CELL; i+=2) - drawblob((x*CELL+i), (y*CELL+j), PIXR(pc), PIXG(pc), PIXB(pc)); - } - else if (wtypes[wt].drawstyle==3) - { - for (j=0; j<CELL; j++) - for (i=0; i<CELL; i++) - drawblob((x*CELL+i), (y*CELL+j), PIXR(pc), PIXG(pc), PIXB(pc)); - } - else if (wtypes[wt].drawstyle==4) - { - for (j=0; j<CELL; j++) - for (i=0; i<CELL; i++) - if(i == j) - drawblob((x*CELL+i), (y*CELL+j), PIXR(pc), PIXG(pc), PIXB(pc)); - else if (i == j+1 || (i == 0 && j == CELL-1)) - drawblob((x*CELL+i), (y*CELL+j), PIXR(gc), PIXG(gc), PIXB(gc)); - else - drawblob((x*CELL+i), (y*CELL+j), 0x20, 0x20, 0x20); - } - if (bmap[y][x]==WL_EWALL) - { - if (emap[y][x]) - { - for (j=0; j<CELL; j++) - for (i=0; i<CELL; i++) - if (i&j&1) - drawblob((x*CELL+i), (y*CELL+j), 0x80, 0x80, 0x80); - } - else - { - for (j=0; j<CELL; j++) - for (i=0; i<CELL; i++) - if (!(i&j&1)) - drawblob((x*CELL+i), (y*CELL+j), 0x80, 0x80, 0x80); - } - } - else if (bmap[y][x]==WL_WALLELEC) - { - for (j=0; j<CELL; j++) - for (i=0; i<CELL; i++) - { - if (!((y*CELL+j)%2) && !((x*CELL+i)%2)) - drawblob((x*CELL+i), (y*CELL+j), PIXR(pc), PIXG(pc), PIXB(pc)); - else - drawblob((x*CELL+i), (y*CELL+j), 0x80, 0x80, 0x80); - } - } - else if (bmap[y][x]==WL_EHOLE) - { - if (emap[y][x]) - { - for (j=0; j<CELL; j++) - for (i=0; i<CELL; i++) - drawblob((x*CELL+i), (y*CELL+j), 0x24, 0x24, 0x24); - for (j=0; j<CELL; j+=2) - for (i=0; i<CELL; i+=2) - vid[(y*CELL+j)*(XRES+BARSIZE)+(x*CELL+i)] = PIXPACK(0x000000); - } - else - { - for (j=0; j<CELL; j+=2) - for (i=0; i<CELL; i+=2) - drawblob((x*CELL+i), (y*CELL+j), 0x24, 0x24, 0x24); - } - } - } if (wtypes[wt].eglow && emap[y][x]) { // glow if electrified |