summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authoreathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-03-19 04:11:00 +0000
committereathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-03-19 04:11:00 +0000
commit35074ab34ecd9264769784cf5263613c9497e26f (patch)
tree31fd4f69a6b1aee66897e1b85517453d5fa19565 /src
parent336786545e9822c728c6d26f6002b6c9b5a2fcf5 (diff)
downloadhercules-35074ab34ecd9264769784cf5263613c9497e26f.tar.gz
hercules-35074ab34ecd9264769784cf5263613c9497e26f.tar.bz2
hercules-35074ab34ecd9264769784cf5263613c9497e26f.tar.xz
hercules-35074ab34ecd9264769784cf5263613c9497e26f.zip
* Merged changes up to eAthena 15080.
(skipped 15079 because we use http://build.rathena.org/waterfall ) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15728 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/clif.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index 279f58d5e..7514f87bb 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -1024,8 +1024,9 @@ static int clif_set_unit_idle(struct block_list* bl, unsigned char* buffer, bool
if( bl->type == BL_NPC && vd->class_ == FLAG_CLASS )
{ //The hell, why flags work like this?
- WBUFL(buf,22) = status_get_emblem_id(bl);
- WBUFL(buf,26) = status_get_guild_id(bl);
+ WBUFW(buf,22) = status_get_emblem_id(bl);
+ WBUFW(buf,24) = GetWord(status_get_guild_id(bl), 1);
+ WBUFW(buf,26) = GetWord(status_get_guild_id(bl), 0);
}
WBUFW(buf,28) = vd->hair_color;