diff options
| author | shennetsind <ind@henn.et> | 2013-11-06 21:10:52 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-11-06 21:10:52 -0200 |
| commit | aaf34515fa9d32fae10c71b5b3f615857fd7e55e (patch) | |
| tree | bec3964580ead4ed1d45f7bf51b418753004f16b /src/map/npc.h | |
| parent | eaf04b9a2f0b399027df251c5d19d58d74e24e6a (diff) | |
| parent | 87d7348396af97428638723ae49ca2ff166e4acd (diff) | |
| download | hercules-aaf34515fa9d32fae10c71b5b3f615857fd7e55e.tar.gz hercules-aaf34515fa9d32fae10c71b5b3f615857fd7e55e.tar.bz2 hercules-aaf34515fa9d32fae10c71b5b3f615857fd7e55e.tar.xz hercules-aaf34515fa9d32fae10c71b5b3f615857fd7e55e.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/map/npc.h')
| -rw-r--r-- | src/map/npc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/npc.h b/src/map/npc.h index 5ec201e55..10f3406b4 100644 --- a/src/map/npc.h +++ b/src/map/npc.h @@ -140,7 +140,7 @@ struct npc_interface { struct npc_src_list *src_files; struct unit_data base_ud; /* */ - int (*init) (void); + int (*init) (bool minimal); int (*final) (void); /* */ int (*get_new_npc_id) (void); @@ -218,7 +218,7 @@ struct npc_interface { void (*parse_mob2) (struct spawn_data *mobspawn); const char* (*parse_mob) (char *w1, char *w2, char *w3, char *w4, const char *start, const char *buffer, const char *filepath); const char* (*parse_mapflag) (char *w1, char *w2, char *w3, char *w4, const char *start, const char *buffer, const char *filepath); - void (*parsesrcfile) (const char *filepath, bool runOnInit); + int (*parsesrcfile) (const char *filepath, bool runOnInit); int (*script_event) (struct map_session_data *sd, enum npce_event type); void (*read_event_script) (void); int (*path_db_clear_sub) (DBKey key, DBData *data, va_list args); |