Index: db/packet_db.txt =================================================================== --- db/packet_db.txt (revision 17357) +++ db/packet_db.txt (working copy) @@ -278,7 +278,7 @@ 0x0152,-1 0x0153,-1,guildchangeemblem,2:4 0x0154,-1 -0x0155,-1,guildchangememberposition,2 +0x0155,-1,guildchangememberposition,2:4 0x0156,-1 0x0157,6 0x0158,-1 @@ -290,7 +290,7 @@ 0x015e,6 0x015f,42 0x0160,-1 -0x0161,-1,guildchangepositioninfo,2 +0x0161,-1,guildchangepositioninfo,2:4 0x0162,-1 0x0163,-1 0x0164,-1 @@ -331,7 +331,7 @@ 0x0187,6 0x0188,8 0x0189,4 -0x018a,4,quitgame,0 +0x018a,4,quitgame,2 0x018b,4 0x018c,29 0x018d,-1 @@ -791,10 +791,10 @@ 0x0248,68 0x0249,3 0x024a,70 -0x024b,4,auctioncancelreg,0 +0x024b,4,auctioncancelreg,2 0x024c,8,auctionsetitem,0 0x024d,14 -0x024e,6,auctioncancel,0 +0x024e,6,auctioncancel,2 0x024f,10,auctionbid,0 0x0250,3 0x0251,2 @@ -845,16 +845,16 @@ //2005-10-10aSakexe 0x020e,32 0x025a,-1 -0x025b,6,cooking,0 +0x025b,6,cooking,2:4 //2005-10-13aSakexe 0x007a,6 0x0251,32 -0x025c,4,auctionbuysell,0 +0x025c,4,auctionbuysell,2 //2005-10-17aSakexe 0x007a,58 -0x025d,6,auctionclose,0 +0x025d,6,auctionclose,2 0x025e,4 //2005-10-24aSakexe @@ -862,7 +862,7 @@ 0x0260,6 //2005-11-07aSakexe -0x024e,6,auctioncancel,0 +0x024e,6,auctioncancel,2 0x0251,34,auctionsearch,0 //2006-01-09aSakexe Index: src/map/clif.c =================================================================== --- src/map/clif.c (revision 17357) +++ src/map/clif.c (working copy) @@ -2491,7 +2491,7 @@ continue; id = itemdb_search(items[i].nameid); if( !itemdb_isstackable2(id) ) { //Equippable - clif_item_sub(bufe, ne*se+sidx,i+1, &items[i], id, id->equip); + clif_item_sub(bufe, ne*se+sidxe,i+1, &items[i], id, id->equip); ne++; } else { //Stackable @@ -9602,6 +9602,7 @@ void clif_parse_QuitGame(int fd, struct map_session_data *sd) { /* Rovert's prevent logout option fixed [Valaris] */ + //int type = RFIFOW(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]); if( !sd->sc.data[SC_CLOAKING] && !sd->sc.data[SC_HIDING] && !sd->sc.data[SC_CHASEWALK] && !sd->sc.data[SC_CLOAKINGEXCEED] && (!battle_config.prevent_logout || DIFF_TICK(gettick(), sd->canlog_tick) > battle_config.prevent_logout) ) { @@ -14149,8 +14150,8 @@ /// 0 = create (any other action in auction window) /// 1 = cancel (cancel pressed on register tab) /// ? = junk, uninitialized value (ex. when switching between list filters) -void clif_parse_Auction_cancelreg(int fd, struct map_session_data *sd) -{ +void clif_parse_Auction_cancelreg(int fd, struct map_session_data *sd){ + //int type = RFIFOW(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]); if( sd->auction.amount > 0 ) clif_additem(sd, sd->auction.index, sd->auction.amount, 0); @@ -14388,7 +14389,7 @@ /// 1 = buy (own bids) void clif_parse_Auction_buysell(int fd, struct map_session_data* sd) { - short type = RFIFOW(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[1]) + 6; + short type = RFIFOW(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0]) + 6; clif_parse_Auction_cancelreg(fd, sd); intif_Auction_requestlist(sd->status.char_id, type, 0, "", 1); @@ -16293,22 +16294,23 @@ #endif } /*========================================== - * used by SC_AUTOSHADOWSPELL - * RFIFOL(fd,2) - flag (currently not used) + * Select a skill into a given list (used by SC_AUTOSHADOWSPELL) + * 0443 .L .W (CZ_SKILL_SELECT_RESPONSE) + * RFIFOL(fd,2) - type (currently not used) *------------------------------------------*/ void clif_parse_SkillSelectMenu(int fd, struct map_session_data *sd) { - + struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)]; + //int type = RFIFOL(fd,info->pos[0]); if( sd->menuskill_id != SC_AUTOSHADOWSPELL ) return; - if( pc_istrading(sd) ) { clif_skill_fail(sd,sd->ud.skill_id,0,0); clif_menuskill_clear(sd); return; } - skill_select_menu(sd,RFIFOW(fd,packet_db[sd->packet_ver][RFIFOW(fd,0)].pos[0])); + skill_select_menu(sd,RFIFOW(fd,info->pos[1])); clif_menuskill_clear(sd); }