- Fixed txt-converter compilation.

- Added my_global.h include to login converter
- Removed sd->char_id since we can use sd->status.char_id instead.
- Small speedup in STRECOVERY, and made it not unlock a mob's target.
- Fixed GS_GROUNDDRIFT consuming ammo when it's time expires (so it was consuming 2 grenades instead of one). Also added a "explosion effect" when their time runs out.
- gvg_dungeon mapflag won't set pvp related mapflags anymore, pc_dead will force pvp ranking gain/loss on gvg_dungeon maps now.
- Now when coming out of hiding land-effects will trigger on the character.
- Made the pc_setpos message when being placed on an unwalkable tile tell you which player triggered it.
- Fixed land effects not taking effect inmediately on map-load when the invincible timer is disabled.


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

1 files changed, 1 insertions, 4 deletions

diff --git a/src/map/npc.c b/src/map/npc.c
index 3af9d5e2e..fe01a7ded 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -2452,10 +2452,7 @@ 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;

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

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

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

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

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

 	}

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

 		map[m].flag.gvg_castle=state;