diff options
| author | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-11-28 20:25:33 +0000 |
|---|---|---|
| committer | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-11-28 20:25:33 +0000 |
| commit | 0e7d4327dd2d8b2ad7aadd9ef02ed7d913dd96a6 (patch) | |
| tree | 24b8476c7c4398a1c22b3ae0afeed849948944fa /src | |
| parent | a4d892347480b08b925ff3506ea0d0683763163c (diff) | |
| download | hercules-0e7d4327dd2d8b2ad7aadd9ef02ed7d913dd96a6.tar.gz hercules-0e7d4327dd2d8b2ad7aadd9ef02ed7d913dd96a6.tar.bz2 hercules-0e7d4327dd2d8b2ad7aadd9ef02ed7d913dd96a6.tar.xz hercules-0e7d4327dd2d8b2ad7aadd9ef02ed7d913dd96a6.zip | |
* 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
Diffstat (limited to 'src')
| -rw-r--r-- | src/map/buyingstore.c | 20 | ||||
| -rw-r--r-- | src/map/clif.c | 6 |
2 files changed, 21 insertions, 5 deletions
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; |