diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2014-02-08 15:09:25 -0800 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2014-02-08 16:18:22 -0800 |
| commit | 730e5dde39333cb2f63c72a7d7152bee5c4dbb05 (patch) | |
| tree | 510ef3e0ad46ecf1f2bee1fa42f26e6377b51686 /src/map/magic-expr.cpp | |
| parent | 7a15a3efe85837d52d950cc9f895eadcc9eb6be1 (diff) | |
| download | tmwa-730e5dde39333cb2f63c72a7d7152bee5c4dbb05.tar.gz tmwa-730e5dde39333cb2f63c72a7d7152bee5c4dbb05.tar.bz2 tmwa-730e5dde39333cb2f63c72a7d7152bee5c4dbb05.tar.xz tmwa-730e5dde39333cb2f63c72a7d7152bee5c4dbb05.zip | |
Implement AString
Diffstat (limited to 'src/map/magic-expr.cpp')
| -rw-r--r-- | src/map/magic-expr.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/map/magic-expr.cpp b/src/map/magic-expr.cpp index 655da1b..7343e50 100644 --- a/src/map/magic-expr.cpp +++ b/src/map/magic-expr.cpp @@ -6,7 +6,7 @@ #include <cmath> #include "../strings/mstring.hpp" -#include "../strings/fstring.hpp" +#include "../strings/astring.hpp" #include "../strings/zstring.hpp" #include "../strings/vstring.hpp" @@ -93,7 +93,7 @@ void magic_clear_var(val_t *v) } static -FString show_entity(dumb_ptr<block_list> entity) +AString show_entity(dumb_ptr<block_list> entity) { switch (entity->bl_type) { @@ -126,7 +126,7 @@ void stringify(val_t *v, int within_op) {"north"}, {"north-east"}, {"east"}, {"south-east"}, }}; - FString buf; + AString buf; switch (v->ty) { @@ -287,7 +287,7 @@ int fun_add(dumb_ptr<env_t>, val_t *result, const_array<val_t> args) MString m; m += ARGSTR(0); m += ARGSTR(1); - RESULTSTR = dumb_string::copys(FString(m)); + RESULTSTR = dumb_string::copys(AString(m)); result->ty = TYPE::STRING; } return 0; @@ -1677,7 +1677,7 @@ int magic_eval_int(dumb_ptr<env_t> env, dumb_ptr<expr_t> expr) return result.v.v_int; } -FString magic_eval_str(dumb_ptr<env_t> env, dumb_ptr<expr_t> expr) +AString magic_eval_str(dumb_ptr<env_t> env, dumb_ptr<expr_t> expr) { val_t result; magic_eval(env, &result, expr); |