summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-06-11 13:02:16 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-06-11 13:02:16 +0000
commit2c6e4b099a37438a71f07b4a2a1f855801b02d90 (patch)
treefbcaf57e52fd0ac4b6e1743d57ca6e3469ecd030 /src
parentc81fe7d47a39ab1a6bfe95549aa4bc4153f98f2b (diff)
downloadhercules-2c6e4b099a37438a71f07b4a2a1f855801b02d90.tar.gz
hercules-2c6e4b099a37438a71f07b4a2a1f855801b02d90.tar.bz2
hercules-2c6e4b099a37438a71f07b4a2a1f855801b02d90.tar.xz
hercules-2c6e4b099a37438a71f07b4a2a1f855801b02d90.zip
Added partylock/guildlock mapflag checking for @changeleader/@changegm (bugreport:72)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12810 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/atcommand.c16
1 files changed, 14 insertions, 2 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 9bf6b710f..2c80db37c 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -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.");
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)
{
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;
}
- 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)
return -1; //Shouldn't happen