diff options
author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-08-04 15:39:17 +0000 |
---|---|---|
committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-08-04 15:39:17 +0000 |
commit | 831eb7a1814410a7f71e2d4cdc2b685f70b46a33 (patch) | |
tree | 4363f8a00711431b0757cd348134f7205f7d6568 /crawl-ref | |
parent | 40e2d7d94c4dff6c8e9a0b31139d86adcbb91e7c (diff) | |
download | crawl-ref-831eb7a1814410a7f71e2d4cdc2b685f70b46a33.tar.gz crawl-ref-831eb7a1814410a7f71e2d4cdc2b685f70b46a33.zip |
[1767432] Fixed labyrinth with sealed exit.
Increased minimum distance of labyrinth entrance from center.
Fixed gly_point() not working correctly because map transforms were not
applied.
Fixed lexer ignoring (and echoing) newlines on marker continuation lines.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1963 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
-rw-r--r-- | crawl-ref/source/acr.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/dat/lab.des | 3 | ||||
-rw-r--r-- | crawl-ref/source/dungeon.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/mapdef.cc | 1 | ||||
-rw-r--r-- | crawl-ref/source/util/levcomp.lpp | 1 |
5 files changed, 7 insertions, 2 deletions
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc index e121d9f414..95cd492391 100644 --- a/crawl-ref/source/acr.cc +++ b/crawl-ref/source/acr.cc @@ -2789,7 +2789,7 @@ static bool initialise(void) you.unique_creatures.init(false); you.unique_items.init(UNIQ_NOT_EXISTS); - // initialize tag system before we try loading anything! + // initialise tag system before we try loading anything! tag_init(); // set up the Lua interpreter for the dungeon builder. diff --git a/crawl-ref/source/dat/lab.des b/crawl-ref/source/dat/lab.des index 72056aa1d4..cbb61c75a8 100644 --- a/crawl-ref/source/dat/lab.des +++ b/crawl-ref/source/dat/lab.des @@ -134,6 +134,9 @@ SUBST: d = c, e = ., f = c. SUBST: g = c, h = . SUBST: k = <, l = ., m = ., i = ., j = . KMONS: < = minotaur + +validate {{ return has_exit_from_glyph('<') }} + MAP ............... .ccccccccccccc. diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc index 18c4f9ba5e..a5acfb7be8 100644 --- a/crawl-ref/source/dungeon.cc +++ b/crawl-ref/source/dungeon.cc @@ -5625,7 +5625,7 @@ static bool has_vault_in_radius(const coord_def &pos, int radius, static coord_def labyrinth_find_entry_point(const dgn_region ®, const coord_def &end) { - const int min_distance = 25 * 25; + const int min_distance = 35 * 35; // Try many times. for (int i = 0; i < 2000; ++i) { diff --git a/crawl-ref/source/mapdef.cc b/crawl-ref/source/mapdef.cc index e5049c71cf..32f3afeb15 100644 --- a/crawl-ref/source/mapdef.cc +++ b/crawl-ref/source/mapdef.cc @@ -1277,6 +1277,7 @@ std::string map_def::validate_map_def() if (!err.empty()) return (err); + resolve(); test_lua_validate(true); if (orient == MAP_FLOAT || is_minivault()) diff --git a/crawl-ref/source/util/levcomp.lpp b/crawl-ref/source/util/levcomp.lpp index f831de576a..c86d4d9396 100644 --- a/crawl-ref/source/util/levcomp.lpp +++ b/crawl-ref/source/util/levcomp.lpp @@ -169,6 +169,7 @@ NSPACE [^\ \t\r\n] settext(); return STRING; } +<TOEOL>\r?\n ; ^[ \t]*#.* ; |