Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed bugreport:5839 mapflag conflicts were displaying wrong message

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16184 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
shennetsind 2012-05-31 18:42:26 +00:00
parent cde1d9c0a4
commit ea0fba8394
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/map/npc.c
View File

@ -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 ) if( state && map[m].flag.battleground )
{ {
map[m].flag.battleground = 0; 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")) 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 ) if( state && map[m].flag.battleground )
{ {
map[m].flag.battleground = 0; 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")) else if (!strcmpi(w3,"gvg_noparty"))