diff options
Diffstat (limited to 'src/map/magic-expr.hpp')
| -rw-r--r-- | src/map/magic-expr.hpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/map/magic-expr.hpp b/src/map/magic-expr.hpp index 4d2ea3c..e7f27dc 100644 --- a/src/map/magic-expr.hpp +++ b/src/map/magic-expr.hpp @@ -60,7 +60,7 @@ int magic_eval_int(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); +bool map_is_solid(int m, int x, int y); expr_t *magic_new_expr(EXPR ty); @@ -70,14 +70,16 @@ void magic_copy_var(val_t *dest, val_t *src); void magic_random_location(location_t *dest, area_t *area); -int // ret -1: not a string, ret 1: no such item, ret 0: OK +// ret -1: not a string, ret 1: no such item, ret 0: OK +int 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; } +#define GET_ARG_ITEM(index, dest, stackable) \ + switch (magic_find_item(args, index, &dest, &stackable)) \ + { \ + case -1: return 1; \ + case 1: return 0; \ + default: break; \ + } int magic_location_in_area(int m, int x, int y, area_t *area); |