From 59158b8c06e2ec94400b28e09f50b63027325fef Mon Sep 17 00:00:00 2001
From: dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>
Date: Sat, 29 Nov 2008 13:25:03 +0000
Subject: Fix broken timed portals (pointless).

Fix floor/rock colour changes running LOS when entering bazaars before the player is moved to the destination stair.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7685 c06c8d41-db1a-0410-9941-cceddc491573
---
 crawl-ref/source/dat/bazaar.des        | 2 +-
 crawl-ref/source/dat/clua/ziggurat.lua | 2 +-
 crawl-ref/source/luadgn.cc             | 4 ++--
 crawl-ref/source/mapdef.cc             | 1 +
 4 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'crawl-ref/source')

diff --git a/crawl-ref/source/dat/bazaar.des b/crawl-ref/source/dat/bazaar.des
index e9d22cdc23..38e6470433 100644
--- a/crawl-ref/source/dat/bazaar.des
+++ b/crawl-ref/source/dat/bazaar.des
@@ -25,7 +25,7 @@ function bazaar_portal()
     return timed_marker {
                   low=1000, high=1500, msg=messager,
                   disappear='The gate to the bazaar disappears!',
-                  props = { desc = pdesc, dst = 'bazaar'},
+                  desc = pdesc, dst = 'bazaar',
                   floor = 'stone_arch'
               }
   else
diff --git a/crawl-ref/source/dat/clua/ziggurat.lua b/crawl-ref/source/dat/clua/ziggurat.lua
index 64323bee99..de6b152331 100644
--- a/crawl-ref/source/dat/clua/ziggurat.lua
+++ b/crawl-ref/source/dat/clua/ziggurat.lua
@@ -172,7 +172,7 @@ end
 local function set_floor_colour(colour)
   if not zig().level.floor_colour then
     zig().level.floor_colour = colour
-    dgn.change_floor_colour(colour, false)
+    dgn.change_floor_colour(colour)
   end
 end
 
diff --git a/crawl-ref/source/luadgn.cc b/crawl-ref/source/luadgn.cc
index 8f0b3fc1fd..3001efbe10 100644
--- a/crawl-ref/source/luadgn.cc
+++ b/crawl-ref/source/luadgn.cc
@@ -1175,7 +1175,7 @@ static int _lua_colour(lua_State *ls, int ndx,
 static int dgn_change_floor_colour(lua_State *ls)
 {
     const int colour = _lua_colour(ls, 1, BLACK);
-    const bool update_now = _lua_boolean(ls, 2, true);
+    const bool update_now = _lua_boolean(ls, 2, false);
 
     env.floor_colour = (unsigned char) colour;
 
@@ -1187,7 +1187,7 @@ static int dgn_change_floor_colour(lua_State *ls)
 static int dgn_change_rock_colour(lua_State *ls)
 {
     const int colour = _lua_colour(ls, 1, BLACK);
-    const bool update_now = _lua_boolean(ls, 2, true);
+    const bool update_now = _lua_boolean(ls, 2, false);
 
     env.rock_colour = (unsigned char) colour;
 
diff --git a/crawl-ref/source/mapdef.cc b/crawl-ref/source/mapdef.cc
index 617b4c2c8d..c73fe63413 100644
--- a/crawl-ref/source/mapdef.cc
+++ b/crawl-ref/source/mapdef.cc
@@ -10,6 +10,7 @@
 #include <cstdarg>
 #include <cstdio>
 #include <cctype>
+#include <cstdlib>
 #include <algorithm>
 
 #include "AppHdr.h"
-- 
cgit v1.2.3-54-g00ecf