* [Fixed]

- Scripting system screwing up script position after mixing timers with menus. 
- NPC attached AI mobs display as alive when dead. 
- View data not updating after buildin_unitdeadsit. 
[Improved] 
- NPCE_LOADMAP to execute after all (area) objects are sent to the player. 
- Simplified scripting system. sd will now use pointer to the script state itself. 

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7388 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 2 insertions, 2 deletions

diff --git a/src/map/script.h b/src/map/script.h
index d94348e43..85ddc2d6a 100644
--- a/src/map/script.h
+++ b/src/map/script.h
@@ -64,14 +64,14 @@ struct script_state {
 };

 

 struct script_code *parse_script(unsigned char *,int);

-int run_script(struct script_code *rootscript,int pos,int rid,int oid);

+void run_script(struct script_code *rootscript,int pos,int rid,int oid);

 

 int set_var(struct map_session_data *sd, char *name, void *val);

 int conv_num(struct script_state *st,struct script_data *data);

 char* conv_str(struct script_state *st,struct script_data *data);

 void setd_sub(struct script_state *st, struct map_session_data *sd, char *varname, int elem, void *value, struct linkdb_node **ref);

 int run_script_timer(int tid, unsigned int tick, int id, int data);

-int run_script_main(struct script_state *st);

+void run_script_main(struct script_state *st);

 

 struct linkdb_node* script_erase_sleepdb(struct linkdb_node *n);

 void script_free_code(struct script_code* code);