diff options
| author | Pete Hurst <pete@streamuniverse.tv> | 2013-04-23 10:22:40 +0100 |
|---|---|---|
| committer | Pete Hurst <pete@streamuniverse.tv> | 2013-04-23 10:24:06 +0100 |
| commit | 05d0228198a7123040554d3bb40e3b03f00af777 (patch) | |
| tree | ddcab578b99b39c95edaf287ee133f76a1e78051 /crawl-ref/source/l_dgnbld.cc | |
| parent | 5475aa40c21fa883ab12cec4287b853a9ba2c981 (diff) | |
| download | crawl-ref-05d0228198a7123040554d3bb40e3b03f00af777.tar.gz crawl-ref-05d0228198a7123040554d3bb40e3b03f00af777.zip | |
Fix Lua error in layout_honeycomb and make some depth adjustments
The random_wall_material code had been copied from layout.des but it referenced e.subst (instead of just subst) causing an error. I moved it to a header function in layout_pools.des and also added an anti-Dis check (in layout.des too).
Additionally I enabled layout_honeycomb earlier in D and also in Snake and Dis.
Fixed some whitespace in l_dgnbld.cc.
Diffstat (limited to 'crawl-ref/source/l_dgnbld.cc')
| -rw-r--r-- | crawl-ref/source/l_dgnbld.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/l_dgnbld.cc b/crawl-ref/source/l_dgnbld.cc index 1d996f4479..7a4a199eb5 100644 --- a/crawl-ref/source/l_dgnbld.cc +++ b/crawl-ref/source/l_dgnbld.cc @@ -1247,7 +1247,7 @@ LUAFN(dgn_add_pools) vector<vector<int> > pool_index(size_x, vector<int>(size_y, FORBIDDEN)); for(int x = 0; x < size_x; x++) for(int y = 0; y < size_y; y++) - { + { if(strchr(replace, lines(x + x1, y + y1))) pool_index[x][y] = NO_POOL; } @@ -1342,7 +1342,7 @@ LUAFN(dgn_add_pools) for(int x = 0; x < size_x; x++) for(int y = 0; y < size_y; y++) - { + { int index = pool_index[x][y]; if(index < (int)(pool_glyphs.size())) lines(x + x1, y + y1) = pool_glyphs[index]; |