- Now gvg_dungeon mapflag will activate the other mapflags which are required: pvp, pvp_nocalcrank and pvp_noparty/pvp_noguild (they are forced to off if gvg_dungeon is on and viceversa)

- Cleaned the pvp ranking code so that it takes effect even if pvp_nocalcrank is active WHEN the map is a gvg_dungeon one.
- Cleaned up a bit the pvp ranking timer code.
- Now homuncs and their masters are the only ones who can use support skills on the homunc.


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

1 files changed, 4 insertions, 1 deletions

diff --git a/src/map/npc.c b/src/map/npc.c
index 236f0a7e0..7dd0f146c 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -2452,7 +2452,10 @@ static int npc_parse_mapflag (char *w1, char *w2, char *w3, char *w4)
 	}

 	else if (strcmpi(w3,"gvg_dungeon")==0) {

 		map[m].flag.gvg_dungeon=state;

-		if (state) map[m].flag.pvp=0;

+		map[m].flag.pvp=state;

+		map[m].flag.pvp_noparty=!state;

+		map[m].flag.pvp_noguild=!state;

+		map[m].flag.pvp_nocalcrank=state;

 	}

 	else if (strcmpi(w3,"gvg_castle")==0) {

 		map[m].flag.gvg_castle=state;