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

Added partylock/guildlock mapflag checking for @changeleader/@changegm (bugreport:72)

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12810 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ultramage 2008-06-11 13:02:16 +00:00
parent 91f75e6d21
commit 1db8d976fd
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Changelog-Trunk.txt
View File

@ -4,6 +4,9 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
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/06/11
* Added partylock/guildlock checking for @changeleader/@changegm
(bugreport:72) [ultramage]
2008/06/10 2008/06/10
* Fixed double attack working with unarmed attacks, as reported by Lone Wolf. [Brainstorm] * Fixed double attack working with unarmed attacks, as reported by Lone Wolf. [Brainstorm]
* Added experimental code to set the socket limit at runtime. [FlavioJS] * Added experimental code to set the socket limit at runtime. [FlavioJS]

16
src/map/atcommand.c
View File

@ -5894,6 +5894,13 @@ int atcommand_changegm(const int fd, struct map_session_data* sd, const char* co
clif_displaymessage(fd, "You need to be a Guild Master to use this command."); clif_displaymessage(fd, "You need to be a Guild Master to use this command.");
return -1; return -1;
} }
if( map[sd->bl.m].flag.guildlock )
{
clif_displaymessage(fd, "You cannot change guild leaders on this map.");
return -1;
}
if (strlen(message)==0) if (strlen(message)==0)
{ {
clif_displaymessage(fd, "Command usage: @changegm <guildmember name>"); clif_displaymessage(fd, "Command usage: @changegm <guildmember name>");
@ -5926,8 +5933,13 @@ int atcommand_changeleader(const int fd, struct map_session_data* sd, const char
return -1; return -1;
} }
for (mi = 0; mi < MAX_PARTY && p->data[mi].sd != sd; mi++); if( map[sd->bl.m].flag.partylock )
{
clif_displaymessage(fd, "You cannot change party leaders on this map.");
return -1;
}
ARR_FIND( 0, MAX_PARTY, mi, p->data[mi].sd == sd );
if (mi == MAX_PARTY) if (mi == MAX_PARTY)
return -1; //Shouldn't happen return -1; //Shouldn't happen