diff options
author | Ben Longbons <b.r.longbons@gmail.com> | 2012-12-16 17:47:51 -0800 |
---|---|---|
committer | Ben Longbons <b.r.longbons@gmail.com> | 2012-12-24 10:02:00 -0800 |
commit | b52127bcbf817ff8285b36d22198b275327e16bb (patch) | |
tree | 7bc596289c011e719168bef846b8cf63bf5d4947 /src/map/magic-expr.hpp | |
parent | 4bd7eeec09629d3c0f900d42c899fe23c69e07b6 (diff) | |
download | tmwa-b52127bcbf817ff8285b36d22198b275327e16bb.tar.gz tmwa-b52127bcbf817ff8285b36d22198b275327e16bb.tar.bz2 tmwa-b52127bcbf817ff8285b36d22198b275327e16bb.tar.xz tmwa-b52127bcbf817ff8285b36d22198b275327e16bb.zip |
Cleanup headers and remove all uses of va_list except logging
Diffstat (limited to 'src/map/magic-expr.hpp')
-rw-r--r-- | src/map/magic-expr.hpp | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/src/map/magic-expr.hpp b/src/map/magic-expr.hpp index bd38ea4..2e9c5ec 100644 --- a/src/map/magic-expr.hpp +++ b/src/map/magic-expr.hpp @@ -1,5 +1,6 @@ #ifndef MAGIC_EXPR_HPP #define MAGIC_EXPR_HPP + #include "magic-interpreter.hpp" #include "magic-interpreter-aux.hpp" @@ -32,14 +33,14 @@ typedef struct fun const char *name; const char *signature; char ret_ty; - int(*fun)(env_t * env, int args_nr, val_t * result, val_t * args); + int(*fun)(env_t *env, int args_nr, val_t *result, val_t *args); } fun_t; typedef struct op { const char *name; const char *signature; - int(*op)(env_t * env, int args_nr, val_t * args); + int(*op)(env_t *env, int args_nr, val_t *args); } op_t; /** @@ -59,37 +60,37 @@ op_t *magic_get_op(char *name, int *index); /** * Evaluates an expression and stores the result in `dest' */ -void magic_eval(env_t * env, val_t * dest, expr_t * expr); +void magic_eval(env_t *env, val_t *dest, expr_t *expr); /** * Evaluates an expression and coerces the result into an integer */ -int magic_eval_int(env_t * env, expr_t * expr); +int magic_eval_int(env_t *env, expr_t *expr); /** * Evaluates an expression and coerces the result into a string */ -char *magic_eval_str(env_t * env, expr_t * expr); +char *magic_eval_str(env_t *env, expr_t *expr); int map_is_solid(int m, int x, int y); expr_t *magic_new_expr(int ty); -void magic_clear_var(val_t * v); +void magic_clear_var(val_t *v); -void magic_copy_var(val_t * dest, val_t * src); +void magic_copy_var(val_t *dest, val_t *src); -void magic_random_location(location_t * dest, area_t * area); +void magic_random_location(location_t *dest, area_t *area); int // ret -1: not a string, ret 1: no such item, ret 0: OK - magic_find_item(val_t * args, int index, struct item *item, int *stackable); + magic_find_item(val_t *args, int index, struct item *item, int *stackable); #define GET_ARG_ITEM(index, dest, stackable) switch (magic_find_item(args, index, &dest, &stackable)) { case -1 : return 1; case 1 : return 0; } -int magic_location_in_area(int m, int x, int y, area_t * area); +int magic_location_in_area(int m, int x, int y, area_t *area); -#endif /* !defined(MAGIC_EXPR_H_) */ +#endif // MAGIC_EXPR_HPP |