diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-12-03 19:37:09 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-03 19:37:09 +0300 |
| commit | e1453434af18b30119114077dfc52d27ad196cef (patch) | |
| tree | 7f342a4bf53777ed740ce6600b0272bb09386e55 /src/map/intif.c | |
| parent | 17420ee563282ba1791a77c55ede9d8f5f504ae5 (diff) | |
| parent | 2150e64f1df5f5586274a1fde49029c4444db641 (diff) | |
| download | hercules-e1453434af18b30119114077dfc52d27ad196cef.tar.gz hercules-e1453434af18b30119114077dfc52d27ad196cef.tar.bz2 hercules-e1453434af18b30119114077dfc52d27ad196cef.tar.xz hercules-e1453434af18b30119114077dfc52d27ad196cef.zip | |
Merge pull request #1522 from HerculesWS/jobclass-mapid-cleanup
Job Class vs Job MapID cleanup
Diffstat (limited to 'src/map/intif.c')
| -rw-r--r-- | src/map/intif.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/intif.c b/src/map/intif.c index 55a5f8340..10a9ea8a9 100644 --- a/src/map/intif.c +++ b/src/map/intif.c @@ -693,7 +693,7 @@ int intif_guild_leave(int guild_id,int account_id,int char_id,int flag,const cha } //Update request / Lv online status of the guild members -int intif_guild_memberinfoshort(int guild_id,int account_id,int char_id,int online,int lv,int class_) +int intif_guild_memberinfoshort(int guild_id, int account_id, int char_id, int online, int lv, int16 class) { if (intif->CheckForCharServer()) return 0; @@ -704,7 +704,7 @@ int intif_guild_memberinfoshort(int guild_id,int account_id,int char_id,int onli WFIFOL(inter_fd,10) = char_id; WFIFOB(inter_fd,14) = online; WFIFOW(inter_fd,15) = lv; - WFIFOW(inter_fd,17) = class_; + WFIFOW(inter_fd,17) = class; WFIFOSET(inter_fd,19); return 0; } @@ -1359,7 +1359,7 @@ void intif_parse_GuildMemberInfoChanged(int fd) { case GMI_HAIR: g->member[idx].hair = RFIFOW(fd,18); break; case GMI_HAIR_COLOR: g->member[idx].hair_color = RFIFOW(fd,18); break; case GMI_GENDER: g->member[idx].gender = RFIFOW(fd,18); break; - case GMI_CLASS: g->member[idx].class_ = RFIFOW(fd,18); break; + case GMI_CLASS: g->member[idx].class = RFIFOW(fd,18); break; case GMI_LEVEL: g->member[idx].lv = RFIFOW(fd,18); break; } } |