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

Now the server will print an error message if an invalid mapflag is found during script loading (see bugreport:980 for the motivation).

Browse Source 
Removed one extra space that broke jail's noreturn mapflag loading.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12238 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ultramage 2008-02-24 18:04:13 +00:00
parent c33ec14d9a
commit abd31f84a3
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Changelog-Trunk.txt
View File

@ -3,6 +3,10 @@ Date Added
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK. AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2008/02/23
* Now the server will print an error message if an invalid mapflag is
found during script loading (see bugreport:980 for the motivation)
- removed one extra space that broke jail's noreturn mapflag loading
2008/02/22 2008/02/22
* Removed code in socket.c that tries to avoid send buffer overloading, * Removed code in socket.c that tries to avoid send buffer overloading,
as there is a scenario (many players and charserver disconnect) where as there is a scenario (many players and charserver disconnect) where

2
conf/mapflag/jail.txt
View File

@ -33,7 +33,7 @@ sec_pri mapflag noteleport
sec_pri mapflag nowarp sec_pri mapflag nowarp
// No Return, Stop people from being pulled out of jail (warpparty/guild) // No Return, Stop people from being pulled out of jail (warpparty/guild)
sec_pri mapflag noreturn sec_pri mapflag noreturn
// Bloody Jail =========================== // Bloody Jail ===========================
//Uncomment following maps to let your prisoners fight with other prisoners //Uncomment following maps to let your prisoners fight with other prisoners

6
src/map/npc.c
View File

@ -2491,6 +2491,12 @@ static const char* npc_parse_mapflag(char* w1, char* w2, char* w3, char* w4, con
map[m].flag.partylock=state; map[m].flag.partylock=state;
else if (!strcmpi(w3,"guildlock")) else if (!strcmpi(w3,"guildlock"))
map[m].flag.guildlock=state; map[m].flag.guildlock=state;
else
{
char buf[256];
sv_escape_c(buf, w3, strlen(w3), NULL); // to handle \r properly
ShowError("npc_parse_mapflag: unrecognized mapflag '%s' (file '%s', line '%d').\n", buf, filepath, strline(buffer,start-buffer));
}
return strchr(start,'\n');// continue return strchr(start,'\n');// continue
} }