diff options
| author | MadCamel <madcamel@gmail.com> | 2010-11-27 21:04:08 -0500 |
|---|---|---|
| committer | MadCamel <madcamel@gmail.com> | 2010-11-27 21:04:08 -0500 |
| commit | 882f5e91d20f6c0c9fda9e1ce7cb3cf39c5c06e7 (patch) | |
| tree | b6df7c8a511ac746f3b1427d3b27c5142b75240b /src/map/clif.c | |
| parent | 5c3b1b3ed36194a2d0d23169f1b9f3282ab0104a (diff) | |
| parent | 6b07d219170dcfefe86facea14037ffeb825f015 (diff) | |
| download | tmwa-882f5e91d20f6c0c9fda9e1ce7cb3cf39c5c06e7.tar.gz tmwa-882f5e91d20f6c0c9fda9e1ce7cb3cf39c5c06e7.tar.bz2 tmwa-882f5e91d20f6c0c9fda9e1ce7cb3cf39c5c06e7.tar.xz tmwa-882f5e91d20f6c0c9fda9e1ce7cb3cf39c5c06e7.zip | |
Merge branch 'master' of git://gitorious.org/tmw-eathena/mainline
Diffstat (limited to 'src/map/clif.c')
| -rw-r--r-- | src/map/clif.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index 1a1acf9..2eeee35 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -5806,7 +5806,7 @@ int clif_guild_memberlogin_notice (struct guild *g, int idx, int flag) WBUFW (buf, 0) = 0x16d; WBUFL (buf, 2) = g->member[idx].account_id; - WBUFL (buf, 6) = g->member[idx].char_id; + WBUFL (buf, 6) = 0; WBUFL (buf, 10) = flag; if (g->member[idx].sd == NULL) { @@ -5996,7 +5996,7 @@ int clif_guild_memberlist (struct map_session_data *sd) if (m->account_id == 0) continue; WFIFOL (fd, c * 104 + 4) = m->account_id; - WFIFOL (fd, c * 104 + 8) = m->char_id; + WFIFOL (fd, c * 104 + 8) = 0; WFIFOW (fd, c * 104 + 12) = m->hair; WFIFOW (fd, c * 104 + 14) = m->hair_color; WFIFOW (fd, c * 104 + 16) = m->gender; @@ -6106,7 +6106,7 @@ int clif_guild_memberpositionchanged (struct guild *g, int idx) WBUFW (buf, 0) = 0x156; WBUFW (buf, 2) = 16; WBUFL (buf, 4) = g->member[idx].account_id; - WBUFL (buf, 8) = g->member[idx].char_id; + WBUFL (buf, 8) = 0; WBUFL (buf, 12) = g->member[idx].position; if ((sd = guild_getavailablesd (g)) != NULL) clif_send (buf, WBUFW (buf, 2), &sd->bl, GUILD); @@ -7079,8 +7079,7 @@ void clif_parse_GetCharNameRequest (int fd, struct map_session_data *sd) int i, ps = -1; for (i = 0; i < g->max_member; i++) { - if (g->member[i].account_id == ssd->status.account_id && - g->member[i].char_id == ssd->status.char_id) + if (g->member[i].account_id == ssd->status.account_id) ps = g->member[i].position; } if (ps >= 0 && ps < MAX_GUILDPOSITION) |