summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/l_debug.cc
diff options
context:
space:
mode:
authorAdam Borowski <kilobyte@angband.pl>2011-12-28 02:43:54 +0100
committerAdam Borowski <kilobyte@angband.pl>2011-12-28 02:43:54 +0100
commit7b3785d07791141787a0eac6137cb5c98e1d210c (patch)
treeeee9a6aa9715f1569fddc102a15f578df2138902 /crawl-ref/source/l_debug.cc
parent2cf8a18928f1c553efb5dffb1ab5b76b50731370 (diff)
parentefb6b1fd7b0c5027acd6d6ecede9bb34dfbea356 (diff)
downloadcrawl-ref-7b3785d07791141787a0eac6137cb5c98e1d210c.tar.gz
crawl-ref-7b3785d07791141787a0eac6137cb5c98e1d210c.zip
Merge branch 'master' into portal_branches
Diffstat (limited to 'crawl-ref/source/l_debug.cc')
-rw-r--r--crawl-ref/source/l_debug.cc9
1 files changed, 3 insertions, 6 deletions
diff --git a/crawl-ref/source/l_debug.cc b/crawl-ref/source/l_debug.cc
index 24c6d6b972..b8f9058f1c 100644
--- a/crawl-ref/source/l_debug.cc
+++ b/crawl-ref/source/l_debug.cc
@@ -26,9 +26,7 @@
#include "place.h"
#include "religion.h"
#include "stairs.h"
-#ifdef USE_TILE
- #include "tileview.h"
-#endif
+#include "tileview.h"
#include "view.h"
#include "wiz-dgn.h"
@@ -87,11 +85,9 @@ LUAFN(debug_generate_level)
no_messages mx;
env.map_knowledge.init(map_cell());
los_changed();
-#ifdef USE_TILE
tile_init_default_flavour();
tile_clear_flavour();
tile_new_level(true);
-#endif
builder(you.absdepth0, lua_isboolean(ls, 1)? lua_toboolean(ls, 1) : true);
return (0);
}
@@ -144,7 +140,7 @@ LUAFN(debug_bouncy_beam)
beam.draw_delay = 0;
if (findray)
- beam.chose_ray = find_ray(source, target, beam.ray);
+ beam.chose_ray = find_ray(source, target, beam.ray, opc_solid_see);
beam.name = "debug lightning beam";
beam.short_name = "DEBUG";
@@ -330,6 +326,7 @@ static const char* disablements[] =
"player_regen",
"hunger",
"death",
+ "delay",
};
LUAFN(debug_disable)