summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source
diff options
context:
space:
mode:
authorzelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>2008-11-21 12:45:56 +0000
committerzelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>2008-11-21 12:45:56 +0000
commit47a3ee47e2aca536deaa2d0fc0e3685d075097b0 (patch)
treede6acc39079dbb236cab12cbb219c8fe4ec9e065 /crawl-ref/source
parent9ba2e9d569ec944a3078a58b37582084631d73ac (diff)
downloadcrawl-ref-47a3ee47e2aca536deaa2d0fc0e3685d075097b0.tar.gz
crawl-ref-47a3ee47e2aca536deaa2d0fc0e3685d075097b0.zip
Third argument to dgn.grid() is optional. Fixed error that happened
in placing timed messaging markers (including labyrinth entrances). git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7525 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source')
-rw-r--r--crawl-ref/source/luadgn.cc9
1 files changed, 6 insertions, 3 deletions
diff --git a/crawl-ref/source/luadgn.cc b/crawl-ref/source/luadgn.cc
index 11d4ccfac1..fc5161071c 100644
--- a/crawl-ref/source/luadgn.cc
+++ b/crawl-ref/source/luadgn.cc
@@ -910,9 +910,12 @@ static int dgn_grid(lua_State *ls)
{
COORDS(c, 1, 2);
- const dungeon_feature_type feat = _get_lua_feature(ls, 3);
- if (feat)
- grd(c) = feat;
+ if (!lua_isnone(ls, 3))
+ {
+ const dungeon_feature_type feat = _get_lua_feature(ls, 3);
+ if (feat)
+ grd(c) = feat;
+ }
PLUARET(number, grd(c));
}