summaryrefslogtreecommitdiff
path: root/src/map/magic-expr-eval.hpp
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2013-06-29 23:23:43 -0700
committerBen Longbons <b.r.longbons@gmail.com>2013-08-01 15:19:45 -0700
commit3b98f3439e33b15bba2036c402f9925340fdb2b9 (patch)
treef6a59330bb747d9cc64f5f83d06e7f76dc01d540 /src/map/magic-expr-eval.hpp
parent8d1480c1be7c9741876d89008277a2b3629a4d01 (diff)
downloadtmwa-3b98f3439e33b15bba2036c402f9925340fdb2b9.tar.gz
tmwa-3b98f3439e33b15bba2036c402f9925340fdb2b9.tar.bz2
tmwa-3b98f3439e33b15bba2036c402f9925340fdb2b9.tar.xz
tmwa-3b98f3439e33b15bba2036c402f9925340fdb2b9.zip
Poison std::string and use the various string classes
Diffstat (limited to 'src/map/magic-expr-eval.hpp')
-rw-r--r--src/map/magic-expr-eval.hpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/magic-expr-eval.hpp b/src/map/magic-expr-eval.hpp
index 9c9591b..76b86f8 100644
--- a/src/map/magic-expr-eval.hpp
+++ b/src/map/magic-expr-eval.hpp
@@ -7,7 +7,7 @@
/* Helper definitions for dealing with functions and operations */
-int magic_signature_check(const char *opname, const char *funname, const char *signature,
+int magic_signature_check(ZString opname, ZString funname, ZString signature,
int args_nr, val_t *args, int line, int column);
void magic_area_rect(map_local **m, int *x, int *y, int *width, int *height,
@@ -15,7 +15,7 @@ void magic_area_rect(map_local **m, int *x, int *y, int *width, int *height,
#define ARGINT(x) args[x].v.v_int
#define ARGDIR(x) args[x].v.v_dir
-#define ARGSTR(x) args[x].v.v_string
+#define ARGSTR(x) ZString(args[x].v.v_string)
#define ARGENTITY(x) args[x].v.v_entity
#define ARGLOCATION(x) args[x].v.v_location
#define ARGAREA(x) args[x].v.v_area