From 2c6e4b099a37438a71f07b4a2a1f855801b02d90 Mon Sep 17 00:00:00 2001 From: ultramage Date: Wed, 11 Jun 2008 13:02:16 +0000 Subject: 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 --- src/map/atcommand.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'src') 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 "); @@ -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 -- cgit v1.2.3-70-g09d2