diff options
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/char/int_guild.c | 2 | ||||
| -rw-r--r-- | src/map/clif.c | 20 | ||||
| -rw-r--r-- | src/map/party.c | 2 |
4 files changed, 17 insertions, 9 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index fa13d41f5..25b21d436 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/07/27
+ * Fixed packet 0x22a having the manner and opt3 packets in inverted
+ offsets. [Skotlex]
* Readded the check which prevents Cloaking from activating when your
learned level is less than 3 and you aren't next to a wall. [Skotlex]
* Some cleanups to the Frenzy/Berserk status change, it should probably
diff --git a/src/char/int_guild.c b/src/char/int_guild.c index a676de285..0d3c25787 100644 --- a/src/char/int_guild.c +++ b/src/char/int_guild.c @@ -921,7 +921,7 @@ int mapif_guild_castle_alldataload_sub(DBKey key, void *data, va_list ap) { int mapif_guild_castle_alldataload(int fd) {
int len = 4;
- WFIFOHEAD(fd, 0);
+ WFIFOHEAD(fd, 0);
WFIFOW(fd,0) = 0x3842;
castle_db->foreach(castle_db, mapif_guild_castle_alldataload_sub, fd, &len);
WFIFOW(fd,2) = len;
diff --git a/src/map/clif.c b/src/map/clif.c index f7a54b28e..eeb866c43 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -908,7 +908,7 @@ static int clif_set0078(struct block_list *bl, struct view_data *vd, unsigned ch WBUFW(buf,8)=sc->opt1;
WBUFW(buf,10)=sc->opt2;
WBUFL(buf,12)=sc->option;
- WBUFL(buf,42)=sc->opt3;
+ WBUFL(buf,44)=sc->opt3;
}
WBUFW(buf,16)=vd->class_;
WBUFW(buf,18)=vd->hair_style;
@@ -923,7 +923,7 @@ static int clif_set0078(struct block_list *bl, struct view_data *vd, unsigned ch WBUFL(buf,36)=guild_id;
WBUFW(buf,40)=emblem_id;
if (sd) {
- WBUFW(buf,46)=sd->status.manner;
+ WBUFW(buf,42)=sd->status.manner;
WBUFB(buf,48)=sd->status.karma;
}
WBUFB(buf,49)=vd->sex;
@@ -3876,18 +3876,22 @@ void clif_getareachar_char(struct map_session_data* sd,struct block_list *bl) ud = unit_bl2ud(bl);
if (ud && ud->walktimer != -1)
{
-#if PACKETVER < 4
- WFIFOHEAD(sd->fd, packet_len_table[0x7b]);
-#else
+#if PACKETVER > 6
+ WFIFOHEAD(sd->fd, packet_len_table[0x22c]);
+#elif PACKETVER > 3
WFIFOHEAD(sd->fd, packet_len_table[0x1da]);
+#else
+ WFIFOHEAD(sd->fd, packet_len_table[0x7b]);
#endif
len = clif_set007b(bl,vd,ud,WFIFOP(sd->fd,0));
WFIFOSET(sd->fd,len);
} else {
-#if PACKETVER < 4
- WFIFOHEAD(sd->fd,packet_len_table[0x78]);
-#else
+#if PACKETVER > 6
+ WFIFOHEAD(sd->fd,packet_len_table[0x22a]);
+#elif PACKETVER > 3
WFIFOHEAD(sd->fd,packet_len_table[0x1d8]);
+#else
+ WFIFOHEAD(sd->fd,packet_len_table[0x78]);
#endif
len = clif_set0078(bl,vd,WFIFOP(sd->fd,0));
WFIFOSET(sd->fd,len);
diff --git a/src/map/party.c b/src/map/party.c index 2fbf363bd..490f5eb19 100644 --- a/src/map/party.c +++ b/src/map/party.c @@ -477,6 +477,8 @@ int party_optionchanged(int party_id,int account_id,int exp,int item,int flag) p->party.item=item;
clif_party_main_info(p,-1);
}
+ if(flag&0x01) //Send denied message
+ clif_party_option(p,sd,flag);
return 0;
}
|