Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

-Follow up r17355

Browse Source 
--fix windows compilation for clif_parse_cashshop_buy
--fix packet_db definition for clif_parse_cashshop_buy (wrong/incomplete index)
--add missing town mapflag as @mapflag command

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17357 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
glighta 2013-06-11 22:18:26 +00:00
parent 8d220fce91
commit 051ae1cfd9
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
db/packet_db.txt
View File

@ -1612,7 +1612,7 @@ packet_ver: 25
//2010-11-24aRagexeRE
packet_ver: 26
0x0288,-1,cashshopbuy,4:8
0x0288,-1,cashshopbuy,2:4:8:10
0x0436,19,wanttoconnection,2:6:10:14:18
0x035f,5,walktoxy,2
0x0360,6,ticksend,2
@ -1707,7 +1707,7 @@ packet_ver: 30
0x089C,26,friendslistadd,2
0x0885,5,hommenu,2:4
0x0961,36,storagepassword,0
0x0288,-1,cashshopbuy,4:8
0x0288,-1,cashshopbuy,2:4:8:10
0x091C,26,partyinvite2,2
0x094B,19,wanttoconnection,2:6:10:14:18
0x0369,7,actionrequest,2:6
@ -1816,7 +1816,7 @@ packet_ver: 34
0x0447,2,booking_playcancel,0
0x044A,6,clientversion,2
0x0844,2,cashshopopen,0
0x0848,-1,cashshopbuy,0
0x0848,-1,cashshopbuy,2:4:6:10
0x084a,2,cashshopclose,0
0x084b,19 //fallitem4
0x085a,90,useskilltoposinfo,2:4:6:8:10

2
src/map/atcommand.c
View File

@ -7618,6 +7618,7 @@ ACMD_FUNC(mapflag) {
if (!message || !*message || (sscanf(message, "%99s %hd", flag_name, &flag) < 1)) {
clif_displaymessage(sd->fd,msg_txt(sd,1311)); // Enabled Mapflags in this map:
clif_displaymessage(sd->fd,"----------------------------------");
checkflag(town);
checkflag(autotrade); checkflag(allowks); checkflag(nomemo); checkflag(noteleport);
checkflag(noreturn); checkflag(monster_noteleport); checkflag(nosave); checkflag(nobranch);
checkflag(noexppenalty); checkflag(pvp); checkflag(pvp_noparty); checkflag(pvp_noguild);
@ -7637,6 +7638,7 @@ ACMD_FUNC(mapflag) {
}
for (i = 0; flag_name[i]; i++) flag_name[i] = (char)tolower(flag_name[i]); //lowercase
setflag(town);
setflag(autotrade); setflag(allowks); setflag(nomemo); setflag(noteleport);
setflag(noreturn); setflag(monster_noteleport);setflag(nosave); setflag(nobranch);
setflag(noexppenalty); setflag(pvp); setflag(pvp_noparty); setflag(pvp_noguild);

5
src/map/clif.c
View File

@ -14471,9 +14471,12 @@ void clif_cashshop_ack(struct map_session_data* sd, int error)
/// 0288 <packet len>.W <kafra points>.L <count>.W { <amount>.W <name id>.W }.4B*count (PACKETVER >= 20100803)
void clif_parse_cashshop_buy(int fd, struct map_session_data *sd){
int fail = 0;
struct s_packet_db* info;
nullpo_retv(sd);
struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
if( sd->state.trading || !sd->npc_shopid )
fail = 1;
else {