diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2011-10-15 13:52:24 +0200 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2011-11-04 18:49:49 +0100 |
| commit | c346361417241d0e4d7531ed65a1ca5b4f497139 (patch) | |
| tree | 8c76c3b32dac858b2a36df7d032ff50e49545384 /crawl-ref/source/cluautil.h | |
| parent | f4a9aed257bbdd264fb1ef43e7b29b3cc599cd65 (diff) | |
| download | crawl-ref-c346361417241d0e4d7531ed65a1ca5b4f497139.tar.gz crawl-ref-c346361417241d0e4d7531ed65a1ca5b4f497139.zip | |
Get rid of level_type, unify BRANCH_*, LEVEL_* and portal vaults.
Diffstat (limited to 'crawl-ref/source/cluautil.h')
| -rw-r--r-- | crawl-ref/source/cluautil.h | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/crawl-ref/source/cluautil.h b/crawl-ref/source/cluautil.h index 648ce86e0e..7026eefd7f 100644 --- a/crawl-ref/source/cluautil.h +++ b/crawl-ref/source/cluautil.h @@ -166,15 +166,11 @@ void push_item(lua_State *ls, item_def *item); #define FEAT(f, pos) \ dungeon_feature_type f = check_lua_feature(ls, pos) -#define LEVEL(lev, br, pos) \ -const char *level_name = luaL_checkstring(ls, pos); \ -level_area_type lev = str_to_level_area_type(level_name); \ -if (lev == NUM_LEVEL_AREA_TYPES) \ -luaL_error(ls, "Expected level name"); \ -const char *branch_name = luaL_checkstring(ls, pos); \ -branch_type br = str_to_branch(branch_name); \ -if (lev == LEVEL_DUNGEON && br == NUM_BRANCHES) \ -luaL_error(ls, "Expected branch name"); +#define LEVEL(br, pos) \ + const char *branch_name = luaL_checkstring(ls, pos); \ + branch_type br = str_to_branch(branch_name); \ + if (br == NUM_BRANCHES) \ + luaL_error(ls, "Expected branch name"); #define MAP(ls, n, var) \ map_def *var = *(map_def **) luaL_checkudata(ls, n, MAP_METATABLE) |