diff options
author | Haru <haru@dotalux.com> | 2018-07-23 01:04:25 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-23 01:04:25 +0200 |
commit | be3209bc5ff1b88314c47a6fdc53d73deaa9e96a (patch) | |
tree | a12e7ac7b7e6ae8410ba170d345a3022da0e51a5 /src/map/pc.c | |
parent | bcaf5eaa9c8ef65068ab5468d7bd13e2df516cab (diff) | |
parent | 6c73aa1b03b04d4d9a2ba9056b8583475856da12 (diff) | |
download | hercules-be3209bc5ff1b88314c47a6fdc53d73deaa9e96a.tar.gz hercules-be3209bc5ff1b88314c47a6fdc53d73deaa9e96a.tar.bz2 hercules-be3209bc5ff1b88314c47a6fdc53d73deaa9e96a.tar.xz hercules-be3209bc5ff1b88314c47a6fdc53d73deaa9e96a.zip |
Merge pull request #2134 from 4144/itemint
Update int fields to using int32
Diffstat (limited to 'src/map/pc.c')
-rw-r--r-- | src/map/pc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/pc.c b/src/map/pc.c index cd49a6dbf..d9e41fde2 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -565,7 +565,7 @@ static int pc_inventory_rental_clear(struct map_session_data *sd) /* assumes i is valid (from default areas where it is called, it is) */ static void pc_rental_expire(struct map_session_data *sd, int i) { - short nameid; + int nameid; nullpo_retv(sd); Assert_retv(i >= 0 && i < MAX_INVENTORY); @@ -2082,7 +2082,7 @@ static int pc_disguise(struct map_session_data *sd, int class) return 1; } -static int pc_bonus_autospell(struct s_autospell *spell, int max, short id, short lv, short rate, short flag, short card_id) +static int pc_bonus_autospell(struct s_autospell *spell, int max, short id, short lv, short rate, short flag, int card_id) { int i; @@ -2120,7 +2120,7 @@ static int pc_bonus_autospell(struct s_autospell *spell, int max, short id, shor return 1; } -static int pc_bonus_autospell_onskill(struct s_autospell *spell, int max, short src_skill, short id, short lv, short rate, short card_id) +static int pc_bonus_autospell_onskill(struct s_autospell *spell, int max, short src_skill, short id, short lv, short rate, int card_id) { int i; |