From 0b06ef049e6d16b3288548190c110e947e664cbf Mon Sep 17 00:00:00 2001 From: shennetsind Date: Thu, 31 May 2012 18:42:26 +0000 Subject: Fixed bugreport:5839 mapflag conflicts were displaying wrong message git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16184 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/npc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/map/npc.c') diff --git a/src/map/npc.c b/src/map/npc.c index 93f9691db..ed070a232 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -3033,7 +3033,7 @@ static const char* npc_parse_mapflag(char* w1, char* w2, char* w3, char* w4, con if( state && map[m].flag.battleground ) { map[m].flag.battleground = 0; - ShowWarning("npc_parse_mapflag: You can't set GvG and BattleGround flags for the same map! Removing BattleGround flag from %s (file '%s', line '%d').\n", map[m].name, filepath, strline(buffer,start-buffer)); + ShowWarning("npc_parse_mapflag: You can't set PvP and BattleGround flags for the same map! Removing BattleGround flag from %s (file '%s', line '%d').\n", map[m].name, filepath, strline(buffer,start-buffer)); } } else if (!strcmpi(w3,"pvp_noparty")) @@ -3082,7 +3082,7 @@ static const char* npc_parse_mapflag(char* w1, char* w2, char* w3, char* w4, con if( state && map[m].flag.battleground ) { map[m].flag.battleground = 0; - ShowWarning("npc_parse_mapflag: You can't set PvP and BattleGround flags for the same map! Removing BattleGround flag from %s (file '%s', line '%d').\n", map[m].name, filepath, strline(buffer,start-buffer)); + ShowWarning("npc_parse_mapflag: You can't set GvG and BattleGround flags for the same map! Removing BattleGround flag from %s (file '%s', line '%d').\n", map[m].name, filepath, strline(buffer,start-buffer)); } } else if (!strcmpi(w3,"gvg_noparty")) -- cgit v1.2.3-70-g09d2