diff options
| author | shennetsind <ind@henn.et> | 2014-01-09 17:25:53 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2014-01-09 17:25:53 -0200 |
| commit | 56649bda4b2f62cf42847830546b5856234b3178 (patch) | |
| tree | 1ccf6f09b6620d95a177468bbee9cd0d428c1218 /src/map/script.h | |
| parent | b79a9d7efa9213e3c791ec356bf21b712878d1aa (diff) | |
| parent | 763102b807239809d318add3fae5629bfd50a78b (diff) | |
| download | hercules-56649bda4b2f62cf42847830546b5856234b3178.tar.gz hercules-56649bda4b2f62cf42847830546b5856234b3178.tar.bz2 hercules-56649bda4b2f62cf42847830546b5856234b3178.tar.xz hercules-56649bda4b2f62cf42847830546b5856234b3178.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/map/script.h')
| -rw-r--r-- | src/map/script.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/map/script.h b/src/map/script.h index 8076ea02e..2f7499569 100644 --- a/src/map/script.h +++ b/src/map/script.h @@ -85,6 +85,8 @@ struct eri; #define script_isstring(st,i) data_isstring(script_getdata((st),(i))) #define script_isint(st,i) data_isint(script_getdata((st),(i))) +#define script_isstringtype(st,i) data_isstring(script->get_val((st), script_getdata((st),(i)))) +#define script_isinttype(st,i) data_isint(script->get_val((st), script_getdata((st),(i)))) #define script_getnum(st,val) (script->conv_num((st), script_getdata((st),(val)))) #define script_getstr(st,val) (script->conv_str((st), script_getdata((st),(val)))) @@ -548,7 +550,7 @@ struct script_interface { TBL_PC *(*rid2sd) (struct script_state *st); void (*detach_rid) (struct script_state* st); struct script_data* (*push_val)(struct script_stack* stack, enum c_op type, int val, struct DBMap** ref); - void (*get_val) (struct script_state* st, struct script_data* data); + struct script_data *(*get_val) (struct script_state* st, struct script_data* data); void* (*get_val2) (struct script_state* st, int uid, struct DBMap** ref); struct script_data* (*push_str) (struct script_stack* stack, enum c_op type, char* str); struct script_data* (*push_copy) (struct script_stack* stack, int pos); |