From 051ae1cfd949d1c25a04c3b7cb76f60eadd02d9a Mon Sep 17 00:00:00 2001
From: glighta <glighta@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Tue, 11 Jun 2013 22:18:26 +0000
Subject: [PATCH] -Follow up r17355 --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
---
 db/packet_db.txt    | 6 +++---
 src/map/atcommand.c | 2 ++
 src/map/clif.c      | 5 ++++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/db/packet_db.txt b/db/packet_db.txt
index 8b49576f2d..4f46abb1d7 100644
--- a/db/packet_db.txt
+++ b/db/packet_db.txt
@@ -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
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 759df34df8..166fb925a3 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -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);
diff --git a/src/map/clif.c b/src/map/clif.c
index 72d1057e4e..1d065a2a38 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -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 {