diff options
| author | Led Mitz <smoothshifter@tuta.io> | 2023-04-03 01:58:15 +0000 |
|---|---|---|
| committer | Led Mitz <smoothshifter@tuta.io> | 2023-04-03 01:58:15 +0000 |
| commit | 4887981f15cdae7f19d06471c54e6754e74e6567 (patch) | |
| tree | 520bcb4e917054af845d79c070cd775ce48a6150 /src/ast | |
| parent | 74ad8e7c214e6ba60fbbeb0f316373e0420460be (diff) | |
| parent | 7980f4d21956314e284448f7dcedd58f9c23b355 (diff) | |
| download | tmwa-4887981f15cdae7f19d06471c54e6754e74e6567.tar.gz tmwa-4887981f15cdae7f19d06471c54e6754e74e6567.tar.bz2 tmwa-4887981f15cdae7f19d06471c54e6754e74e6567.tar.xz tmwa-4887981f15cdae7f19d06471c54e6754e74e6567.zip | |
Merge branch 'item_mode' into 'master'
Item mode
See merge request legacy/tmwa!246
Diffstat (limited to 'src/ast')
| -rw-r--r-- | src/ast/item.cpp | 1 | ||||
| -rw-r--r-- | src/ast/item.hpp | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/ast/item.cpp b/src/ast/item.cpp index d27e231..623f5c6 100644 --- a/src/ast/item.cpp +++ b/src/ast/item.cpp @@ -142,6 +142,7 @@ namespace item SPAN_EXTRACT(TRY_UNWRAP(lex_nonscript(lr, false), return EOL_ERROR(lr)), item.wlv); SPAN_EXTRACT(TRY_UNWRAP(lex_nonscript(lr, false), return EOL_ERROR(lr)), item.elv); SPAN_EXTRACT(TRY_UNWRAP(lex_nonscript(lr, false), return EOL_ERROR(lr)), item.view); + SPAN_EXTRACT(TRY_UNWRAP(lex_nonscript(lr, false), return EOL_ERROR(lr)), item.mode); item.use_script = TRY(lex_script(lr)); item.equip_script = TRY(lex_script(lr)); ItemOrComment rv = std::move(item); diff --git a/src/ast/item.hpp b/src/ast/item.hpp index c772655..90d51a1 100644 --- a/src/ast/item.hpp +++ b/src/ast/item.hpp @@ -63,6 +63,8 @@ namespace item Spanned<int> wlv; Spanned<int> elv; Spanned<ItemLook> view; + Spanned<ItemMode> mode; + ast::script::ScriptBody use_script; ast::script::ScriptBody equip_script; }; |