diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2011-12-28 02:43:54 +0100 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2011-12-28 02:43:54 +0100 |
| commit | 7b3785d07791141787a0eac6137cb5c98e1d210c (patch) | |
| tree | eee9a6aa9715f1569fddc102a15f578df2138902 /crawl-ref/source/l_dgn.cc | |
| parent | 2cf8a18928f1c553efb5dffb1ab5b76b50731370 (diff) | |
| parent | efb6b1fd7b0c5027acd6d6ecede9bb34dfbea356 (diff) | |
| download | crawl-ref-7b3785d07791141787a0eac6137cb5c98e1d210c.tar.gz crawl-ref-7b3785d07791141787a0eac6137cb5c98e1d210c.zip | |
Merge branch 'master' into portal_branches
Diffstat (limited to 'crawl-ref/source/l_dgn.cc')
| -rw-r--r-- | crawl-ref/source/l_dgn.cc | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/crawl-ref/source/l_dgn.cc b/crawl-ref/source/l_dgn.cc index c425a7a725..2799774bcb 100644 --- a/crawl-ref/source/l_dgn.cc +++ b/crawl-ref/source/l_dgn.cc @@ -23,13 +23,11 @@ #include "shout.h" #include "spl-util.h" #include "state.h" -#ifdef USE_TILE - #include "tiledef-dngn.h" - #include "tileview.h" -#endif +#include "tiledef-dngn.h" +#include "tileview.h" #include "view.h" -const char *VAULT_PLACEMENT_METATABLE = "crawl.vault-placement"; +static const char *VAULT_PLACEMENT_METATABLE = "crawl.vault-placement"; /////////////////////////////////////////////////////////////////////////// // Lua dungeon bindings (in the dgn table). @@ -1121,7 +1119,6 @@ static int dgn_floor_halo(lua_State *ls) } } -#ifdef USE_TILE unsigned int tile = get_tile_idx(ls, 3); if (!tile) return (0); @@ -1137,7 +1134,6 @@ static int dgn_floor_halo(lua_State *ls) } tile_floor_halo(target, tile); -#endif return (0); } |