From 2449d2a6e7ddd1648d2e1fe446c97fe94378af28 Mon Sep 17 00:00:00 2001 From: skotlex Date: Tue, 18 Apr 2006 16:01:26 +0000 Subject: - Removed message 592 from trade.c - Removed mapflag nopvp - Added support for disabling mapflags on a mapflag line: comodo.gat mapflag nomemo <- turns on nomemo mapflag comodo.gat mapflag nomemo off <- turns off nomemo mapflag - Cleaned up and optimized the restricted/zones mapflag. Restricted cards will just not work in disallowed maps rather than blocking the compounded equipement from being used. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6159 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/clif.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/map/clif.c') diff --git a/src/map/clif.c b/src/map/clif.c index c0f79c8e6..432329745 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -4901,9 +4901,6 @@ int clif_pvpset(struct map_session_data *sd,int pvprank,int pvpnum,int type) { nullpo_retr(0, sd); - if(map[sd->bl.m].flag.nopvp) - return 0; - if(type == 2) { WFIFOHEAD(sd->fd,packet_len_table[0x19a]); WFIFOW(sd->fd,0) = 0x19a; @@ -9662,7 +9659,8 @@ void clif_parse_NpcStringInput(int fd,struct map_session_data *sd) void clif_parse_NpcCloseClicked(int fd,struct map_session_data *sd) { RFIFOHEAD(fd); - npc_scriptcont(sd,RFIFOL(fd,2)); + if (sd->npc_id) //Avoid parsing anything when the script was done with. [Skotlex] + npc_scriptcont(sd,RFIFOL(fd,2)); } /*========================================== -- cgit v1.2.3-60-g2f50