From 17b65ba822078e7dd0457590e491b5544269dcc5 Mon Sep 17 00:00:00 2001 From: skotlex Date: Mon, 15 May 2006 21:09:45 +0000 Subject: - When reading mapflags, when a map is set to be pvp or gvg, the other will be turned off (disables pvp mapflags in gvg maps for pk-servers) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6610 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/npc.c | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'src/map') diff --git a/src/map/npc.c b/src/map/npc.c index 931a205c8..d503d011a 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -2306,6 +2306,12 @@ static int npc_parse_mapflag (char *w1, char *w2, char *w3, char *w4) } else if (strcmpi(w3,"pvp")==0) { map[m].flag.pvp=state; + if (state) { + map[m].flag.gvg=0; + map[m].flag.gvg=0; + map[m].flag.gvg_dungeon=0; + map[m].flag.gvg_castle=0; + } } else if (strcmpi(w3,"pvp_noparty")==0) { map[m].flag.pvp_noparty=state; @@ -2348,15 +2354,18 @@ static int npc_parse_mapflag (char *w1, char *w2, char *w3, char *w4) } else if (strcmpi(w3,"gvg")==0) { map[m].flag.gvg=state; + if (state) map[m].flag.pvp=0; } else if (strcmpi(w3,"gvg_noparty")==0) { map[m].flag.gvg_noparty=state; } else if (strcmpi(w3,"gvg_dungeon")==0) { map[m].flag.gvg_dungeon=state; + if (state) map[m].flag.pvp=0; } else if (strcmpi(w3,"gvg_castle")==0) { map[m].flag.gvg_castle=state; + if (state) map[m].flag.pvp=0; } else if (strcmpi(w3,"nozenypenalty")==0) { map[m].flag.nozenypenalty=state; -- cgit v1.2.3-70-g09d2