summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2019-08-26 01:00:16 +0200
committerGitHub <noreply@github.com>2019-08-26 01:00:16 +0200
commit7c25f7ea7c575cfdb025a688a635b89ef5fae1c1 (patch)
treeda24031ab6dbcd1fc37c7182501ac1851416d73e
parentad7ebbedf81c54fdb43f4b4e41aed9fd48543e47 (diff)
parent00aa0bc9b0c8dce90a5cb682838c09439fdbdd84 (diff)
downloadhercules-7c25f7ea7c575cfdb025a688a635b89ef5fae1c1.tar.gz
hercules-7c25f7ea7c575cfdb025a688a635b89ef5fae1c1.tar.bz2
hercules-7c25f7ea7c575cfdb025a688a635b89ef5fae1c1.tar.xz
hercules-7c25f7ea7c575cfdb025a688a635b89ef5fae1c1.zip
Merge pull request #2514 from Emistry/pc_addautobonus
Fix equipment auto bonus trigger
-rw-r--r--src/map/pc.c2
-rw-r--r--src/map/pc.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/map/pc.c b/src/map/pc.c
index 84d49e1db..1e7ac5817 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -2268,7 +2268,7 @@ static int pc_bonus_item_drop(struct s_add_drop *drop, const short max, int id,
return 1;
}
-static int pc_addautobonus(struct s_autobonus *bonus, char max, const char *bonus_script, short rate, unsigned int dur, short flag, const char *other_script, unsigned short pos, bool onskill)
+static int pc_addautobonus(struct s_autobonus *bonus, char max, const char *bonus_script, short rate, unsigned int dur, short flag, const char *other_script, unsigned int pos, bool onskill)
{
int i;
diff --git a/src/map/pc.h b/src/map/pc.h
index f1b9e5d1a..0770e13cb 100644
--- a/src/map/pc.h
+++ b/src/map/pc.h
@@ -964,7 +964,7 @@ END_ZEROED_BLOCK; /* End */
int (*updateweightstatus) (struct map_session_data *sd);
- int (*addautobonus) (struct s_autobonus *bonus,char max,const char *bonus_script,short rate,unsigned int dur,short atk_type,const char *o_script,unsigned short pos,bool onskill);
+ int (*addautobonus) (struct s_autobonus *bonus,char max,const char *bonus_script,short rate,unsigned int dur,short atk_type,const char *o_script,unsigned int pos,bool onskill);
int (*exeautobonus) (struct map_session_data* sd,struct s_autobonus *bonus);
int (*endautobonus) (int tid, int64 tick, int id, intptr_t data);
int (*delautobonus) (struct map_session_data* sd,struct s_autobonus *bonus,char max,bool restore);