diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2012-12-23 14:23:32 -0800 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2012-12-24 10:52:13 -0800 |
| commit | a1a02150d710df2838060445b9ad447689538985 (patch) | |
| tree | 8ae2d08ebbd04df92a2e07f738a614d4f22157f1 /src/map/magic-expr.hpp | |
| parent | 7afacd63fe36eb56b52490ecf22daeaa95657942 (diff) | |
| download | tmwa-a1a02150d710df2838060445b9ad447689538985.tar.gz tmwa-a1a02150d710df2838060445b9ad447689538985.tar.bz2 tmwa-a1a02150d710df2838060445b9ad447689538985.tar.xz tmwa-a1a02150d710df2838060445b9ad447689538985.zip | |
Enumify some more things ... maybe even everything
Diffstat (limited to 'src/map/magic-expr.hpp')
| -rw-r--r-- | src/map/magic-expr.hpp | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/map/magic-expr.hpp b/src/map/magic-expr.hpp index 2e9c5ec..4fd6041 100644 --- a/src/map/magic-expr.hpp +++ b/src/map/magic-expr.hpp @@ -4,17 +4,6 @@ #include "magic-interpreter.hpp" #include "magic-interpreter-aux.hpp" -#ifndef MAX -# define MAX(x,y) (((x)>(y)) ? (x) : (y)) -#endif -#ifndef MIN -# define MIN(x,y) (((x)<(y)) ? (x) : (y)) -#endif - -#ifndef INT_MAX -# define INT_MAX (1<<30) // It's more than that, but this is quite sufficient for our purposes. -#endif - /* * Argument types: * i : int @@ -74,7 +63,7 @@ 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); +expr_t *magic_new_expr(EXPR ty); void magic_clear_var(val_t *v); |