diff options
| author | Jude Brown <bookofjude@users.sourceforge.net> | 2009-11-30 23:19:16 +1000 |
|---|---|---|
| committer | Jude Brown <bookofjude@users.sourceforge.net> | 2009-11-30 23:23:59 +1000 |
| commit | c5ae9840ae67e1f2a7dee0edcd6a63c5768fcdf6 (patch) | |
| tree | 46bd8e0e46cbb3a522d68fe0127e7194eb3a50b1 /crawl-ref/source/util | |
| parent | 6f06963cd90a07d112d7a41e057f8076e250d28c (diff) | |
| download | crawl-ref-c5ae9840ae67e1f2a7dee0edcd6a63c5768fcdf6.tar.gz crawl-ref-c5ae9840ae67e1f2a7dee0edcd6a63c5768fcdf6.zip | |
Revert "Convert dgn.set_border_fill_type to BORDER."
This reverts commit 941444076c26e5e5149c6368a4261d60842fe3ec.
After consultation with Enne, this doesn't really fix the issue, and is
therefore superfluous.
Diffstat (limited to 'crawl-ref/source/util')
| -rw-r--r-- | crawl-ref/source/util/levcomp.lpp | 1 | ||||
| -rw-r--r-- | crawl-ref/source/util/levcomp.ypp | 10 |
2 files changed, 0 insertions, 11 deletions
diff --git a/crawl-ref/source/util/levcomp.lpp b/crawl-ref/source/util/levcomp.lpp index 10db92e912..151ef1418e 100644 --- a/crawl-ref/source/util/levcomp.lpp +++ b/crawl-ref/source/util/levcomp.lpp @@ -249,7 +249,6 @@ LFLOORCOL: { CBEGIN(ARGUMENT); return LFLOORCOL; } LROCKCOL: { CBEGIN(ARGUMENT); return LROCKCOL; } LFLOORTILE: { CBEGIN(ARGUMENT); return LFLOORTILE; } LROCKTILE: { CBEGIN(ARGUMENT); return LROCKTILE; } -BORDER: { CBEGIN(ARGUMENT); return BORDER; } FTILE: { CBEGIN(ITEM_LIST); return FTILE; } RTILE: { CBEGIN(ITEM_LIST); return RTILE; } MONS: { CBEGIN(MNAME); return MONS; } diff --git a/crawl-ref/source/util/levcomp.ypp b/crawl-ref/source/util/levcomp.ypp index ad0335b5a3..f13f102da0 100644 --- a/crawl-ref/source/util/levcomp.ypp +++ b/crawl-ref/source/util/levcomp.ypp @@ -55,7 +55,6 @@ level_range set_range(const char *s, int start, int end) %token <i> NAME DEPTH ORIENT PLACE CHANCE WEIGHT MONS ITEM MARKER COLOUR %token <i> PRELUDE MAIN VALIDATE VETO NSUBST WELCOME LFLAGS BFLAGS %token <i> LFLOORCOL LROCKCOL LFLOORTILE LROCKTILE FTILE RTILE SUBVAULT -%token <i> BORDER %token <i> COMMA COLON PERC INTEGER CHARACTER @@ -165,7 +164,6 @@ metaline : place | lrockcol | lfloortile | lrocktile - | border | ftile | rtile | shuffle @@ -406,14 +404,6 @@ lrocktile : LROCKTILE { } quote_lua_string($2).c_str())); } -border : BORDER { } - | BORDER STRING - { - lc_map.main.add( - yylineno, - make_stringf("border(\"%s\")", - quote_lua_string($2).c_str())); - } ftile : FTILE ftile_specifiers ; |