diff options
| author | shennetsind <ind@henn.et> | 2013-10-30 18:38:14 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-10-30 18:38:14 -0200 |
| commit | 7fefefdde386f13f8fefa8db3ffe9ed140c8aa10 (patch) | |
| tree | 715f3b80d75cab3a9c2a3abd04ae4461165e8854 /src/map/script.h | |
| parent | a2405882a4123d6a11d24e895b40148dc7cb455e (diff) | |
| parent | bd04c6c566902d03d633b4dfee5335361155a79e (diff) | |
| download | hercules-7fefefdde386f13f8fefa8db3ffe9ed140c8aa10.tar.gz hercules-7fefefdde386f13f8fefa8db3ffe9ed140c8aa10.tar.bz2 hercules-7fefefdde386f13f8fefa8db3ffe9ed140c8aa10.tar.xz hercules-7fefefdde386f13f8fefa8db3ffe9ed140c8aa10.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/map/script.h')
| -rw-r--r-- | src/map/script.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/map/script.h b/src/map/script.h index c00086ef9..c6cb6070b 100644 --- a/src/map/script.h +++ b/src/map/script.h @@ -287,7 +287,8 @@ enum { MF_PVP_NOCALCRANK, //50 MF_BATTLEGROUND, MF_RESET, - MF_NOTOMB + MF_NOTOMB, + MF_NOCASHSHOP }; /** @@ -535,7 +536,7 @@ struct script_interface { void (*label_add)(int key, int pos); void (*run) (struct script_code *rootscript,int pos,int rid,int oid); void (*run_main) (struct script_state *st); - int (*run_timer) (int tid, unsigned int tick, int id, intptr_t data); + int (*run_timer) (int tid, int64 tick, int id, intptr_t data); int (*set_var) (struct map_session_data *sd, char *name, void *val); void (*stop_instances) (struct script_code *code); void (*free_code) (struct script_code* code); |