diff options
| author | Haru <haru@dotalux.com> | 2019-02-11 02:00:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-11 02:00:58 +0100 |
| commit | 2d8a44b753832610d23678629127369f5db576a3 (patch) | |
| tree | 258e78c458642cc017837f674b0d23255ac49bf4 /src/char/int_guild.c | |
| parent | 68126f7d762e001b1a34cfe5e0a340db9c7d9da8 (diff) | |
| parent | dbaa9ac111496fdfde9948d5cb15a0b052843b3f (diff) | |
| download | hercules-2d8a44b753832610d23678629127369f5db576a3.tar.gz hercules-2d8a44b753832610d23678629127369f5db576a3.tar.bz2 hercules-2d8a44b753832610d23678629127369f5db576a3.tar.xz hercules-2d8a44b753832610d23678629127369f5db576a3.zip | |
Merge pull request #2364 from 4144/shortfixes
Change different variables types short to int
Diffstat (limited to 'src/char/int_guild.c')
| -rw-r--r-- | src/char/int_guild.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/char/int_guild.c b/src/char/int_guild.c index 56e1c1ba3..9c0be1629 100644 --- a/src/char/int_guild.c +++ b/src/char/int_guild.c @@ -1060,7 +1060,7 @@ static bool inter_guild_leave(int guild_id, int account_id, int char_id, int fla } // Change member info -static bool inter_guild_update_member_info_short(int guild_id, int account_id, int char_id, int online, int lv, int16 class) +static bool inter_guild_update_member_info_short(int guild_id, int account_id, int char_id, int online, int lv, int class) { // Could speed up by manipulating only guild_member struct guild *g; @@ -1602,7 +1602,7 @@ static int inter_guild_parse_frommap(int fd) case 0x3032: mapif->parse_GuildAddMember(fd, RFIFOL(fd,4), RFIFOP(fd,8)); break; case 0x3033: mapif->parse_GuildMasterChange(fd, RFIFOL(fd,4), RFIFOP(fd,8), RFIFOW(fd,2)-8); break; case 0x3034: mapif->parse_GuildLeave(fd, RFIFOL(fd,2), RFIFOL(fd,6), RFIFOL(fd,10), RFIFOB(fd,14), RFIFOP(fd,15)); break; - case 0x3035: mapif->parse_GuildChangeMemberInfoShort(fd,RFIFOL(fd,2),RFIFOL(fd,6),RFIFOL(fd,10),RFIFOB(fd,14),RFIFOW(fd,15),RFIFOW(fd,17)); break; + case 0x3035: mapif->parse_GuildChangeMemberInfoShort(fd,RFIFOL(fd,2),RFIFOL(fd,6),RFIFOL(fd,10),RFIFOB(fd,14),RFIFOL(fd,15),RFIFOL(fd,19)); break; case 0x3036: mapif->parse_BreakGuild(fd,RFIFOL(fd,2)); break; case 0x3037: mapif->parse_GuildMessage(fd, RFIFOL(fd,4), RFIFOL(fd,8), RFIFOP(fd,12), RFIFOW(fd,2)-12); break; case 0x3039: mapif->parse_GuildBasicInfoChange(fd, RFIFOL(fd,4), RFIFOW(fd,8), RFIFOP(fd,10), RFIFOW(fd,2)-10); break; |