diff options
| author | shennetsind <ind@henn.et> | 2013-06-15 04:59:43 -0300 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-06-15 04:59:43 -0300 |
| commit | 1dd4882c00b82d9a2f138211dbc2c8c542e2af88 (patch) | |
| tree | cc6f7f610a73cb5a6470a71002f41473e38eebd7 /src/map/script.h | |
| parent | 634bcc63b7adff53d817c19195c4060170eeecfc (diff) | |
| download | hercules-1dd4882c00b82d9a2f138211dbc2c8c542e2af88.tar.gz hercules-1dd4882c00b82d9a2f138211dbc2c8c542e2af88.tar.bz2 hercules-1dd4882c00b82d9a2f138211dbc2c8c542e2af88.tar.xz hercules-1dd4882c00b82d9a2f138211dbc2c8c542e2af88.zip | |
Fixed Bug #7367
http://hercules.ws/board/tracker/issue-7367-error-vdb-destroy-during-shutting-down-of-server/
Signed-off-by: shennetsind <ind@henn.et>
Diffstat (limited to 'src/map/script.h')
| -rw-r--r-- | src/map/script.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/map/script.h b/src/map/script.h index 92a083556..3cfcd9de4 100644 --- a/src/map/script.h +++ b/src/map/script.h @@ -9,6 +9,7 @@ #define NUM_WHISPER_VAR 10 struct map_session_data; +struct eri; extern int potion_flag; //For use on Alchemist improved potions/Potion Pitcher. [Skotlex] extern int potion_hp, potion_per_hp, potion_sp, potion_per_sp; @@ -160,6 +161,7 @@ struct script_state { unsigned freeloop : 1;// used by buildin_freeloop unsigned op2ref : 1;// used by op_2 unsigned npc_item_flag : 1; + unsigned int id; }; struct script_reg { @@ -189,11 +191,11 @@ int set_var(struct map_session_data *sd, char *name, void *val); int run_script_timer(int tid, unsigned int tick, int id, intptr_t data); void run_script_main(struct script_state *st); -void script_stop_sleeptimers(int id); +void script_stop_instances(int id); struct linkdb_node* script_erase_sleepdb(struct linkdb_node *n); void script_free_code(struct script_code* code); void script_free_vars(struct DBMap *storage); -struct script_state* script_alloc_state(struct script_code* script, int pos, int rid, int oid); +struct script_state* script_alloc_state(struct script_code* rootscript, int pos, int rid, int oid); void script_free_state(struct script_state* st); struct DBMap* script_get_label_db(void); @@ -334,6 +336,12 @@ struct str_data_struct { /* script.c interface (incomplete) */ struct script_interface { /* */ + DBMap *st_db; + unsigned int active_scripts; + unsigned int next_id; + struct eri *st_ers; + struct eri *stack_ers; + /* */ struct hQueue *hq; struct hQueueIterator *hqi; int hqs, hqis; |