- Removed the include of features.h from the console.c plugin. It is apparently not needed (and it was preventing compilation on FreeBSD)

- Fixed bug which totally broke item group bonuses.
- Added warnings when setting a pvp/gvg flag removes the other flags on the same map (gvg and pvp can't coexist on the same map)
- Optimized the unequip loop when changing sex.
- Removed the check that prevented you from casting soul-collect when you already have 5 spirits.
- Corrected Magic Rod so it doesn't displays any skill-use animation until it triggers.
- Debuff on logout&2 is again set to default, instead of removing food bonuses now it removes Maximize Power, Maximum Overthrust and Steel Body.
- Corrected Steel Body's icon (it actually belongs to AutoBerserk)


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

1 files changed, 7 insertions, 2 deletions

diff --git a/src/map/npc.c b/src/map/npc.c
index 8e9182beb..97034402e 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -2579,7 +2579,8 @@ 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;
+			if (map[m].flag.gvg || map[m].flag.gvg_dungeon || map[m].flag.gvg_castle)
+				ShowWarning("You can't set PvP and GvG flags for the same map! Removing GvG flags from %s\n", map[m].name);
 			map[m].flag.gvg=0;
 			map[m].flag.gvg_dungeon=0;
 			map[m].flag.gvg_castle=0;
@@ -2626,7 +2627,11 @@ 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;
+		if (state && map[m].flag.pvp) 
+		{
+			map[m].flag.pvp=0;
+			ShowWarning("You can't set PvP and GvG flags for the same map! Removing PvP flag from %s\n", map[m].name);
+		}
 	}
 	else if (strcmpi(w3,"gvg_noparty")==0) {
 		map[m].flag.gvg_noparty=state;