* Fixed novending cell check using misleading error message (bugreport:2592, since r11572 and r14724, related r11580).

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15000 54d463be-8e91-2dee-dedb-b68131a5f0ec

4 files changed, 23 insertions, 6 deletions

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index cead16df5..f893ad412 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -1,6 +1,7 @@
 Date	Added
 
 2011/11/28
+	* Fixed novending cell check using misleading error message (bugreport:2592, since r11572 and r14724, related r11580). [Ai4rei]
 	* Fixed removing item scripts through script command *setitemscript not working the way it is stated in script_commands.txt (related r9831). [Ai4rei]
 2011/11/19
 	* Fixed wrong damage numbers being displayed when the damage source was disguised (bugreport:5093, since r14979). [Ai4rei]
diff --git a/conf/msg_athena.conf b/conf/msg_athena.conf
index ce02dfb30..c54441063 100644
--- a/conf/msg_athena.conf
+++ b/conf/msg_athena.conf
@@ -217,7 +217,7 @@
 201: You don't have this quest skill.
 202: This player has forgotten the skill.
 203: This player doesn't have this quest skill.
-//204: FREE
+204: You can't open a shop on this cell.
 //205: FREE
 206: '%s' skill points reset.
 207: '%s' stats points reset.
diff --git a/src/map/buyingstore.c b/src/map/buyingstore.c
index 94f390c10..8d3179745 100644
--- a/src/map/buyingstore.c
+++ b/src/map/buyingstore.c
@@ -56,12 +56,18 @@ bool buyingstore_setup(struct map_session_data* sd, unsigned char slots)
 		return false;
 	}
 
-	if( map[sd->bl.m].flag.novending || map_getcell(sd->bl.m, sd->bl.x, sd->bl.y, CELL_CHKNOVENDING) )
-	{// custom: no vending maps/cells
+	if( map[sd->bl.m].flag.novending )
+	{// custom: no vending maps
 		clif_displaymessage(sd->fd, msg_txt(276)); // "You can't open a shop on this map"
 		return false;
 	}
 
+	if( map_getcell(sd->bl.m, sd->bl.x, sd->bl.y, CELL_CHKNOVENDING) )
+	{// custom: no vending cells
+		clif_displaymessage(sd->fd, msg_txt(204)); // "You can't open a shop on this cell."
+		return false;
+	}
+
 	if( slots > MAX_BUYINGSTORE_SLOTS )
 	{
 		ShowWarning("buyingstore_setup: Requested %d slots, but server supports only %d slots.\n", (int)slots, MAX_BUYINGSTORE_SLOTS);
@@ -105,12 +111,18 @@ void buyingstore_create(struct map_session_data* sd, int zenylimit, unsigned cha
 		return;
 	}
 
-	if( map[sd->bl.m].flag.novending || map_getcell(sd->bl.m, sd->bl.x, sd->bl.y, CELL_CHKNOVENDING) )
-	{// custom: no vending maps/cells
+	if( map[sd->bl.m].flag.novending )
+	{// custom: no vending maps
 		clif_displaymessage(sd->fd, msg_txt(276)); // "You can't open a shop on this map"
 		return;
 	}
 
+	if( map_getcell(sd->bl.m, sd->bl.x, sd->bl.y, CELL_CHKNOVENDING) )
+	{// custom: no vending cells
+		clif_displaymessage(sd->fd, msg_txt(204)); // "You can't open a shop on this cell."
+		return;
+	}
+
 	weight = sd->weight;
 
 	// check item list
diff --git a/src/map/clif.c b/src/map/clif.c
index 027d589bb..da2abe0f3 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -11072,10 +11072,14 @@ void clif_parse_OpenVending(int fd, struct map_session_data* sd)
 
 	if( sd->sc.data[SC_NOCHAT] && sd->sc.data[SC_NOCHAT]->val1&MANNER_NOROOM )
 		return;
-	if( map[sd->bl.m].flag.novending || map_getcell(sd->bl.m,sd->bl.x,sd->bl.y,CELL_CHKNOVENDING) ) {
+	if( map[sd->bl.m].flag.novending ) {
 		clif_displaymessage (sd->fd, msg_txt(276)); // "You can't open a shop on this map"
 		return;
 	}
+	if( map_getcell(sd->bl.m,sd->bl.x,sd->bl.y,CELL_CHKNOVENDING) ) {
+		clif_displaymessage (sd->fd, msg_txt(204)); // "You can't open a shop on this cell."
+		return;
+	}
 	if( message[0] == '\0' ) // invalid input
 		return;