diff options
| author | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-05-31 18:42:26 +0000 |
|---|---|---|
| committer | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-05-31 18:42:26 +0000 |
| commit | 0b06ef049e6d16b3288548190c110e947e664cbf (patch) | |
| tree | d469588a5251a7b659a7b16ad29f72a56c971ba0 /src/map | |
| parent | 7f6e5c44ff309f0ff04a17e0249631b0acfb4389 (diff) | |
| download | hercules-0b06ef049e6d16b3288548190c110e947e664cbf.tar.gz hercules-0b06ef049e6d16b3288548190c110e947e664cbf.tar.bz2 hercules-0b06ef049e6d16b3288548190c110e947e664cbf.tar.xz hercules-0b06ef049e6d16b3288548190c110e947e664cbf.zip | |
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
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/npc.c | 4 |
1 files changed, 2 insertions, 2 deletions
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")) |