diff options
| author | Robert Vollmert <rvollmert@gmx.net> | 2009-12-02 13:02:40 +0100 |
|---|---|---|
| committer | Robert Vollmert <rvollmert@gmx.net> | 2009-12-02 13:54:21 +0100 |
| commit | 9a0d6db186259aae900f30afb26322640487e97d (patch) | |
| tree | 934075b3ae5a01a3785cbdb0381f68bd12426899 | |
| parent | 8543fdca766cf69eb39b69a199496cb0779501df (diff) | |
| download | crawl-ref-9a0d6db186259aae900f30afb26322640487e97d.tar.gz crawl-ref-9a0d6db186259aae900f30afb26322640487e97d.zip | |
Remove FPROP_FORCE_EXCLUDE.
It's not used anymore, and has issues, such as revealing
information on the level map.
| -rw-r--r-- | crawl-ref/docs/develop/levels/syntax.txt | 3 | ||||
| -rw-r--r-- | crawl-ref/source/fprop.h | 2 | ||||
| -rw-r--r-- | crawl-ref/source/initfile.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/mapdef.cc | 4 |
4 files changed, 2 insertions, 9 deletions
diff --git a/crawl-ref/docs/develop/levels/syntax.txt b/crawl-ref/docs/develop/levels/syntax.txt index 74eb2fea4d..3c741847b0 100644 --- a/crawl-ref/docs/develop/levels/syntax.txt +++ b/crawl-ref/docs/develop/levels/syntax.txt @@ -942,9 +942,6 @@ KPROP: x = bloody * "bloody": Causes features to appear as though splattered with blood. This should be used very, very sparingly! - * "force_exclude": Forces a single grid square or feature to be an - exclusion in auto-explore and automatic travel. Will be coloured - red in the overmap. * "no_cloud_gen": Prevents clouds from being generated over this feature (usually lava). Does not stop fog generators or clouds entering from nearby squares. diff --git a/crawl-ref/source/fprop.h b/crawl-ref/source/fprop.h index e6fe37e9a9..04898519f3 100644 --- a/crawl-ref/source/fprop.h +++ b/crawl-ref/source/fprop.h @@ -15,7 +15,7 @@ enum feature_property_type FPROP_VAULT = (1 << 4), FPROP_HIGHLIGHT = (1 << 5), // Highlight grids on the X map for debugging. // NOTE: Bloody floor and sanctuary are exclusive. - FPROP_FORCE_EXCLUDE = (1 << 6), + FPROP_UNUSED = (1 << 6), // used to be force_exclude FPROP_NO_CLOUD_GEN = (1 << 7), FPROP_NO_RTELE_INTO = (1 << 8), FPROP_NO_CTELE_INTO = (1 << 9), diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc index 5e04c155f3..e363b0a883 100644 --- a/crawl-ref/source/initfile.cc +++ b/crawl-ref/source/initfile.cc @@ -222,8 +222,6 @@ int str_to_fprop ( const std::string &str) { if (str == "bloody") return (FPROP_BLOODY); - if (str == "force_exclude") - return (FPROP_FORCE_EXCLUDE); if (str == "no_cloud_gen") return (FPROP_NO_CLOUD_GEN); if (str == "no_rtele_into") diff --git a/crawl-ref/source/mapdef.cc b/crawl-ref/source/mapdef.cc index 2d04e483be..bf6c7c55f3 100644 --- a/crawl-ref/source/mapdef.cc +++ b/crawl-ref/source/mapdef.cc @@ -492,9 +492,7 @@ void map_lines::apply_grid_overlay(const coord_def &c) dgn_set_grid_colour_at(gc, colour); const int property = (*overlay)(x, y).property; - if (testbits(property, FPROP_FORCE_EXCLUDE)) - set_exclude(gc, 0, false, true); - else if (property >= FPROP_BLOODY) + if (property >= FPROP_BLOODY) // Over-ride whatever property is already there. env.pgrid(gc) |= property; #ifdef USE_TILE |