Fix broken ziggurat (David).

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7748 c06c8d41-db1a-0410-9941-cceddc491573

2 files changed, 4 insertions, 1 deletions

diff --git a/crawl-ref/source/dat/clua/point.lua b/crawl-ref/source/dat/clua/point.lua
index 594ab6b984..b750372197 100644
--- a/crawl-ref/source/dat/clua/point.lua
+++ b/crawl-ref/source/dat/clua/point.lua
@@ -34,6 +34,9 @@ point_metatable.__add = function (a, b)
                           if type(b) == "number" then
                             return dgn.point(a.x + b, a.y + b)
                           else
+                            if a == nil or b == nil then
+                              error("Nil points: " .. debug.traceback())
+                            end
                             return dgn.point(a.x + b.x, a.y + b.y)
                           end
                         end
diff --git a/crawl-ref/source/dat/clua/ziggurat.lua b/crawl-ref/source/dat/clua/ziggurat.lua
index d9a55c2402..af47c26bb4 100644
--- a/crawl-ref/source/dat/clua/ziggurat.lua
+++ b/crawl-ref/source/dat/clua/ziggurat.lua
@@ -659,7 +659,7 @@ local function ziggurat_rectangle_builder(e)
   end
 
   ziggurat_stairs(entry, exit)
-  ziggurat_furnish(c, entry, exit)
+  ziggurat_furnish(dgn.point(cx, cy), entry, exit)
 end
 
 -- builds elliptic ziggurat maps