diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-10-26 09:25:55 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-10-26 09:25:55 +0000 |
| commit | 042913149087cff4dad4d36aa1a9c13703472f07 (patch) | |
| tree | cd78ad741b36c91f1c0b48a63a8f7366464673fd /src/map/clif.c | |
| parent | 525e08137aa36cc2bbd8284f8b48de01bbb70b4f (diff) | |
| download | hercules-042913149087cff4dad4d36aa1a9c13703472f07.tar.gz hercules-042913149087cff4dad4d36aa1a9c13703472f07.tar.bz2 hercules-042913149087cff4dad4d36aa1a9c13703472f07.tar.xz hercules-042913149087cff4dad4d36aa1a9c13703472f07.zip | |
Moved the new novending cell check from the internal code to the client-server interface (allows server to force-open shop if needed)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11580 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/clif.c')
| -rw-r--r-- | src/map/clif.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index 0d0aa997b..1b4a7bdf4 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -10023,9 +10023,9 @@ void clif_parse_OpenVending(int fd, struct map_session_data* sd) bool flag = (bool)RFIFOB(fd,84); const uint8* data = (uint8*)RFIFOP(fd,85); - if (sd->sc.data[SC_NOCHAT].timer!=-1 && sd->sc.data[SC_NOCHAT].val1&MANNER_NOROOM) + if( sd->sc.data[SC_NOCHAT].timer != -1 && sd->sc.data[SC_NOCHAT].val1&MANNER_NOROOM ) return; - if (map[sd->bl.m].flag.novending) { + if( map[sd->bl.m].flag.novending || map_getcell(sd->bl.m,sd->bl.x,sd->bl.y,CELL_CHKNOVENDING) ) { clif_displaymessage (sd->fd, msg_txt(276)); // "You can't open shop on this map" return; } |