diff options
| author | Haru <haru@dotalux.com> | 2019-09-22 20:02:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-22 20:02:01 +0200 |
| commit | 76896e85057760d7f412293b912dce77d9016415 (patch) | |
| tree | bd0dc1ae096fd92ea852ef81600ce5da5e5a24a5 /src/map/homunculus.h | |
| parent | 63d93d45038ab070dcb8e4714fb72c99fdcf2e9c (diff) | |
| parent | 4e093cebcb83bab380dc655bb951de1e2d14c73c (diff) | |
| download | hercules-76896e85057760d7f412293b912dce77d9016415.tar.gz hercules-76896e85057760d7f412293b912dce77d9016415.tar.bz2 hercules-76896e85057760d7f412293b912dce77d9016415.tar.xz hercules-76896e85057760d7f412293b912dce77d9016415.zip | |
Merge pull request #2524 from MishimaHaruna/homunculus-fixes
Homunculus related fixes
Diffstat (limited to 'src/map/homunculus.h')
| -rw-r--r-- | src/map/homunculus.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/homunculus.h b/src/map/homunculus.h index 502fb0b7f..2914a26cc 100644 --- a/src/map/homunculus.h +++ b/src/map/homunculus.h @@ -133,7 +133,7 @@ struct homun_skill_tree_entry { short id; unsigned char max; unsigned char joblv; - short intimacylv; + int intimacylv; struct { short id; unsigned char lv; @@ -167,7 +167,7 @@ struct homunculus_interface { enum homun_type (*class2type) (int class_); void (*damaged) (struct homun_data *hd); int (*dead) (struct homun_data *hd); - int (*vaporize) (struct map_session_data *sd, enum homun_state flag); + int (*vaporize) (struct map_session_data *sd, enum homun_state state, bool force); int (*delete) (struct homun_data *hd, int emote); int (*checkskill) (struct homun_data *hd, uint16 skill_id); int (*calc_skilltree) (struct homun_data *hd, int flag_evolve); @@ -190,7 +190,7 @@ struct homunculus_interface { int (*change_name) (struct map_session_data *sd, const char *name); bool (*change_name_ack) (struct map_session_data *sd, const char *name, int flag); int (*db_search) (int key,int type); - bool (*create) (struct map_session_data *sd, const struct s_homunculus *hom); + bool (*create) (struct map_session_data *sd, const struct s_homunculus *hom, bool is_new); void (*init_timers) (struct homun_data * hd); bool (*call) (struct map_session_data *sd); bool (*recv_data) (int account_id, const struct s_homunculus *sh, int flag); |