- Undid r16968: SVN Replaced with source:/trunk/src/@16966 (tid:74924).

[16969:16991/trunk/src/] will be re-committed in the next 24 hours.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16992 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 1433 insertions, 1420 deletions

diff --git a/src/map/guild.c b/src/map/guild.c
index b276114be..9eeae7cf1 100644
--- a/src/map/guild.c
+++ b/src/map/guild.c
@@ -29,37 +29,37 @@
 #include <string.h>
 
 
-static DBMap *guild_db; // int guild_id -> struct guild*
-static DBMap *castle_db; // int castle_id -> struct guild_castle*
-static DBMap *guild_expcache_db; // int char_id -> struct guild_expcache*
-static DBMap *guild_infoevent_db; // int guild_id -> struct eventlist*
+static DBMap* guild_db; // int guild_id -> struct guild*
+static DBMap* castle_db; // int castle_id -> struct guild_castle*
+static DBMap* guild_expcache_db; // int char_id -> struct guild_expcache*
+static DBMap* guild_infoevent_db; // int guild_id -> struct eventlist*
 
 struct eventlist {
-    char name[EVENT_NAME_LENGTH];
-    struct eventlist *next;
+	char name[EVENT_NAME_LENGTH];
+	struct eventlist *next;
 };
 
 //Constant related to the flash of the Guild EXP cache
-#define GUILD_SEND_XY_INVERVAL  5000 // Interval of sending coordinates and HP
+#define GUILD_SEND_XY_INVERVAL	5000 // Interval of sending coordinates and HP
 #define GUILD_PAYEXP_INVERVAL 10000 //Interval (maximum survival time of the cache, in milliseconds)
 #define GUILD_PAYEXP_LIST 8192 //The maximum number of cache
 
 //Guild EXP cache
 
 struct guild_expcache {
-    int guild_id, account_id, char_id;
-    uint64 exp;
+	int guild_id, account_id, char_id;
+	uint64 exp;
 };
 static struct eri *expcache_ers; //For handling of guild exp payment.
 
 #define MAX_GUILD_SKILL_REQUIRE 5
-struct {
-    int id;
-    int max;
-    struct {
-        short id;
-        short lv;
-    } need[MAX_GUILD_SKILL_REQUIRE];
+struct{
+	int id;
+	int max;
+	struct{
+		short id;
+		short lv;
+	}need[MAX_GUILD_SKILL_REQUIRE];
 } guild_skill_tree[MAX_GUILDSKILL];
 
 int guild_payexp_timer(int tid, unsigned int tick, int id, intptr_t data);
@@ -72,34 +72,33 @@ unsigned short guild_flags_count;
 /*==========================================
  * Retrieves and validates the sd pointer for this guild member [Skotlex]
  *------------------------------------------*/
-static TBL_PC *guild_sd_check(int guild_id, int account_id, int char_id)
+static TBL_PC* guild_sd_check(int guild_id, int account_id, int char_id)
 {
-    TBL_PC *sd = map_id2sd(account_id);
+	TBL_PC* sd = map_id2sd(account_id);
 
-    if (!(sd && sd->status.char_id == char_id))
-        return NULL;
+	if (!(sd && sd->status.char_id == char_id))
+		return NULL;
 
-    if (sd->status.guild_id != guild_id) {
-        //If player belongs to a different guild, kick him out.
-        intif_guild_leave(guild_id,account_id,char_id,0,"** Guild Mismatch **");
-        return NULL;
-    }
+	if (sd->status.guild_id != guild_id)
+	{	//If player belongs to a different guild, kick him out.
+ 		intif_guild_leave(guild_id,account_id,char_id,0,"** Guild Mismatch **");
+		return NULL;
+	}
 
-    return sd;
+	return sd;
 }
 
-// Modified [Komurka]
-int guild_skill_get_max(int id)
+ // Modified [Komurka]
+int guild_skill_get_max (int id)
 {
-    if (id < GD_SKILLBASE || id >= GD_SKILLBASE+MAX_GUILDSKILL)
-        return 0;
-    return guild_skill_tree[id-GD_SKILLBASE].max;
+	if (id < GD_SKILLBASE || id >= GD_SKILLBASE+MAX_GUILDSKILL)
+		return 0;
+	return guild_skill_tree[id-GD_SKILLBASE].max;
 }
 
 // Retrive skilllv learned by guild
 
-int guild_checkskill(struct guild *g, int id)
-{
+int guild_checkskill(struct guild *g, int id) {
     int idx = id - GD_SKILLBASE;
     if (idx < 0 || idx >= MAX_GUILDSKILL)
         return 0;
@@ -109,33 +108,34 @@ int guild_checkskill(struct guild *g, int id)
 /*==========================================
  * guild_skill_tree.txt reading - from jA [Komurka]
  *------------------------------------------*/
-static bool guild_read_guildskill_tree_db(char *split[], int columns, int current)
-{
-    // <skill id>,<max lv>,<req id1>,<req lv1>,<req id2>,<req lv2>,<req id3>,<req lv3>,<req id4>,<req lv4>,<req id5>,<req lv5>
-    int k, id, skillid;
+static bool guild_read_guildskill_tree_db(char* split[], int columns, int current)
+{// <skill id>,<max lv>,<req id1>,<req lv1>,<req id2>,<req lv2>,<req id3>,<req lv3>,<req id4>,<req lv4>,<req id5>,<req lv5>
+	int k, id, skillid;
 
-    skillid = atoi(split[0]);
-    id = skillid - GD_SKILLBASE;
+	skillid = atoi(split[0]);
+	id = skillid - GD_SKILLBASE;
 
-    if (id < 0 || id >= MAX_GUILDSKILL) {
-        ShowWarning("guild_read_guildskill_tree_db: Invalid skill id %d.\n", skillid);
-        return false;
-    }
+	if( id < 0 || id >= MAX_GUILDSKILL )
+	{
+		ShowWarning("guild_read_guildskill_tree_db: Invalid skill id %d.\n", skillid);
+		return false;
+	}
 
-    guild_skill_tree[id].id = skillid;
-    guild_skill_tree[id].max = atoi(split[1]);
+	guild_skill_tree[id].id = skillid;
+	guild_skill_tree[id].max = atoi(split[1]);
 
-    if (guild_skill_tree[id].id == GD_GLORYGUILD && battle_config.require_glory_guild && guild_skill_tree[id].max == 0) {
-        // enable guild's glory when required for emblems
-        guild_skill_tree[id].max = 1;
-    }
+	if( guild_skill_tree[id].id == GD_GLORYGUILD && battle_config.require_glory_guild && guild_skill_tree[id].max == 0 )
+	{// enable guild's glory when required for emblems
+		guild_skill_tree[id].max = 1;
+	}
 
-    for (k = 0; k < MAX_GUILD_SKILL_REQUIRE; k++) {
-        guild_skill_tree[id].need[k].id = atoi(split[k*2+2]);
-        guild_skill_tree[id].need[k].lv = atoi(split[k*2+3]);
-    }
+	for( k = 0; k < MAX_GUILD_SKILL_REQUIRE; k++ )
+	{
+		guild_skill_tree[id].need[k].id = atoi(split[k*2+2]);
+		guild_skill_tree[id].need[k].lv = atoi(split[k*2+3]);
+	}
 
-    return true;
+	return true;
 }
 
 /*==========================================
@@ -143,179 +143,186 @@ static bool guild_read_guildskill_tree_db(char *split[], int columns, int curren
  *------------------------------------------*/
 int guild_check_skill_require(struct guild *g,int id)
 {
-    int i;
-    int idx = id-GD_SKILLBASE;
+	int i;
+	int idx = id-GD_SKILLBASE;
 
-    if (g == NULL)
-        return 0;
+	if(g == NULL)
+		return 0;
 
-    if (idx < 0 || idx >= MAX_GUILDSKILL)
-        return 0;
+	if (idx < 0 || idx >= MAX_GUILDSKILL)
+		return 0;
 
-    for (i=0; i<MAX_GUILD_SKILL_REQUIRE; i++) {
-        if (guild_skill_tree[idx].need[i].id == 0) break;
-        if (guild_skill_tree[idx].need[i].lv > guild_checkskill(g,guild_skill_tree[idx].need[i].id))
-            return 0;
-    }
-    return 1;
+	for(i=0;i<MAX_GUILD_SKILL_REQUIRE;i++)
+	{
+		if(guild_skill_tree[idx].need[i].id == 0) break;
+		if(guild_skill_tree[idx].need[i].lv > guild_checkskill(g,guild_skill_tree[idx].need[i].id))
+			return 0;
+	}
+	return 1;
 }
 
-static bool guild_read_castledb(char *str[], int columns, int current)
-{
-    // <castle id>,<map name>,<castle name>,<castle event>[,<reserved/unused switch flag>]
-    struct guild_castle *gc;
-    int mapindex = mapindex_name2id(str[1]);
+static bool guild_read_castledb(char* str[], int columns, int current)
+{// <castle id>,<map name>,<castle name>,<castle event>[,<reserved/unused switch flag>]
+	struct guild_castle *gc;
+	int mapindex = mapindex_name2id(str[1]);
 
-    if (map_mapindex2mapid(mapindex) < 0) // Map not found or on another map-server
-        return false;
+	if (map_mapindex2mapid(mapindex) < 0) // Map not found or on another map-server
+		return false;
 
-    CREATE(gc, struct guild_castle, 1);
-    gc->castle_id = atoi(str[0]);
-    gc->mapindex = mapindex;
-    safestrncpy(gc->castle_name, str[2], sizeof(gc->castle_name));
-    safestrncpy(gc->castle_event, str[3], sizeof(gc->castle_event));
+	CREATE(gc, struct guild_castle, 1);
+	gc->castle_id = atoi(str[0]);
+	gc->mapindex = mapindex;
+	safestrncpy(gc->castle_name, str[2], sizeof(gc->castle_name));
+	safestrncpy(gc->castle_event, str[3], sizeof(gc->castle_event));
 
-    idb_put(castle_db,gc->castle_id,gc);
+	idb_put(castle_db,gc->castle_id,gc);
 
-    //intif_guild_castle_info(gc->castle_id);
+	//intif_guild_castle_info(gc->castle_id);
 
-    return true;
+	return true;
 }
 
 /// lookup: guild id -> guild*
-struct guild *guild_search(int guild_id) {
-    return (struct guild *)idb_get(guild_db,guild_id);
+struct guild* guild_search(int guild_id)
+{
+	return (struct guild*)idb_get(guild_db,guild_id);
 }
 
 /// lookup: guild name -> guild*
-struct guild *guild_searchname(char *str) {
-    struct guild *g;
-    DBIterator *iter = db_iterator(guild_db);
+struct guild* guild_searchname(char* str)
+{
+	struct guild* g;
+	DBIterator *iter = db_iterator(guild_db);
 
-    for (g = dbi_first(iter); dbi_exists(iter); g = dbi_next(iter)) {
-        if (strcmpi(g->name, str) == 0)
-            break;
-    }
-    dbi_destroy(iter);
+	for( g = dbi_first(iter); dbi_exists(iter); g = dbi_next(iter) )
+	{
+		if( strcmpi(g->name, str) == 0 )
+			break;
+	}
+	dbi_destroy(iter);
 
-    return g;
+	return g;
 }
 
 /// lookup: castle id -> castle*
-struct guild_castle *guild_castle_search(int gcid) {
-    return (struct guild_castle *)idb_get(castle_db,gcid);
+struct guild_castle* guild_castle_search(int gcid)
+{
+	return (struct guild_castle*)idb_get(castle_db,gcid);
 }
 
 /// lookup: map index -> castle*
-struct guild_castle *guild_mapindex2gc(short mapindex) {
-    struct guild_castle *gc;
-    DBIterator *iter = db_iterator(castle_db);
+struct guild_castle* guild_mapindex2gc(short mapindex)
+{
+	struct guild_castle* gc;
+	DBIterator *iter = db_iterator(castle_db);
 
-    for (gc = dbi_first(iter); dbi_exists(iter); gc = dbi_next(iter)) {
-        if (gc->mapindex == mapindex)
-            break;
-    }
-    dbi_destroy(iter);
+	for( gc = dbi_first(iter); dbi_exists(iter); gc = dbi_next(iter) )
+	{
+		if( gc->mapindex == mapindex )
+			break;
+	}
+	dbi_destroy(iter);
 
-    return gc;
+	return gc;
 }
 
 /// lookup: map name -> castle*
-struct guild_castle *guild_mapname2gc(const char *mapname) {
-    return guild_mapindex2gc(mapindex_name2id(mapname));
+struct guild_castle* guild_mapname2gc(const char* mapname)
+{
+	return guild_mapindex2gc(mapindex_name2id(mapname));
 }
 
-struct map_session_data *guild_getavailablesd(struct guild *g) {
-    int i;
+struct map_session_data* guild_getavailablesd(struct guild* g)
+{
+	int i;
 
-    nullpo_retr(NULL, g);
+	nullpo_retr(NULL, g);
 
-    ARR_FIND(0, g->max_member, i, g->member[i].sd != NULL);
-    return(i < g->max_member) ? g->member[i].sd : NULL;
+	ARR_FIND( 0, g->max_member, i, g->member[i].sd != NULL );
+	return( i < g->max_member ) ? g->member[i].sd : NULL;
 }
 
 /// lookup: player AID/CID -> member index
 int guild_getindex(struct guild *g,int account_id,int char_id)
 {
-    int i;
+	int i;
 
-    if (g == NULL)
-        return -1;
+	if( g == NULL )
+		return -1;
 
-    ARR_FIND(0, g->max_member, i, g->member[i].account_id == account_id && g->member[i].char_id == char_id);
-    return(i < g->max_member) ? i : -1;
+	ARR_FIND( 0, g->max_member, i, g->member[i].account_id == account_id && g->member[i].char_id == char_id );
+	return( i < g->max_member ) ? i : -1;
 }
 
 /// lookup: player sd -> member position
-int guild_getposition(struct guild *g, struct map_session_data *sd)
+int guild_getposition(struct guild* g, struct map_session_data* sd)
 {
-    int i;
-
-    if (g == NULL && (g=guild_search(sd->status.guild_id)) == NULL)
-        return -1;
+	int i;
 
-    ARR_FIND(0, g->max_member, i, g->member[i].account_id == sd->status.account_id && g->member[i].char_id == sd->status.char_id);
-    return(i < g->max_member) ? g->member[i].position : -1;
+	if( g == NULL && (g=guild_search(sd->status.guild_id)) == NULL )
+		return -1;
+	
+	ARR_FIND( 0, g->max_member, i, g->member[i].account_id == sd->status.account_id && g->member[i].char_id == sd->status.char_id );
+	return( i < g->max_member ) ? g->member[i].position : -1;
 }
 
 //Creation of member information
 void guild_makemember(struct guild_member *m,struct map_session_data *sd)
 {
-    nullpo_retv(sd);
+	nullpo_retv(sd);
 
-    memset(m,0,sizeof(struct guild_member));
-    m->account_id   =sd->status.account_id;
-    m->char_id      =sd->status.char_id;
-    m->hair         =sd->status.hair;
-    m->hair_color   =sd->status.hair_color;
-    m->gender       =sd->status.sex;
-    m->class_       =sd->status.class_;
-    m->lv           =sd->status.base_level;
-    //  m->exp          =0;
-    //  m->exp_payper   =0;
-    m->online       =1;
-    m->position     =MAX_GUILDPOSITION-1;
-    memcpy(m->name,sd->status.name,NAME_LENGTH);
-    return;
+	memset(m,0,sizeof(struct guild_member));
+	m->account_id	=sd->status.account_id;
+	m->char_id		=sd->status.char_id;
+	m->hair			=sd->status.hair;
+	m->hair_color	=sd->status.hair_color;
+	m->gender		=sd->status.sex;
+	m->class_		=sd->status.class_;
+	m->lv			=sd->status.base_level;
+//	m->exp			=0;
+//	m->exp_payper	=0;
+	m->online		=1;
+	m->position		=MAX_GUILDPOSITION-1;
+	memcpy(m->name,sd->status.name,NAME_LENGTH);
+	return;
 }
 
 /**
  * Server cache to be flushed to inter the Guild EXP
  * @see DBApply
  */
-int guild_payexp_timer_sub(DBKey key, DBData *data, va_list ap)
-{
-    int i;
-    struct guild_expcache *c;
-    struct guild *g;
-
-    c = db_data2ptr(data);
-
-    if (
-        (g = guild_search(c->guild_id)) == NULL ||
-        (i = guild_getindex(g, c->account_id, c->char_id)) < 0
-    ) {
-        ers_free(expcache_ers, c);
-        return 0;
-    }
-
-    if (g->member[i].exp > UINT64_MAX - c->exp)
-        g->member[i].exp = UINT64_MAX;
-    else
-        g->member[i].exp+= c->exp;
-
-    intif_guild_change_memberinfo(g->guild_id,c->account_id,c->char_id,
-                                  GMI_EXP,&g->member[i].exp,sizeof(g->member[i].exp));
-    c->exp=0;
-
-    ers_free(expcache_ers, c);
-    return 0;
+int guild_payexp_timer_sub(DBKey key, DBData *data, va_list ap) {
+	int i;
+	struct guild_expcache *c;
+	struct guild *g;
+
+	c = db_data2ptr(data);
+	
+	if (
+		(g = guild_search(c->guild_id)) == NULL ||
+		(i = guild_getindex(g, c->account_id, c->char_id)) < 0
+	) {
+		ers_free(expcache_ers, c);
+		return 0;
+	}
+
+	if (g->member[i].exp > UINT64_MAX - c->exp)
+		g->member[i].exp = UINT64_MAX;
+	else
+		g->member[i].exp+= c->exp;
+
+	intif_guild_change_memberinfo(g->guild_id,c->account_id,c->char_id,
+		GMI_EXP,&g->member[i].exp,sizeof(g->member[i].exp));
+	c->exp=0;
+
+	ers_free(expcache_ers, c);
+	return 0;
 }
 
 int guild_payexp_timer(int tid, unsigned int tick, int id, intptr_t data)
 {
-    guild_expcache_db->clear(guild_expcache_db,guild_payexp_timer_sub);
-    return 0;
+	guild_expcache_db->clear(guild_expcache_db,guild_payexp_timer_sub);
+	return 0;
 }
 
 /**
@@ -324,218 +331,226 @@ int guild_payexp_timer(int tid, unsigned int tick, int id, intptr_t data)
  */
 int guild_send_xy_timer_sub(DBKey key, DBData *data, va_list ap)
 {
-    struct guild *g = db_data2ptr(data);
-    int i;
+	struct guild *g = db_data2ptr(data);
+	int i;
 
-    nullpo_ret(g);
+	nullpo_ret(g);
 
-    if (!g->connect_member) {
-        // no members connected to this guild so do not iterate
-        return 0;
-    }
+	if( !g->connect_member )
+	{// no members connected to this guild so do not iterate
+		return 0;
+	}
 
-    for (i=0; i<g->max_member; i++) {
-        struct map_session_data *sd = g->member[i].sd;
-        if (sd != NULL && sd->fd && (sd->guild_x != sd->bl.x || sd->guild_y != sd->bl.y) && !sd->bg_id) {
-            clif_guild_xy(sd);
-            sd->guild_x = sd->bl.x;
-            sd->guild_y = sd->bl.y;
-        }
-    }
-    return 0;
+	for(i=0;i<g->max_member;i++){
+		struct map_session_data* sd = g->member[i].sd;
+		if( sd != NULL && sd->fd && (sd->guild_x != sd->bl.x || sd->guild_y != sd->bl.y) && !sd->bg_id )
+		{
+			clif_guild_xy(sd);
+			sd->guild_x = sd->bl.x;
+			sd->guild_y = sd->bl.y;
+		}
+	}
+	return 0;
 }
 
 //Code from party_send_xy_timer [Skotlex]
 static int guild_send_xy_timer(int tid, unsigned int tick, int id, intptr_t data)
 {
-    guild_db->foreach(guild_db,guild_send_xy_timer_sub,tick);
-    return 0;
+	guild_db->foreach(guild_db,guild_send_xy_timer_sub,tick);
+	return 0;
 }
 
 int guild_send_dot_remove(struct map_session_data *sd)
 {
-    if (sd->status.guild_id)
-        clif_guild_xy_remove(sd);
-    return 0;
+	if (sd->status.guild_id)
+		clif_guild_xy_remove(sd);
+	return 0;
 }
 //------------------------------------------------------------------------
 
 int guild_create(struct map_session_data *sd, const char *name)
 {
-    char tname[NAME_LENGTH];
-    struct guild_member m;
-    nullpo_ret(sd);
+	char tname[NAME_LENGTH];
+	struct guild_member m;
+	nullpo_ret(sd);
 
-    safestrncpy(tname, name, NAME_LENGTH);
-    trim(tname);
+	safestrncpy(tname, name, NAME_LENGTH);
+	trim(tname);
 
-    if (!tname[0])
-        return 0; // empty name
+	if( !tname[0] )
+		return 0; // empty name
 
-    if (sd->status.guild_id) {
-        // already in a guild
-        clif_guild_created(sd,1);
-        return 0;
-    }
-    if (battle_config.guild_emperium_check && pc_search_inventory(sd,714) == -1) {
-        // item required
-        clif_guild_created(sd,3);
-        return 0;
-    }
+	if( sd->status.guild_id )
+	{// already in a guild
+		clif_guild_created(sd,1);
+		return 0;
+	}
+	if( battle_config.guild_emperium_check && pc_search_inventory(sd,714) == -1 )
+	{// item required
+		clif_guild_created(sd,3);
+		return 0;
+	}
 
-    guild_makemember(&m,sd);
-    m.position=0;
-    intif_guild_create(name,&m);
-    return 1;
+	guild_makemember(&m,sd);
+	m.position=0;
+	intif_guild_create(name,&m);
+	return 1;
 }
 
 //Whether or not to create guild
 int guild_created(int account_id,int guild_id)
 {
-    struct map_session_data *sd=map_id2sd(account_id);
+	struct map_session_data *sd=map_id2sd(account_id);
 
-    if (sd==NULL)
-        return 0;
-    if (!guild_id) {
+	if(sd==NULL)
+		return 0;
+	if(!guild_id) {
         clif_guild_created(sd, 2); // Creation failure (presence of the same name Guild)
-        return 0;
-    }
-    //struct guild *g;
-    sd->status.guild_id=guild_id;
-    clif_guild_created(sd,0);
-    if (battle_config.guild_emperium_check)
-        pc_delitem(sd,pc_search_inventory(sd,ITEMID_EMPERIUM),1,0,0,LOG_TYPE_CONSUME);  //emperium consumption
-    return 0;
+		return 0;
+	}
+	//struct guild *g;
+	sd->status.guild_id=guild_id;
+	clif_guild_created(sd,0);
+	if(battle_config.guild_emperium_check)
+		pc_delitem(sd,pc_search_inventory(sd,ITEMID_EMPERIUM),1,0,0,LOG_TYPE_CONSUME);	//emperium consumption
+	return 0;
 }
 
 //Information request
 int guild_request_info(int guild_id)
 {
-    return intif_guild_request_info(guild_id);
+	return intif_guild_request_info(guild_id);
 }
 
 //Information request with event
 int guild_npc_request_info(int guild_id,const char *event)
 {
-    if (guild_search(guild_id)) {
-        if (event && *event)
-            npc_event_do(event);
+	if( guild_search(guild_id) )
+	{
+		if( event && *event )
+			npc_event_do(event);
 
-        return 0;
-    }
+		return 0;
+	}
 
-    if (event && *event) {
-        struct eventlist *ev;
-        DBData prev;
-        ev=(struct eventlist *)aCalloc(sizeof(struct eventlist),1);
-        memcpy(ev->name,event,strlen(event));
-        //The one in the db (if present) becomes the next event from this.
-        if (guild_infoevent_db->put(guild_infoevent_db, db_i2key(guild_id), db_ptr2data(ev), &prev))
-            ev->next = db_data2ptr(&prev);
-    }
+	if( event && *event )
+	{
+		struct eventlist *ev;
+		DBData prev;
+		ev=(struct eventlist *)aCalloc(sizeof(struct eventlist),1);
+		memcpy(ev->name,event,strlen(event));
+		//The one in the db (if present) becomes the next event from this.
+		if (guild_infoevent_db->put(guild_infoevent_db, db_i2key(guild_id), db_ptr2data(ev), &prev))
+			ev->next = db_data2ptr(&prev);
+	}
 
-    return guild_request_info(guild_id);
+	return guild_request_info(guild_id);
 }
 
 //Confirmation of the character belongs to guild
 int guild_check_member(struct guild *g)
 {
-    int i;
-    struct map_session_data *sd;
-    struct s_mapiterator *iter;
+	int i;
+	struct map_session_data *sd;
+	struct s_mapiterator* iter;
 
-    nullpo_ret(g);
+	nullpo_ret(g);
 
-    iter = mapit_getallusers();
-    for (sd = (TBL_PC *)mapit_first(iter); mapit_exists(iter); sd = (TBL_PC *)mapit_next(iter)) {
-        if (sd->status.guild_id != g->guild_id)
-            continue;
+	iter = mapit_getallusers();
+	for( sd = (TBL_PC*)mapit_first(iter); mapit_exists(iter); sd = (TBL_PC*)mapit_next(iter) )
+	{
+		if( sd->status.guild_id != g->guild_id )
+			continue;
 
-        i = guild_getindex(g,sd->status.account_id,sd->status.char_id);
-        if (i < 0) {
-            sd->status.guild_id=0;
-            sd->guild_emblem_id=0;
-            ShowWarning("guild: check_member %d[%s] is not member\n",sd->status.account_id,sd->status.name);
-        }
-    }
-    mapit_free(iter);
+		i = guild_getindex(g,sd->status.account_id,sd->status.char_id);
+		if (i < 0) {
+			sd->status.guild_id=0;
+			sd->guild_emblem_id=0;
+			ShowWarning("guild: check_member %d[%s] is not member\n",sd->status.account_id,sd->status.name);
+		}
+	}
+	mapit_free(iter);
 
-    return 0;
+	return 0;
 }
 
 //Delete association with guild_id for all characters
 int guild_recv_noinfo(int guild_id)
 {
-    struct map_session_data *sd;
-    struct s_mapiterator *iter;
+	struct map_session_data *sd;
+	struct s_mapiterator* iter;
 
-    iter = mapit_getallusers();
-    for (sd = (TBL_PC *)mapit_first(iter); mapit_exists(iter); sd = (TBL_PC *)mapit_next(iter)) {
-        if (sd->status.guild_id == guild_id)
-            sd->status.guild_id = 0; // erase guild
-    }
-    mapit_free(iter);
+	iter = mapit_getallusers();
+	for( sd = (TBL_PC*)mapit_first(iter); mapit_exists(iter); sd = (TBL_PC*)mapit_next(iter) )
+	{
+		if( sd->status.guild_id == guild_id )
+			sd->status.guild_id = 0; // erase guild
+	}
+	mapit_free(iter);
 
-    return 0;
+	return 0;
 }
 
 //Get and display information for all member
 int guild_recv_info(struct guild *sg)
 {
-    struct guild *g,before;
-    int i,bm,m;
-    DBData data;
-    struct map_session_data *sd;
-    bool guild_new = false;
+	struct guild *g,before;
+	int i,bm,m;
+	DBData data;
+	struct map_session_data *sd;
+	bool guild_new = false;
 
-    nullpo_ret(sg);
+	nullpo_ret(sg);
 
-    if ((g = (struct guild *)idb_get(guild_db,sg->guild_id))==NULL) {
-        guild_new = true;
-        g=(struct guild *)aCalloc(1,sizeof(struct guild));
-        idb_put(guild_db,sg->guild_id,g);
-        before=*sg;
+	if((g = (struct guild*)idb_get(guild_db,sg->guild_id))==NULL)
+	{
+		guild_new = true;
+		g=(struct guild *)aCalloc(1,sizeof(struct guild));
+		idb_put(guild_db,sg->guild_id,g);
+		before=*sg;
 
         //Perform the check on the user because the first load
-        guild_check_member(sg);
-        if ((sd = map_nick2sd(sg->master)) != NULL) {
-            //If the guild master is online the first time the guild_info is received,
-            //that means he was the first to join, so apply guild skill blocking here.
-            if (battle_config.guild_skill_relog_delay)
-                guild_block_skill(sd, 300000);
-
-            //Also set the guild master flag.
-            sd->state.gmaster_flag = g;
-            clif_charnameupdate(sd); // [LuzZza]
-            clif_guild_masterormember(sd);
-        }
-    } else
-        before=*g;
-    memcpy(g,sg,sizeof(struct guild));
-
-    if (g->max_member > MAX_GUILD) {
-        ShowError("guild_recv_info: Received guild with %d members, but MAX_GUILD is only %d. Extra guild-members have been lost!\n", g->max_member, MAX_GUILD);
-        g->max_member = MAX_GUILD;
-    }
-
-    for (i=bm=m=0; i<g->max_member; i++) {
-        if (g->member[i].account_id>0) {
-            sd = g->member[i].sd = guild_sd_check(g->guild_id, g->member[i].account_id, g->member[i].char_id);
-            if (sd) clif_charnameupdate(sd); // [LuzZza]
-            m++;
-        } else
-            g->member[i].sd=NULL;
-        if (before.member[i].account_id>0)
-            bm++;
-    }
+		guild_check_member(sg);
+		if ((sd = map_nick2sd(sg->master)) != NULL)
+		{
+			//If the guild master is online the first time the guild_info is received,
+			//that means he was the first to join, so apply guild skill blocking here.
+			if( battle_config.guild_skill_relog_delay )
+				guild_block_skill(sd, 300000);
+
+			//Also set the guild master flag.
+			sd->state.gmaster_flag = g;
+			clif_charnameupdate(sd); // [LuzZza]
+			clif_guild_masterormember(sd);
+		}
+	}else
+		before=*g;
+	memcpy(g,sg,sizeof(struct guild));
+
+	if(g->max_member > MAX_GUILD)
+	{
+		ShowError("guild_recv_info: Received guild with %d members, but MAX_GUILD is only %d. Extra guild-members have been lost!\n", g->max_member, MAX_GUILD);
+		g->max_member = MAX_GUILD;
+	}
+	
+	for(i=bm=m=0;i<g->max_member;i++){
+		if(g->member[i].account_id>0){
+			sd = g->member[i].sd = guild_sd_check(g->guild_id, g->member[i].account_id, g->member[i].char_id);
+			if (sd) clif_charnameupdate(sd); // [LuzZza]
+			m++;
+		}else
+			g->member[i].sd=NULL;
+		if(before.member[i].account_id>0)
+			bm++;
+	}
 
     for (i = 0; i < g->max_member; i++) { //Transmission of information at all members
-        sd = g->member[i].sd;
-        if (sd==NULL)
-            continue;
+		sd = g->member[i].sd;
+		if( sd==NULL )
+			continue;
 
         if (before.guild_lv != g->guild_lv || bm != m ||
-            before.max_member != g->max_member) {
+                before.max_member != g->max_member) {
             clif_guild_basicinfo(sd); //Submit basic information
             clif_guild_emblem(sd, g); //Submit emblem
         }
@@ -555,122 +570,126 @@ int guild_recv_info(struct guild *sg)
     }
 
     //Occurrence of an event
-    if (guild_infoevent_db->remove(guild_infoevent_db, db_i2key(sg->guild_id), &data)) {
-        struct eventlist *ev = db_data2ptr(&data), *ev2;
-        while (ev) {
-            npc_event_do(ev->name);
-            ev2=ev->next;
-            aFree(ev);
-            ev=ev2;
-        }
-    }
+	if (guild_infoevent_db->remove(guild_infoevent_db, db_i2key(sg->guild_id), &data))
+	{
+		struct eventlist *ev = db_data2ptr(&data), *ev2;
+		while(ev){
+			npc_event_do(ev->name);
+			ev2=ev->next;
+			aFree(ev);
+			ev=ev2;
+		}
+	}
 
-    return 0;
+	return 0;
 }
 
 /*=============================================
  * Player sd send a guild invatation to player tsd to join his guild
  *--------------------------------------------*/
-int guild_invite(struct map_session_data *sd, struct map_session_data *tsd)
-{
+int guild_invite(struct map_session_data *sd, struct map_session_data *tsd) {
     struct guild *g;
     int i;
 
-    nullpo_ret(sd);
+	nullpo_ret(sd);
 
-    g=guild_search(sd->status.guild_id);
+	g=guild_search(sd->status.guild_id);
 
-    if (tsd==NULL || g==NULL)
-        return 0;
+	if(tsd==NULL || g==NULL)
+		return 0;
 
-    if ((i=guild_getposition(g,sd))<0 || !(g->position[i].mode&0x0001))
-        return 0; //Invite permission.
+	if( (i=guild_getposition(g,sd))<0 || !(g->position[i].mode&0x0001) )
+		return 0; //Invite permission.
 
-    if (!battle_config.invite_request_check) {
+	if(!battle_config.invite_request_check) {
         if (tsd->party_invite > 0 || tsd->trade_partner || tsd->adopt_invite) { //checking if there no other invitation pending
-            clif_guild_inviteack(sd,0);
-            return 0;
-        }
-    }
-
-    if (!tsd->fd) { //You can't invite someone who has already disconnected.
-        clif_guild_inviteack(sd,1);
-        return 0;
-    }
-
-    if (tsd->status.guild_id>0 ||
-        tsd->guild_invite>0 ||
-        ((agit_flag || agit2_flag) && map[tsd->bl.m].flag.gvg_castle)) {
-        //Can't invite people inside castles. [Skotlex]
-        clif_guild_inviteack(sd,0);
-        return 0;
-    }
+			clif_guild_inviteack(sd,0);
+			return 0;
+		}
+	}
+	
+	if (!tsd->fd) { //You can't invite someone who has already disconnected.
+		clif_guild_inviteack(sd,1);
+		return 0;
+	}
+
+	if(tsd->status.guild_id>0 ||
+		tsd->guild_invite>0 ||
+		((agit_flag || agit2_flag) && map[tsd->bl.m].flag.gvg_castle))
+	{	//Can't invite people inside castles. [Skotlex]
+		clif_guild_inviteack(sd,0);
+		return 0;
+	}
 
     //search an empty spot in guild
-    ARR_FIND(0, g->max_member, i, g->member[i].account_id == 0);
-    if (i==g->max_member) {
-        clif_guild_inviteack(sd,3);
-        return 0;
-    }
+	ARR_FIND( 0, g->max_member, i, g->member[i].account_id == 0 );
+	if(i==g->max_member){
+		clif_guild_inviteack(sd,3);
+		return 0;
+	}
 
-    tsd->guild_invite=sd->status.guild_id;
-    tsd->guild_invite_account=sd->status.account_id;
+	tsd->guild_invite=sd->status.guild_id;
+	tsd->guild_invite_account=sd->status.account_id;
 
-    clif_guild_invite(tsd,g);
-    return 0;
+	clif_guild_invite(tsd,g);
+	return 0;
 }
 
 /// Guild invitation reply.
 /// flag: 0:rejected, 1:accepted
-int guild_reply_invite(struct map_session_data *sd, int guild_id, int flag)
-{
-    struct map_session_data *tsd;
-
-    nullpo_ret(sd);
-
-    // subsequent requests may override the value
-    if (sd->guild_invite != guild_id)
-        return 0; // mismatch
-
-    // look up the person who sent the invite
-    //NOTE: this can be NULL because the person might have logged off in the meantime
-    tsd = map_id2sd(sd->guild_invite_account);
-
-    if (sd->status.guild_id > 0) { // [Paradox924X]
-        // Already in another guild.
-        if (tsd) clif_guild_inviteack(tsd,0);
-        return 0;
-    } else if (flag == 0) {
-        // rejected
-        sd->guild_invite = 0;
-        sd->guild_invite_account = 0;
-        if (tsd) clif_guild_inviteack(tsd,1);
-    } else {
-        // accepted
-        struct guild_member m;
-        struct guild *g;
-        int i;
-
-        if ((g=guild_search(guild_id)) == NULL) {
-            sd->guild_invite = 0;
-            sd->guild_invite_account = 0;
-            return 0;
-        }
-
-        ARR_FIND(0, g->max_member, i, g->member[i].account_id == 0);
-        if (i == g->max_member) {
-            sd->guild_invite = 0;
-            sd->guild_invite_account = 0;
-            if (tsd) clif_guild_inviteack(tsd,3);
-            return 0;
-        }
-
-        guild_makemember(&m,sd);
-        intif_guild_addmember(guild_id, &m);
-        //TODO: send a minimap update to this player
-    }
-
-    return 0;
+int guild_reply_invite(struct map_session_data* sd, int guild_id, int flag)
+{
+	struct map_session_data* tsd;
+
+	nullpo_ret(sd);
+
+	// subsequent requests may override the value
+	if( sd->guild_invite != guild_id )
+		return 0; // mismatch
+
+	// look up the person who sent the invite
+	//NOTE: this can be NULL because the person might have logged off in the meantime
+	tsd = map_id2sd(sd->guild_invite_account);
+
+	if ( sd->status.guild_id > 0 ) // [Paradox924X]
+	{ // Already in another guild.
+		if ( tsd ) clif_guild_inviteack(tsd,0);
+		return 0;
+	}
+	else if( flag == 0 )
+	{// rejected
+		sd->guild_invite = 0;
+		sd->guild_invite_account = 0;
+		if( tsd ) clif_guild_inviteack(tsd,1);
+	}
+	else
+	{// accepted
+		struct guild_member m;
+		struct guild* g;
+		int i;
+
+		if( (g=guild_search(guild_id)) == NULL )
+		{
+			sd->guild_invite = 0;
+			sd->guild_invite_account = 0;
+			return 0;
+		}
+
+		ARR_FIND( 0, g->max_member, i, g->member[i].account_id == 0 );
+		if( i == g->max_member )
+		{
+			sd->guild_invite = 0;
+			sd->guild_invite_account = 0;
+			if( tsd ) clif_guild_inviteack(tsd,3);
+			return 0;
+		}
+
+		guild_makemember(&m,sd);
+		intif_guild_addmember(guild_id, &m);
+		//TODO: send a minimap update to this player
+	}
+
+	return 0;
 }
 
 //Invoked when a player joins.
@@ -679,25 +698,25 @@ int guild_reply_invite(struct map_session_data *sd, int guild_id, int flag)
 //- Player must be authed and must belong to a guild before invoking this method
 void guild_member_joined(struct map_session_data *sd)
 {
-    struct guild *g;
-    int i;
-    g=guild_search(sd->status.guild_id);
-    if (!g) {
-        guild_request_info(sd->status.guild_id);
-        return;
-    }
-    if (strcmp(sd->status.name,g->master) == 0) {
-        // set the Guild Master flag
-        sd->state.gmaster_flag = g;
-        // prevent Guild Skills from being used directly after relog
-        if (battle_config.guild_skill_relog_delay)
-            guild_block_skill(sd, 300000);
-    }
-    i = guild_getindex(g, sd->status.account_id, sd->status.char_id);
-    if (i == -1)
-        sd->status.guild_id = 0;
-    else
-        g->member[i].sd = sd;
+	struct guild* g;
+	int i;
+	g=guild_search(sd->status.guild_id);
+	if (!g) {
+		guild_request_info(sd->status.guild_id);
+		return;
+	}
+	if (strcmp(sd->status.name,g->master) == 0)
+	{	// set the Guild Master flag
+		sd->state.gmaster_flag = g;
+		// prevent Guild Skills from being used directly after relog
+		if( battle_config.guild_skill_relog_delay )
+			guild_block_skill(sd, 300000);
+	}
+	i = guild_getindex(g, sd->status.account_id, sd->status.char_id);
+	if (i == -1)
+		sd->status.guild_id = 0;
+	else
+		g->member[i].sd = sd;
 }
 
 /*==========================================
@@ -705,246 +724,245 @@ void guild_member_joined(struct map_session_data *sd)
  *----------------------------------------*/
 int guild_member_added(int guild_id,int account_id,int char_id,int flag)
 {
-    struct map_session_data *sd= map_id2sd(account_id),*sd2;
-    struct guild *g;
+	struct map_session_data *sd= map_id2sd(account_id),*sd2;
+	struct guild *g;
 
-    if ((g=guild_search(guild_id))==NULL)
-        return 0;
+	if( (g=guild_search(guild_id))==NULL )
+		return 0;
 
-    if (sd==NULL || sd->guild_invite==0) {
+	if(sd==NULL || sd->guild_invite==0){
         // cancel if player not present or invalide guild_id invitation
-        if (flag == 0) {
-            ShowError("guild: member added error %d is not online\n",account_id);
-            intif_guild_leave(guild_id,account_id,char_id,0,"** Data Error **");
-        }
-        return 0;
-    }
-    sd2 = map_id2sd(sd->guild_invite_account);
-    sd->guild_invite = 0;
-    sd->guild_invite_account = 0;
+		if (flag == 0) {
+			ShowError("guild: member added error %d is not online\n",account_id);
+ 			intif_guild_leave(guild_id,account_id,char_id,0,"** Data Error **");
+		}
+		return 0;
+	}
+	sd2 = map_id2sd(sd->guild_invite_account);
+	sd->guild_invite = 0;
+	sd->guild_invite_account = 0;
 
     if (flag == 1) { //failure
-        if (sd2!=NULL)
-            clif_guild_inviteack(sd2,3);
-        return 0;
-    }
+		if( sd2!=NULL )
+			clif_guild_inviteack(sd2,3);
+		return 0;
+	}
 
     //if all ok add player to guild
-    sd->status.guild_id = g->guild_id;
-    sd->guild_emblem_id = g->emblem_id;
-    //Packets which were sent in the previous 'guild_sent' implementation.
-    clif_guild_belonginfo(sd,g);
-    clif_guild_notice(sd,g);
+	sd->status.guild_id = g->guild_id;
+	sd->guild_emblem_id = g->emblem_id;
+	//Packets which were sent in the previous 'guild_sent' implementation.
+	clif_guild_belonginfo(sd,g);
+	clif_guild_notice(sd,g);
 
-    //TODO: send new emblem info to others
+	//TODO: send new emblem info to others
 
-    if (sd2!=NULL)
-        clif_guild_inviteack(sd2,2);
+	if( sd2!=NULL )
+		clif_guild_inviteack(sd2,2);
 
-    //Next line commented because it do nothing, look at guild_recv_info [LuzZza]
-    //clif_charnameupdate(sd); //Update display name [Skotlex]
+	//Next line commented because it do nothing, look at guild_recv_info [LuzZza]
+	//clif_charnameupdate(sd); //Update display name [Skotlex]
 
-    return 0;
+	return 0;
 }
 
 /*==========================================
  * Player request leaving a given guild_id
  *----------------------------------------*/
-int guild_leave(struct map_session_data *sd, int guild_id, int account_id, int char_id, const char *mes)
+int guild_leave(struct map_session_data* sd, int guild_id, int account_id, int char_id, const char* mes)
 {
-    struct guild *g;
+	struct guild *g;
 
-    nullpo_ret(sd);
+	nullpo_ret(sd);
 
-    g = guild_search(sd->status.guild_id);
+	g = guild_search(sd->status.guild_id);
 
-    if (g==NULL)
-        return 0;
+	if(g==NULL)
+		return 0;
 
-    if (sd->status.account_id!=account_id ||
-        sd->status.char_id!=char_id || sd->status.guild_id!=guild_id ||
-        ((agit_flag || agit2_flag) && map[sd->bl.m].flag.gvg_castle))
-        return 0;
+	if(sd->status.account_id!=account_id ||
+		sd->status.char_id!=char_id || sd->status.guild_id!=guild_id ||
+		((agit_flag || agit2_flag) && map[sd->bl.m].flag.gvg_castle))
+		return 0;
 
-    intif_guild_leave(sd->status.guild_id, sd->status.account_id, sd->status.char_id,0,mes);
-    return 0;
+	intif_guild_leave(sd->status.guild_id, sd->status.account_id, sd->status.char_id,0,mes);
+	return 0;
 }
 
 /*==========================================
  * Request remove a player to a given guild_id
  *----------------------------------------*/
-int guild_expulsion(struct map_session_data *sd, int guild_id, int account_id, int char_id, const char *mes)
+int guild_expulsion(struct map_session_data* sd, int guild_id, int account_id, int char_id, const char* mes)
 {
-    struct map_session_data *tsd;
-    struct guild *g;
-    int i,ps;
+	struct map_session_data *tsd;
+	struct guild *g;
+	int i,ps;
 
-    nullpo_ret(sd);
+	nullpo_ret(sd);
 
-    g = guild_search(sd->status.guild_id);
+	g = guild_search(sd->status.guild_id);
 
-    if (g==NULL)
-        return 0;
+	if(g==NULL)
+		return 0;
 
-    if (sd->status.guild_id!=guild_id)
-        return 0;
+	if(sd->status.guild_id!=guild_id)
+		return 0;
 
-    if ((ps=guild_getposition(g,sd))<0 || !(g->position[ps].mode&0x0010))
-        return 0;   //Expulsion permission
+	if( (ps=guild_getposition(g,sd))<0 || !(g->position[ps].mode&0x0010) )
+		return 0;	//Expulsion permission
 
-    //Can't leave inside guild castles.
-    if ((tsd = map_id2sd(account_id)) &&
-        tsd->status.char_id == char_id &&
-        ((agit_flag || agit2_flag) && map[tsd->bl.m].flag.gvg_castle))
-        return 0;
+  	//Can't leave inside guild castles.
+	if ((tsd = map_id2sd(account_id)) &&
+		tsd->status.char_id == char_id &&
+		((agit_flag || agit2_flag) && map[tsd->bl.m].flag.gvg_castle))
+		return 0;
 
-    // find the member and perform expulsion
-    i = guild_getindex(g, account_id, char_id);
-    if (i != -1 && strcmp(g->member[i].name,g->master) != 0)  //Can't expel the GL!
-        intif_guild_leave(g->guild_id,account_id,char_id,1,mes);
+	// find the member and perform expulsion
+	i = guild_getindex(g, account_id, char_id);
+	if( i != -1 && strcmp(g->member[i].name,g->master) != 0 ) //Can't expel the GL!
+		intif_guild_leave(g->guild_id,account_id,char_id,1,mes);
 
-    return 0;
+	return 0;
 }
 
-int guild_member_withdraw(int guild_id, int account_id, int char_id, int flag, const char *name, const char *mes)
+int guild_member_withdraw(int guild_id, int account_id, int char_id, int flag, const char* name, const char* mes)
 {
-    int i;
-    struct guild *g = guild_search(guild_id);
-    struct map_session_data *sd = map_charid2sd(char_id);
-    struct map_session_data *online_member_sd;
-
-    if (g == NULL)
-        return 0; // no such guild (error!)
-
-    i = guild_getindex(g, account_id, char_id);
-    if (i == -1)
-        return 0; // not a member (inconsistency!)
-
-    online_member_sd = guild_getavailablesd(g);
-    if (online_member_sd == NULL)
-        return 0; // noone online to inform
-
-    if (!flag)
-        clif_guild_leave(online_member_sd, name, mes);
-    else
-        clif_guild_expulsion(online_member_sd, name, mes, account_id);
-
-    // remove member from guild
-    memset(&g->member[i],0,sizeof(struct guild_member));
-    clif_guild_memberlist(online_member_sd);
-
-    // update char, if online
-    if (sd != NULL && sd->status.guild_id == guild_id) {
-        // do stuff that needs the guild_id first, BEFORE we wipe it
-        if (sd->state.storage_flag == 2) //Close the guild storage.
-            storage_guild_storageclose(sd);
-        guild_send_dot_remove(sd);
-
-        sd->status.guild_id = 0;
-        sd->guild_emblem_id = 0;
-
-        clif_charnameupdate(sd); //Update display name [Skotlex]
-        //TODO: send emblem update to self and people around
-    }
-    return 0;
-}
+	int i;
+	struct guild* g = guild_search(guild_id);
+	struct map_session_data* sd = map_charid2sd(char_id);
+	struct map_session_data* online_member_sd;
 
-int guild_send_memberinfoshort(struct map_session_data *sd,int online)
-{
-    // cleaned up [LuzZza]
-    struct guild *g;
+	if(g == NULL)
+		return 0; // no such guild (error!)
+	
+	i = guild_getindex(g, account_id, char_id);
+	if( i == -1 )
+		return 0; // not a member (inconsistency!)
 
-    nullpo_ret(sd);
+	online_member_sd = guild_getavailablesd(g);
+	if(online_member_sd == NULL)
+		return 0; // noone online to inform
 
-    if (sd->status.guild_id <= 0)
-        return 0;
+	if(!flag)
+		clif_guild_leave(online_member_sd, name, mes);
+	else
+		clif_guild_expulsion(online_member_sd, name, mes, account_id);
 
-    if (!(g = guild_search(sd->status.guild_id)))
-        return 0;
+	// remove member from guild
+	memset(&g->member[i],0,sizeof(struct guild_member));
+	clif_guild_memberlist(online_member_sd);
 
-    intif_guild_memberinfoshort(g->guild_id,
-                                sd->status.account_id,sd->status.char_id,online,sd->status.base_level,sd->status.class_);
+	// update char, if online
+	if(sd != NULL && sd->status.guild_id == guild_id)
+	{
+		// do stuff that needs the guild_id first, BEFORE we wipe it
+		if (sd->state.storage_flag == 2) //Close the guild storage.
+			storage_guild_storageclose(sd);
+		guild_send_dot_remove(sd);
 
-    if (!online) {
-        int i=guild_getindex(g,sd->status.account_id,sd->status.char_id);
-        if (i>=0)
-            g->member[i].sd=NULL;
-        else
-            ShowError("guild_send_memberinfoshort: Failed to locate member %d:%d in guild %d!\n", sd->status.account_id, sd->status.char_id, g->guild_id);
-        return 0;
-    }
+		sd->status.guild_id = 0;
+		sd->guild_emblem_id = 0;
+		
+		clif_charnameupdate(sd); //Update display name [Skotlex]
+		//TODO: send emblem update to self and people around
+	}
+	return 0;
+}
 
-    if (sd->state.connect_new) {
-        //Note that this works because it is invoked in parse_LoadEndAck before connect_new is cleared.
-        clif_guild_belonginfo(sd,g);
-        clif_guild_notice(sd,g);
-        sd->guild_emblem_id = g->emblem_id;
-    }
-    return 0;
+int guild_send_memberinfoshort(struct map_session_data *sd,int online)
+{ // cleaned up [LuzZza]
+	struct guild *g;
+	
+	nullpo_ret(sd);
+		
+	if(sd->status.guild_id <= 0)
+		return 0;
+
+	if(!(g = guild_search(sd->status.guild_id)))
+		return 0;
+
+	intif_guild_memberinfoshort(g->guild_id,
+		sd->status.account_id,sd->status.char_id,online,sd->status.base_level,sd->status.class_);
+
+	if(!online){
+		int i=guild_getindex(g,sd->status.account_id,sd->status.char_id);
+		if(i>=0)
+			g->member[i].sd=NULL;
+		else
+			ShowError("guild_send_memberinfoshort: Failed to locate member %d:%d in guild %d!\n", sd->status.account_id, sd->status.char_id, g->guild_id);
+		return 0;
+	}
+	
+	if(sd->state.connect_new)
+	{	//Note that this works because it is invoked in parse_LoadEndAck before connect_new is cleared.
+		clif_guild_belonginfo(sd,g);
+		clif_guild_notice(sd,g);
+		sd->guild_emblem_id = g->emblem_id;
+	}
+	return 0;
 }
 
 int guild_recv_memberinfoshort(int guild_id,int account_id,int char_id,int online,int lv,int class_)
-{
-    // cleaned up [LuzZza]
-
-    int i,alv,c,idx=-1,om=0,oldonline=-1;
-    struct guild *g = guild_search(guild_id);
-
-    if (g == NULL)
-        return 0;
-
-    for (i=0,alv=0,c=0,om=0; i<g->max_member; i++) {
-        struct guild_member *m=&g->member[i];
-        if (!m->account_id) continue;
-        if (m->account_id==account_id && m->char_id==char_id) {
-            oldonline=m->online;
-            m->online=online;
-            m->lv=lv;
-            m->class_=class_;
-            idx=i;
-        }
-        alv+=m->lv;
-        c++;
-        if (m->online)
-            om++;
-    }
-
-    if (idx == -1 || c == 0) {
+{ // cleaned up [LuzZza]
+	
+	int i,alv,c,idx=-1,om=0,oldonline=-1;
+	struct guild *g = guild_search(guild_id);
+	
+	if(g == NULL)
+		return 0;
+	
+	for(i=0,alv=0,c=0,om=0;i<g->max_member;i++){
+		struct guild_member *m=&g->member[i];
+		if(!m->account_id) continue;
+		if(m->account_id==account_id && m->char_id==char_id ){
+			oldonline=m->online;
+			m->online=online;
+			m->lv=lv;
+			m->class_=class_;
+			idx=i;
+		}
+		alv+=m->lv;
+		c++;
+		if(m->online)
+			om++;
+	}
+	
+	if(idx == -1 || c == 0) {
         //Treat char_id who doesn't match guild_id (not found as member)
-        struct map_session_data *sd = map_id2sd(account_id);
-        if (sd && sd->status.char_id == char_id) {
-            sd->status.guild_id=0;
-            sd->guild_emblem_id=0;
-        }
-        ShowWarning("guild: not found member %d,%d on %d[%s]\n",    account_id,char_id,guild_id,g->name);
-        return 0;
-    }
-
-    g->average_lv=alv/c;
-    g->connect_member=om;
-
-    //Ensure validity of pointer (ie: player logs in/out, changes map-server)
-    g->member[idx].sd = guild_sd_check(guild_id, account_id, char_id);
-
-    if (oldonline!=online)
-        clif_guild_memberlogin_notice(g, idx, online);
-
-    if (!g->member[idx].sd)
-        return 0;
-
-    //Send XY dot updates. [Skotlex]
-    //Moved from guild_send_memberinfoshort [LuzZza]
-    for (i=0; i < g->max_member; i++) {
-
-        if (!g->member[i].sd || i == idx ||
-            g->member[i].sd->bl.m != g->member[idx].sd->bl.m)
-            continue;
-
-        clif_guild_xy_single(g->member[idx].sd->fd, g->member[i].sd);
-        clif_guild_xy_single(g->member[i].sd->fd, g->member[idx].sd);
-    }
-
-    return 0;
+		struct map_session_data *sd = map_id2sd(account_id);
+		if(sd && sd->status.char_id == char_id) {
+			sd->status.guild_id=0;
+			sd->guild_emblem_id=0;
+		}
+		ShowWarning("guild: not found member %d,%d on %d[%s]\n",	account_id,char_id,guild_id,g->name);
+		return 0;
+	}
+	
+	g->average_lv=alv/c;
+	g->connect_member=om;
+
+	//Ensure validity of pointer (ie: player logs in/out, changes map-server)
+	g->member[idx].sd = guild_sd_check(guild_id, account_id, char_id);
+
+	if(oldonline!=online) 
+		clif_guild_memberlogin_notice(g, idx, online);
+	
+	if(!g->member[idx].sd)
+		return 0;
+
+	//Send XY dot updates. [Skotlex]
+	//Moved from guild_send_memberinfoshort [LuzZza]
+	for(i=0; i < g->max_member; i++) {
+		
+		if(!g->member[i].sd || i == idx ||
+			g->member[i].sd->bl.m != g->member[idx].sd->bl.m)
+			continue;
+
+		clif_guild_xy_single(g->member[idx].sd->fd, g->member[i].sd);
+		clif_guild_xy_single(g->member[i].sd->fd, g->member[idx].sd);
+	}
+
+	return 0;
 }
 
 /*====================================================
@@ -952,17 +970,17 @@ int guild_recv_memberinfoshort(int guild_id,int account_id,int char_id,int onlin
  *---------------------------------------------------*/
 int guild_send_message(struct map_session_data *sd,const char *mes,int len)
 {
-    nullpo_ret(sd);
+	nullpo_ret(sd);
 
-    if (sd->status.guild_id==0)
-        return 0;
-    intif_guild_message(sd->status.guild_id,sd->status.account_id,mes,len);
-    guild_recv_message(sd->status.guild_id,sd->status.account_id,mes,len);
+	if(sd->status.guild_id==0)
+		return 0;
+	intif_guild_message(sd->status.guild_id,sd->status.account_id,mes,len);
+	guild_recv_message(sd->status.guild_id,sd->status.account_id,mes,len);
 
-    // Chat logging type 'G' / Guild Chat
-    log_chat(LOG_CHAT_GUILD, sd->status.guild_id, sd->status.char_id, sd->status.account_id, mapindex_id2name(sd->mapindex), sd->bl.x, sd->bl.y, NULL, mes);
+	// Chat logging type 'G' / Guild Chat
+	log_chat(LOG_CHAT_GUILD, sd->status.guild_id, sd->status.char_id, sd->status.account_id, mapindex_id2name(sd->mapindex), sd->bl.x, sd->bl.y, NULL, mes);
 
-    return 0;
+	return 0;
 }
 
 /*====================================================
@@ -970,11 +988,11 @@ int guild_send_message(struct map_session_data *sd,const char *mes,int len)
  *---------------------------------------------------*/
 int guild_recv_message(int guild_id,int account_id,const char *mes,int len)
 {
-    struct guild *g;
-    if ((g=guild_search(guild_id))==NULL)
-        return 0;
-    clif_guild_message(g,account_id,mes,len);
-    return 0;
+	struct guild *g;
+	if( (g=guild_search(guild_id))==NULL)
+		return 0;
+	clif_guild_message(g,account_id,mes,len);
+	return 0;
 }
 
 /*====================================================
@@ -982,7 +1000,7 @@ int guild_recv_message(int guild_id,int account_id,const char *mes,int len)
  *---------------------------------------------------*/
 int guild_change_memberposition(int guild_id,int account_id,int char_id,short idx)
 {
-    return intif_guild_change_memberinfo(guild_id,account_id,char_id,GMI_POSITION,&idx,sizeof(idx));
+	return intif_guild_change_memberinfo(guild_id,account_id,char_id,GMI_POSITION,&idx,sizeof(idx));
 }
 
 /*====================================================
@@ -990,32 +1008,32 @@ int guild_change_memberposition(int guild_id,int account_id,int char_id,short id
  *---------------------------------------------------*/
 int guild_memberposition_changed(struct guild *g,int idx,int pos)
 {
-    nullpo_ret(g);
-
-    g->member[idx].position=pos;
-    clif_guild_memberpositionchanged(g,idx);
+	nullpo_ret(g);
 
-    // Update char position in client [LuzZza]
-    if (g->member[idx].sd != NULL)
-        clif_charnameupdate(g->member[idx].sd);
-    return 0;
+	g->member[idx].position=pos;
+	clif_guild_memberpositionchanged(g,idx);
+	
+	// Update char position in client [LuzZza]
+	if(g->member[idx].sd != NULL)
+		clif_charnameupdate(g->member[idx].sd);
+	return 0;
 }
 
 /*====================================================
  * Change guild title or member
  *---------------------------------------------------*/
 int guild_change_position(int guild_id,int idx,
-                          int mode,int exp_mode,const char *name)
+	int mode,int exp_mode,const char *name)
 {
-    struct guild_position p;
+	struct guild_position p;
 
-    exp_mode = cap_value(exp_mode, 0, battle_config.guild_exp_limit);
-    //Mode 0x01 <- Invite
-    //Mode 0x10 <- Expel.
-    p.mode=mode&0x11;
-    p.exp_mode=exp_mode;
-    safestrncpy(p.name,name,NAME_LENGTH);
-    return intif_guild_position(guild_id,idx,&p);
+	exp_mode = cap_value(exp_mode, 0, battle_config.guild_exp_limit);
+	//Mode 0x01 <- Invite
+	//Mode 0x10 <- Expel.
+	p.mode=mode&0x11;
+	p.exp_mode=exp_mode;
+	safestrncpy(p.name,name,NAME_LENGTH);
+	return intif_guild_position(guild_id,idx,&p);
 }
 
 /*====================================================
@@ -1023,18 +1041,18 @@ int guild_change_position(int guild_id,int idx,
  *---------------------------------------------------*/
 int guild_position_changed(int guild_id,int idx,struct guild_position *p)
 {
-    struct guild *g=guild_search(guild_id);
-    int i;
-    if (g==NULL)
-        return 0;
-    memcpy(&g->position[idx],p,sizeof(struct guild_position));
-    clif_guild_positionchanged(g,idx);
-
-    // Update char name in client [LuzZza]
-    for (i=0; i<g->max_member; i++)
-        if (g->member[i].position == idx && g->member[i].sd != NULL)
-            clif_charnameupdate(g->member[i].sd);
-    return 0;
+	struct guild *g=guild_search(guild_id);
+	int i;
+	if(g==NULL)
+		return 0;
+	memcpy(&g->position[idx],p,sizeof(struct guild_position));
+	clif_guild_positionchanged(g,idx);
+	
+	// Update char name in client [LuzZza]
+	for(i=0;i<g->max_member;i++)
+		if(g->member[i].position == idx && g->member[i].sd != NULL)
+			clif_charnameupdate(g->member[i].sd);
+	return 0;
 }
 
 /*====================================================
@@ -1042,11 +1060,11 @@ int guild_position_changed(int guild_id,int idx,struct guild_position *p)
  *---------------------------------------------------*/
 int guild_change_notice(struct map_session_data *sd,int guild_id,const char *mes1,const char *mes2)
 {
-    nullpo_ret(sd);
+	nullpo_ret(sd);
 
-    if (guild_id!=sd->status.guild_id)
-        return 0;
-    return intif_guild_notice(guild_id,mes1,mes2);
+	if(guild_id!=sd->status.guild_id)
+		return 0;
+	return intif_guild_notice(guild_id,mes1,mes2);
 }
 
 /*====================================================
@@ -1054,20 +1072,20 @@ int guild_change_notice(struct map_session_data *sd,int guild_id,const char *mes
  *---------------------------------------------------*/
 int guild_notice_changed(int guild_id,const char *mes1,const char *mes2)
 {
-    int i;
-    struct map_session_data *sd;
-    struct guild *g=guild_search(guild_id);
-    if (g==NULL)
-        return 0;
+	int i;
+	struct map_session_data *sd;
+	struct guild *g=guild_search(guild_id);
+	if(g==NULL)
+		return 0;
 
-    memcpy(g->mes1,mes1,MAX_GUILDMES1);
-    memcpy(g->mes2,mes2,MAX_GUILDMES2);
+	memcpy(g->mes1,mes1,MAX_GUILDMES1);
+	memcpy(g->mes2,mes2,MAX_GUILDMES2);
 
-    for (i=0; i<g->max_member; i++) {
-        if ((sd=g->member[i].sd)!=NULL)
-            clif_guild_notice(sd,g);
-    }
-    return 0;
+	for(i=0;i<g->max_member;i++){
+		if((sd=g->member[i].sd)!=NULL)
+			clif_guild_notice(sd,g);
+	}
+	return 0;
 }
 
 /*====================================================
@@ -1075,16 +1093,16 @@ int guild_notice_changed(int guild_id,const char *mes1,const char *mes2)
  *---------------------------------------------------*/
 int guild_change_emblem(struct map_session_data *sd,int len,const char *data)
 {
-    struct guild *g;
-    nullpo_ret(sd);
+	struct guild *g;
+	nullpo_ret(sd);
 
-    if (battle_config.require_glory_guild &&
-        !((g = guild_search(sd->status.guild_id)) && guild_checkskill(g, GD_GLORYGUILD)>0)) {
-        clif_skill_fail(sd,GD_GLORYGUILD,USESKILL_FAIL_LEVEL,0);
-        return 0;
-    }
+	if (battle_config.require_glory_guild &&
+		!((g = guild_search(sd->status.guild_id)) && guild_checkskill(g, GD_GLORYGUILD)>0)) {
+		clif_skill_fail(sd,GD_GLORYGUILD,USESKILL_FAIL_LEVEL,0);
+		return 0;
+	}
 
-    return intif_guild_emblem(sd->status.guild_id,len,data);
+	return intif_guild_emblem(sd->status.guild_id,len,data);
 }
 
 /*====================================================
@@ -1092,59 +1110,60 @@ int guild_change_emblem(struct map_session_data *sd,int len,const char *data)
  *---------------------------------------------------*/
 int guild_emblem_changed(int len,int guild_id,int emblem_id,const char *data)
 {
-    int i;
-    struct map_session_data *sd;
-    struct guild *g=guild_search(guild_id);
-    if (g==NULL)
-        return 0;
-
-    memcpy(g->emblem_data,data,len);
-    g->emblem_len=len;
-    g->emblem_id=emblem_id;
-
-    for (i=0; i<g->max_member; i++) {
-        if ((sd=g->member[i].sd)!=NULL) {
-            sd->guild_emblem_id=emblem_id;
-            clif_guild_belonginfo(sd,g);
-            clif_guild_emblem(sd,g);
-            clif_guild_emblem_area(&sd->bl);
-        }
-    }
-    {
-        // update guardians (mobs)
-        DBIterator *iter = db_iterator(castle_db);
-        struct guild_castle *gc;
-        for (gc = (struct guild_castle *)dbi_first(iter) ; dbi_exists(iter); gc = (struct guild_castle *)dbi_next(iter)) {
-            if (gc->guild_id != guild_id)
-                continue;
-            // update permanent guardians
-            for (i = 0; i < ARRAYLENGTH(gc->guardian); ++i) {
-                TBL_MOB *md = (gc->guardian[i].id ? map_id2md(gc->guardian[i].id) : NULL);
-                if (md == NULL || md->guardian_data == NULL)
-                    continue;
-                md->guardian_data->emblem_id = emblem_id;
-                clif_guild_emblem_area(&md->bl);
-            }
-            // update temporary guardians
-            for (i = 0; i < gc->temp_guardians_max; ++i) {
-                TBL_MOB *md = (gc->temp_guardians[i] ? map_id2md(gc->temp_guardians[i]) : NULL);
-                if (md == NULL || md->guardian_data == NULL)
-                    continue;
-                md->guardian_data->emblem_id = emblem_id;
-                clif_guild_emblem_area(&md->bl);
-            }
-        }
-        dbi_destroy(iter);
-    }
-    {
-        // update npcs (flags or other npcs that used flagemblem to attach to this guild)
-        for (i = 0; i < guild_flags_count; i++) {
-            if (guild_flags[i] && guild_flags[i]->u.scr.guild_id == guild_id) {
-                clif_guild_emblem_area(&guild_flags[i]->bl);
-            }
-        }
-    }
-    return 0;
+	int i;
+	struct map_session_data *sd;
+	struct guild *g=guild_search(guild_id);
+	if(g==NULL)
+		return 0;
+
+	memcpy(g->emblem_data,data,len);
+	g->emblem_len=len;
+	g->emblem_id=emblem_id;
+
+	for(i=0;i<g->max_member;i++){
+		if((sd=g->member[i].sd)!=NULL){
+			sd->guild_emblem_id=emblem_id;
+			clif_guild_belonginfo(sd,g);
+			clif_guild_emblem(sd,g);
+			clif_guild_emblem_area(&sd->bl);
+		}
+	}
+	{// update guardians (mobs)
+		DBIterator* iter = db_iterator(castle_db);
+		struct guild_castle* gc;
+		for( gc = (struct guild_castle*)dbi_first(iter) ; dbi_exists(iter); gc = (struct guild_castle*)dbi_next(iter) )
+		{
+			if( gc->guild_id != guild_id )
+				continue;
+			// update permanent guardians
+			for( i = 0; i < ARRAYLENGTH(gc->guardian); ++i )
+			{
+				TBL_MOB* md = (gc->guardian[i].id ? map_id2md(gc->guardian[i].id) : NULL);
+				if( md == NULL || md->guardian_data == NULL )
+					continue;
+				md->guardian_data->emblem_id = emblem_id;
+				clif_guild_emblem_area(&md->bl);
+			}
+			// update temporary guardians
+			for( i = 0; i < gc->temp_guardians_max; ++i )
+			{
+				TBL_MOB* md = (gc->temp_guardians[i] ? map_id2md(gc->temp_guardians[i]) : NULL);
+				if( md == NULL || md->guardian_data == NULL )
+					continue;
+				md->guardian_data->emblem_id = emblem_id;
+				clif_guild_emblem_area(&md->bl);
+			}
+		}
+		dbi_destroy(iter);
+	}
+	{// update npcs (flags or other npcs that used flagemblem to attach to this guild)
+		for( i = 0; i < guild_flags_count; i++ ) {
+			if( guild_flags[i] && guild_flags[i]->u.scr.guild_id == guild_id ) {
+				clif_guild_emblem_area(&guild_flags[i]->bl);
+			}
+		}
+	}
+	return 0;
 }
 
 /**
@@ -1152,15 +1171,15 @@ int guild_emblem_changed(int len,int guild_id,int emblem_id,const char *data)
  */
 static DBData create_expcache(DBKey key, va_list args)
 {
-    struct guild_expcache *c;
-    struct map_session_data *sd = va_arg(args, struct map_session_data *);
+	struct guild_expcache *c;
+	struct map_session_data *sd = va_arg(args, struct map_session_data*);
 
-    c = ers_alloc(expcache_ers, struct guild_expcache);
-    c->guild_id = sd->status.guild_id;
-    c->account_id = sd->status.account_id;
-    c->char_id = sd->status.char_id;
-    c->exp = 0;
-    return db_ptr2data(c);
+	c = ers_alloc(expcache_ers, struct guild_expcache);
+	c->guild_id = sd->status.guild_id;
+	c->account_id = sd->status.account_id;
+	c->char_id = sd->status.char_id;
+	c->exp = 0;
+	return db_ptr2data(c);
 }
 
 /*====================================================
@@ -1168,33 +1187,33 @@ static DBData create_expcache(DBKey key, va_list args)
  *---------------------------------------------------*/
 unsigned int guild_payexp(struct map_session_data *sd,unsigned int exp)
 {
-    struct guild *g;
-    struct guild_expcache *c;
-    int per;
-
-    nullpo_ret(sd);
-
-    if (!exp) return 0;
-
-    if (sd->status.guild_id == 0 ||
-        (g = guild_search(sd->status.guild_id)) == NULL ||
-        (per = guild_getposition(g,sd)) < 0 ||
-        (per = g->position[per].exp_mode) < 1)
-        return 0;
-
-
-    if (per < 100)
-        exp = exp * per / 100;
-    //Otherwise tax everything.
-
-    c = db_data2ptr(guild_expcache_db->ensure(guild_expcache_db, db_i2key(sd->status.char_id), create_expcache, sd));
-
-    if (c->exp > UINT64_MAX - exp)
-        c->exp = UINT64_MAX;
-    else
-        c->exp += exp;
-
-    return exp;
+	struct guild *g;
+	struct guild_expcache *c;
+	int per;
+	
+	nullpo_ret(sd);
+
+	if (!exp) return 0;
+	
+	if (sd->status.guild_id == 0 ||
+		(g = guild_search(sd->status.guild_id)) == NULL ||
+		(per = guild_getposition(g,sd)) < 0 ||
+		(per = g->position[per].exp_mode) < 1)
+		return 0;
+	
+
+	if (per < 100)
+		exp = exp * per / 100;
+	//Otherwise tax everything.
+	
+	c = db_data2ptr(guild_expcache_db->ensure(guild_expcache_db, db_i2key(sd->status.char_id), create_expcache, sd));
+
+	if (c->exp > UINT64_MAX - exp)
+		c->exp = UINT64_MAX;
+	else
+		c->exp += exp;
+	
+	return exp;
 }
 
 /*====================================================
@@ -1204,42 +1223,42 @@ unsigned int guild_payexp(struct map_session_data *sd,unsigned int exp)
  *---------------------------------------------------*/
 int guild_getexp(struct map_session_data *sd,int exp)
 {
-    struct guild_expcache *c;
-    nullpo_ret(sd);
+	struct guild_expcache *c;
+	nullpo_ret(sd);
 
-    if (sd->status.guild_id == 0 || guild_search(sd->status.guild_id) == NULL)
-        return 0;
+	if (sd->status.guild_id == 0 || guild_search(sd->status.guild_id) == NULL)
+		return 0;
 
-    c = db_data2ptr(guild_expcache_db->ensure(guild_expcache_db, db_i2key(sd->status.char_id), create_expcache, sd));
-    if (c->exp > UINT64_MAX - exp)
-        c->exp = UINT64_MAX;
-    else
-        c->exp += exp;
-    return exp;
+	c = db_data2ptr(guild_expcache_db->ensure(guild_expcache_db, db_i2key(sd->status.char_id), create_expcache, sd));
+	if (c->exp > UINT64_MAX - exp)
+		c->exp = UINT64_MAX;
+	else
+		c->exp += exp;
+	return exp;
 }
 
 /*====================================================
  * Ask to increase guildskill skill_num
  *---------------------------------------------------*/
-int guild_skillup(TBL_PC *sd, int skill_num)
+int guild_skillup(TBL_PC* sd, int skill_num)
 {
-    struct guild *g;
-    int idx = skill_num - GD_SKILLBASE;
-    int max = guild_skill_get_max(skill_num);
+	struct guild* g;
+	int idx = skill_num - GD_SKILLBASE;
+	int max = guild_skill_get_max(skill_num);
 
-    nullpo_ret(sd);
+	nullpo_ret(sd);
 
-    if (idx < 0 || idx >= MAX_GUILDSKILL || // not a guild skill
-        sd->status.guild_id == 0 || (g=guild_search(sd->status.guild_id)) == NULL || // no guild
-        strcmp(sd->status.name, g->master))  // not the guild master
-        return 0;
+	if( idx < 0 || idx >= MAX_GUILDSKILL || // not a guild skill
+			sd->status.guild_id == 0 || (g=guild_search(sd->status.guild_id)) == NULL || // no guild
+			strcmp(sd->status.name, g->master) ) // not the guild master
+		return 0;
 
-    if (g->skill_point > 0 &&
-        g->skill[idx].id != 0 &&
-        g->skill[idx].lv < max)
-        intif_guild_skillup(g->guild_id, skill_num, sd->status.account_id, max);
+	if( g->skill_point > 0 &&
+			g->skill[idx].id != 0 &&
+			g->skill[idx].lv < max )
+		intif_guild_skillup(g->guild_id, skill_num, sd->status.account_id, max);
 
-    return 0;
+	return 0;
 }
 
 /*====================================================
@@ -1247,100 +1266,99 @@ int guild_skillup(TBL_PC *sd, int skill_num)
  *---------------------------------------------------*/
 int guild_skillupack(int guild_id,int skill_num,int account_id)
 {
-    struct map_session_data *sd=map_id2sd(account_id);
-    struct guild *g=guild_search(guild_id);
-    int i;
-    if (g==NULL)
-        return 0;
-    if (sd != NULL) {
-        clif_guild_skillup(sd,skill_num,g->skill[skill_num-GD_SKILLBASE].lv);
-
-        /* Guild Aura handling */
-        switch (skill_num) {
-            case GD_LEADERSHIP:
-            case GD_GLORYWOUNDS:
-            case GD_SOULCOLD:
-            case GD_HAWKEYES:
-                guild_guildaura_refresh(sd,skill_num,g->skill[skill_num-GD_SKILLBASE].lv);
-                break;
-        }
-    }
-
-    // Inform all members
-    for (i=0; i<g->max_member; i++)
-        if ((sd=g->member[i].sd)!=NULL)
-            clif_guild_skillinfo(sd);
-
-    return 0;
-}
-
-void guild_guildaura_refresh(struct map_session_data *sd, int skill_num, int skill_lv)
-{
-    struct skill_unit_group *group = NULL;
-    int type = status_skill2sc(skill_num);
-    if (!(battle_config.guild_aura&((agit_flag || agit2_flag)?2:1)) &&
-        !(battle_config.guild_aura&(map_flag_gvg2(sd->bl.m)?8:4)))
-        return;
-    if (skill_lv <= 0)
-        return;
-    if (sd->sc.data[type] && (group = skill_id2group(sd->sc.data[type]->val4))) {
-        skill_delunitgroup(group);
-        status_change_end(&sd->bl,type,INVALID_TIMER);
-    }
-    group = skill_unitsetting(&sd->bl,skill_num,skill_lv,sd->bl.x,sd->bl.y,0);
-    if (group) {
-        sc_start4(&sd->bl,type,100,(battle_config.guild_aura&16)?0:skill_lv,0,0,group->group_id,600000);//duration doesn't matter these status never end with val4
-    }
-    return;
+	struct map_session_data *sd=map_id2sd(account_id);
+	struct guild *g=guild_search(guild_id);
+	int i;
+	if(g==NULL)
+		return 0;
+	if( sd != NULL ) {
+		clif_guild_skillup(sd,skill_num,g->skill[skill_num-GD_SKILLBASE].lv);
+
+		/* Guild Aura handling */
+		switch( skill_num ) {
+			case GD_LEADERSHIP:
+			case GD_GLORYWOUNDS:
+			case GD_SOULCOLD:
+			case GD_HAWKEYES:
+					guild_guildaura_refresh(sd,skill_num,g->skill[skill_num-GD_SKILLBASE].lv);
+				break;
+		}
+	}
+
+	// Inform all members
+	for(i=0;i<g->max_member;i++)
+		if((sd=g->member[i].sd)!=NULL)
+			clif_guild_skillinfo(sd);
+
+	return 0;
+}
+
+void guild_guildaura_refresh(struct map_session_data *sd, int skill_num, int skill_lv) {
+	struct skill_unit_group* group = NULL;
+	int type = status_skill2sc(skill_num);
+	if( !(battle_config.guild_aura&((agit_flag || agit2_flag)?2:1)) &&
+			!(battle_config.guild_aura&(map_flag_gvg2(sd->bl.m)?8:4)) )
+		return;
+	if( skill_lv <= 0 )
+		return;
+	if( sd->sc.data[type] && (group = skill_id2group(sd->sc.data[type]->val4)) ) {
+		skill_delunitgroup(group);
+		status_change_end(&sd->bl,type,INVALID_TIMER);
+	}
+	group = skill_unitsetting(&sd->bl,skill_num,skill_lv,sd->bl.x,sd->bl.y,0);
+	if( group ) {
+		sc_start4(&sd->bl,type,100,(battle_config.guild_aura&16)?0:skill_lv,0,0,group->group_id,600000);//duration doesn't matter these status never end with val4
+	}
+	return;
 }
 
 /*====================================================
  * Count number of relations the guild has.
  * Flag:
- *  0 = allied
- *  1 = enemy
+ *	0 = allied
+ *	1 = enemy
  *---------------------------------------------------*/
 int guild_get_alliance_count(struct guild *g,int flag)
 {
-    int i,c;
+	int i,c;
 
-    nullpo_ret(g);
+	nullpo_ret(g);
 
-    for (i=c=0; i<MAX_GUILDALLIANCE; i++) {
-        if (g->alliance[i].guild_id>0 &&
-            g->alliance[i].opposition==flag)
-            c++;
-    }
-    return c;
+	for(i=c=0;i<MAX_GUILDALLIANCE;i++){
+		if(	g->alliance[i].guild_id>0 &&
+			g->alliance[i].opposition==flag )
+			c++;
+	}
+	return c;
 }
 
 // Blocks all guild skills which have a common delay time.
 void guild_block_skill(struct map_session_data *sd, int time)
 {
-    int skill_num[] = { GD_BATTLEORDER, GD_REGENERATION, GD_RESTORE, GD_EMERGENCYCALL };
-    int i;
-    for (i = 0; i < 4; i++)
-        skill_blockpc_start_(sd, skill_num[i], time , true);
+	int skill_num[] = { GD_BATTLEORDER, GD_REGENERATION, GD_RESTORE, GD_EMERGENCYCALL };
+	int i;
+	for (i = 0; i < 4; i++)
+		skill_blockpc_start_(sd, skill_num[i], time , true);
 }
 
 /*====================================================
  * Check relation between guild_id1 and guild_id2.
  * Flag:
- *  0 = allied
- *  1 = enemy
+ *	0 = allied
+ *	1 = enemy
  * Returns true if yes.
  *---------------------------------------------------*/
 int guild_check_alliance(int guild_id1, int guild_id2, int flag)
 {
-    struct guild *g;
-    int i;
+	struct guild *g;
+	int i;
 
-    g = guild_search(guild_id1);
-    if (g == NULL)
-        return 0;
+	g = guild_search(guild_id1);
+	if (g == NULL)
+		return 0;
 
-    ARR_FIND(0, MAX_GUILDALLIANCE, i, g->alliance[i].guild_id == guild_id2 && g->alliance[i].opposition == flag);
-    return(i < MAX_GUILDALLIANCE) ? 1 : 0;
+	ARR_FIND( 0, MAX_GUILDALLIANCE, i, g->alliance[i].guild_id == guild_id2 && g->alliance[i].opposition == flag );
+	return( i < MAX_GUILDALLIANCE ) ? 1 : 0;
 }
 
 /*====================================================
@@ -1348,57 +1366,57 @@ int guild_check_alliance(int guild_id1, int guild_id2, int flag)
  *---------------------------------------------------*/
 int guild_reqalliance(struct map_session_data *sd,struct map_session_data *tsd)
 {
-    struct guild *g[2];
-    int i;
+	struct guild *g[2];
+	int i;
 
-    if (agit_flag || agit2_flag) {  // Disable alliance creation during woe [Valaris]
-        clif_displaymessage(sd->fd,msg_txt(676)); //"Alliances cannot be made during Guild Wars!"
-        return 0;
-    }   // end addition [Valaris]
+	if(agit_flag || agit2_flag)	{	// Disable alliance creation during woe [Valaris]
+		clif_displaymessage(sd->fd,msg_txt(676)); //"Alliances cannot be made during Guild Wars!"
+		return 0;
+	}	// end addition [Valaris]
 
 
-    nullpo_ret(sd);
+	nullpo_ret(sd);
 
-    if (tsd==NULL || tsd->status.guild_id<=0)
-        return 0;
+	if(tsd==NULL || tsd->status.guild_id<=0)
+		return 0;
 
-    g[0]=guild_search(sd->status.guild_id);
-    g[1]=guild_search(tsd->status.guild_id);
+	g[0]=guild_search(sd->status.guild_id);
+	g[1]=guild_search(tsd->status.guild_id);
 
-    if (g[0]==NULL || g[1]==NULL)
-        return 0;
+	if(g[0]==NULL || g[1]==NULL)
+		return 0;
 
-    // Prevent creation alliance with same guilds [LuzZza]
-    if (sd->status.guild_id == tsd->status.guild_id)
-        return 0;
+	// Prevent creation alliance with same guilds [LuzZza]
+	if(sd->status.guild_id == tsd->status.guild_id)
+		return 0;
 
-    if (guild_get_alliance_count(g[0],0) >= battle_config.max_guild_alliance)   {
-        clif_guild_allianceack(sd,4);
-        return 0;
-    }
-    if (guild_get_alliance_count(g[1],0) >= battle_config.max_guild_alliance) {
-        clif_guild_allianceack(sd,3);
-        return 0;
-    }
+	if( guild_get_alliance_count(g[0],0) >= battle_config.max_guild_alliance )	{
+		clif_guild_allianceack(sd,4);
+		return 0;
+	}
+	if( guild_get_alliance_count(g[1],0) >= battle_config.max_guild_alliance ) {
+		clif_guild_allianceack(sd,3);
+		return 0;
+	}
 
-    if (tsd->guild_alliance>0) {
-        clif_guild_allianceack(sd,1);
-        return 0;
-    }
+	if( tsd->guild_alliance>0 ){
+		clif_guild_allianceack(sd,1);
+		return 0;
+	}
 
     for (i = 0; i < MAX_GUILDALLIANCE; i++) { // check if already allied
-        if (g[0]->alliance[i].guild_id==tsd->status.guild_id &&
-            g[0]->alliance[i].opposition==0) {
-            clif_guild_allianceack(sd,0);
-            return 0;
-        }
-    }
+		if(	g[0]->alliance[i].guild_id==tsd->status.guild_id &&
+			g[0]->alliance[i].opposition==0){
+			clif_guild_allianceack(sd,0);
+			return 0;
+		}
+	}
 
-    tsd->guild_alliance=sd->status.guild_id;
-    tsd->guild_alliance_account=sd->status.account_id;
+	tsd->guild_alliance=sd->status.guild_id;
+	tsd->guild_alliance_account=sd->status.account_id;
 
-    clif_guild_reqalliance(tsd,sd->status.account_id,g[0]->name);
-    return 0;
+	clif_guild_reqalliance(tsd,sd->status.account_id,g[0]->name);
+	return 0;
 }
 
 /*====================================================
@@ -1406,60 +1424,60 @@ int guild_reqalliance(struct map_session_data *sd,struct map_session_data *tsd)
  *---------------------------------------------------*/
 int guild_reply_reqalliance(struct map_session_data *sd,int account_id,int flag)
 {
-    struct map_session_data *tsd;
+	struct map_session_data *tsd;
 
-    nullpo_ret(sd);
-    tsd= map_id2sd(account_id);
-    if (!tsd) { //Character left? Cancel alliance.
-        clif_guild_allianceack(sd,3);
-        return 0;
-    }
+	nullpo_ret(sd);
+	tsd= map_id2sd( account_id );
+	if (!tsd) { //Character left? Cancel alliance.
+		clif_guild_allianceack(sd,3);
+		return 0;
+	}
 
     if (sd->guild_alliance != tsd->status.guild_id) // proposed guild_id alliance doesn't match tsd guildid
-        return 0;
+		return 0;
 
     if (flag == 1) { // consent
-        int i;
+		int i;
 
         struct guild *g, *tg; // Reconfirm the number of alliance
-        g=guild_search(sd->status.guild_id);
-        tg=guild_search(tsd->status.guild_id);
-
-        if (g==NULL || guild_get_alliance_count(g,0) >= battle_config.max_guild_alliance) {
-            clif_guild_allianceack(sd,4);
-            clif_guild_allianceack(tsd,3);
-            return 0;
-        }
-        if (tg==NULL || guild_get_alliance_count(tg,0) >= battle_config.max_guild_alliance) {
-            clif_guild_allianceack(sd,3);
-            clif_guild_allianceack(tsd,4);
-            return 0;
-        }
-
-        for (i=0; i<MAX_GUILDALLIANCE; i++) {
-            if (g->alliance[i].guild_id==tsd->status.guild_id &&
-                g->alliance[i].opposition==1)
-                intif_guild_alliance(sd->status.guild_id,tsd->status.guild_id,
-                                     sd->status.account_id,tsd->status.account_id,9);
-        }
-        for (i=0; i<MAX_GUILDALLIANCE; i++) {
-            if (tg->alliance[i].guild_id==sd->status.guild_id &&
-                tg->alliance[i].opposition==1)
-                intif_guild_alliance(tsd->status.guild_id,sd->status.guild_id,
-                                     tsd->status.account_id,sd->status.account_id,9);
-        }
+		g=guild_search(sd->status.guild_id);
+		tg=guild_search(tsd->status.guild_id);
+		
+		if(g==NULL || guild_get_alliance_count(g,0) >= battle_config.max_guild_alliance){
+			clif_guild_allianceack(sd,4);
+			clif_guild_allianceack(tsd,3);
+			return 0;
+		}
+		if(tg==NULL || guild_get_alliance_count(tg,0) >= battle_config.max_guild_alliance){
+			clif_guild_allianceack(sd,3);
+			clif_guild_allianceack(tsd,4);
+			return 0;
+		}
+
+		for(i=0;i<MAX_GUILDALLIANCE;i++){
+			if(g->alliance[i].guild_id==tsd->status.guild_id &&
+				g->alliance[i].opposition==1)
+				intif_guild_alliance( sd->status.guild_id,tsd->status.guild_id,
+					sd->status.account_id,tsd->status.account_id,9 );
+		}
+		for(i=0;i<MAX_GUILDALLIANCE;i++){
+			if(tg->alliance[i].guild_id==sd->status.guild_id &&
+				tg->alliance[i].opposition==1)
+				intif_guild_alliance( tsd->status.guild_id,sd->status.guild_id,
+					tsd->status.account_id,sd->status.account_id,9 );
+		}
 
         // inform other servers
-        intif_guild_alliance(sd->status.guild_id,tsd->status.guild_id,
-                             sd->status.account_id,tsd->status.account_id,0);
-        return 0;
+		intif_guild_alliance( sd->status.guild_id,tsd->status.guild_id,
+			sd->status.account_id,tsd->status.account_id,0 );
+		return 0;
     } else { // deny
-        sd->guild_alliance=0;
-        sd->guild_alliance_account=0;
-        if (tsd!=NULL)
-            clif_guild_allianceack(tsd,3);
-    }
-    return 0;
+		sd->guild_alliance=0;
+		sd->guild_alliance_account=0;
+		if(tsd!=NULL)
+			clif_guild_allianceack(tsd,3);
+	}
+	return 0;
 }
 
 /*====================================================
@@ -1467,15 +1485,15 @@ int guild_reply_reqalliance(struct map_session_data *sd,int account_id,int flag)
  *---------------------------------------------------*/
 int guild_delalliance(struct map_session_data *sd,int guild_id,int flag)
 {
-    nullpo_ret(sd);
+	nullpo_ret(sd);
 
-    if (agit_flag || agit2_flag) {  // Disable alliance breaking during woe [Valaris]
-        clif_displaymessage(sd->fd,msg_txt(677)); //"Alliances cannot be broken during Guild Wars!"
-        return 0;
-    }   // end addition [Valaris]
+	if(agit_flag || agit2_flag)	{	// Disable alliance breaking during woe [Valaris]
+		clif_displaymessage(sd->fd,msg_txt(677)); //"Alliances cannot be broken during Guild Wars!"
+		return 0;
+	}	// end addition [Valaris]
 
-    intif_guild_alliance(sd->status.guild_id,guild_id,sd->status.account_id,0,flag|8);
-    return 0;
+	intif_guild_alliance( sd->status.guild_id,guild_id,sd->status.account_id,0,flag|8 );
+	return 0;
 }
 
 /*====================================================
@@ -1483,42 +1501,42 @@ int guild_delalliance(struct map_session_data *sd,int guild_id,int flag)
  *---------------------------------------------------*/
 int guild_opposition(struct map_session_data *sd,struct map_session_data *tsd)
 {
-    struct guild *g;
-    int i;
+	struct guild *g;
+	int i;
 
-    nullpo_ret(sd);
+	nullpo_ret(sd);
 
-    g=guild_search(sd->status.guild_id);
-    if (g==NULL || tsd==NULL)
-        return 0;
+	g=guild_search(sd->status.guild_id);
+	if(g==NULL || tsd==NULL)
+		return 0;
 
-    // Prevent creation opposition with same guilds [LuzZza]
-    if (sd->status.guild_id == tsd->status.guild_id)
-        return 0;
+	// Prevent creation opposition with same guilds [LuzZza]
+	if(sd->status.guild_id == tsd->status.guild_id)
+		return 0;
 
-    if (guild_get_alliance_count(g,1) >= battle_config.max_guild_alliance)  {
-        clif_guild_oppositionack(sd,1);
-        return 0;
-    }
+	if( guild_get_alliance_count(g,1) >= battle_config.max_guild_alliance )	{
+		clif_guild_oppositionack(sd,1);
+		return 0;
+	}
 
     for (i = 0; i < MAX_GUILDALLIANCE; i++) { // checking relations
-        if (g->alliance[i].guild_id==tsd->status.guild_id) {
+		if(g->alliance[i].guild_id==tsd->status.guild_id){
             if (g->alliance[i].opposition == 1) { // check if not already hostile
-                clif_guild_oppositionack(sd,2);
-                return 0;
-            }
-            if (agit_flag || agit2_flag) // Prevent the changing of alliances to oppositions during WoE.
-                return 0;
-            //Change alliance to opposition.
-            intif_guild_alliance(sd->status.guild_id,tsd->status.guild_id,
-                                 sd->status.account_id,tsd->status.account_id,8);
-        }
-    }
+				clif_guild_oppositionack(sd,2);
+				return 0;
+			}
+			if(agit_flag || agit2_flag) // Prevent the changing of alliances to oppositions during WoE.
+				return 0;
+			//Change alliance to opposition.
+			intif_guild_alliance( sd->status.guild_id,tsd->status.guild_id,
+				sd->status.account_id,tsd->status.account_id,8 );
+		}
+	}
 
     // inform other serv
-    intif_guild_alliance(sd->status.guild_id,tsd->status.guild_id,
-                         sd->status.account_id,tsd->status.account_id,1);
-    return 0;
+	intif_guild_alliance( sd->status.guild_id,tsd->status.guild_id,
+			sd->status.account_id,tsd->status.account_id,1 );
+	return 0;
 }
 
 /*====================================================
@@ -1526,74 +1544,79 @@ int guild_opposition(struct map_session_data *sd,struct map_session_data *tsd)
  *---------------------------------------------------*/
 int guild_allianceack(int guild_id1,int guild_id2,int account_id1,int account_id2,int flag,const char *name1,const char *name2)
 {
-    struct guild *g[2];
-    int guild_id[2];
-    const char *guild_name[2];
-    struct map_session_data *sd[2];
-    int j,i;
-
-    guild_id[0] = guild_id1;
-    guild_id[1] = guild_id2;
-    guild_name[0] = name1;
-    guild_name[1] = name2;
-    sd[0] = map_id2sd(account_id1);
-    sd[1] = map_id2sd(account_id2);
-
-    g[0]=guild_search(guild_id1);
-    g[1]=guild_search(guild_id2);
-
-    if (sd[0]!=NULL && (flag&0x0f)==0) {
-        sd[0]->guild_alliance=0;
-        sd[0]->guild_alliance_account=0;
-    }
+	struct guild *g[2];
+	int guild_id[2];
+	const char *guild_name[2];
+	struct map_session_data *sd[2];
+	int j,i;
+
+	guild_id[0] = guild_id1;
+	guild_id[1] = guild_id2;
+	guild_name[0] = name1;
+	guild_name[1] = name2;
+	sd[0] = map_id2sd(account_id1);
+	sd[1] = map_id2sd(account_id2);
+
+	g[0]=guild_search(guild_id1);
+	g[1]=guild_search(guild_id2);
+
+	if(sd[0]!=NULL && (flag&0x0f)==0){
+		sd[0]->guild_alliance=0;
+		sd[0]->guild_alliance_account=0;
+	}
 
     if (flag & 0x70) { // failure
-        for (i=0; i<2-(flag&1); i++)
-            if (sd[i]!=NULL)
-                clif_guild_allianceack(sd[i],((flag>>4)==i+1)?3:4);
-        return 0;
-    }
+		for(i=0;i<2-(flag&1);i++)
+			if( sd[i]!=NULL )
+				clif_guild_allianceack(sd[i],((flag>>4)==i+1)?3:4);
+		return 0;
+	}
 
     if (!(flag & 0x08)) { // new relationship
-        for (i=0; i<2-(flag&1); i++) {
-            if (g[i]!=NULL) {
-                ARR_FIND(0, MAX_GUILDALLIANCE, j, g[i]->alliance[j].guild_id == 0);
-                if (j < MAX_GUILDALLIANCE) {
-                    g[i]->alliance[j].guild_id=guild_id[1-i];
-                    memcpy(g[i]->alliance[j].name,guild_name[1-i],NAME_LENGTH);
-                    g[i]->alliance[j].opposition=flag&1;
-                }
-            }
-        }
+		for(i=0;i<2-(flag&1);i++)
+		{
+			if(g[i]!=NULL)
+			{
+				ARR_FIND( 0, MAX_GUILDALLIANCE, j, g[i]->alliance[j].guild_id == 0 );
+				if( j < MAX_GUILDALLIANCE )
+				{
+					g[i]->alliance[j].guild_id=guild_id[1-i];
+					memcpy(g[i]->alliance[j].name,guild_name[1-i],NAME_LENGTH);
+					g[i]->alliance[j].opposition=flag&1;
+				}
+			}
+		}
     } else { // remove relationship
-        for (i=0; i<2-(flag&1); i++) {
-            if (g[i]!=NULL) {
-                ARR_FIND(0, MAX_GUILDALLIANCE, j, g[i]->alliance[j].guild_id == guild_id[1-i] && g[i]->alliance[j].opposition == (flag&1));
-                if (j < MAX_GUILDALLIANCE)
-                    g[i]->alliance[j].guild_id = 0;
-            }
+		for(i=0;i<2-(flag&1);i++)
+		{
+			if(g[i]!=NULL)
+			{
+				ARR_FIND( 0, MAX_GUILDALLIANCE, j, g[i]->alliance[j].guild_id == guild_id[1-i] && g[i]->alliance[j].opposition == (flag&1) );
+				if( j < MAX_GUILDALLIANCE )
+					g[i]->alliance[j].guild_id = 0;
+			}
             if (sd[i] != NULL) // notify players
-                clif_guild_delalliance(sd[i],guild_id[1-i],(flag&1));
-        }
-    }
+				clif_guild_delalliance(sd[i],guild_id[1-i],(flag&1));
+		}
+	}
 
     if ((flag & 0x0f) == 0) { // alliance notification
-        if (sd[1]!=NULL)
-            clif_guild_allianceack(sd[1],2);
+		if( sd[1]!=NULL )
+			clif_guild_allianceack(sd[1],2);
     } else if ((flag & 0x0f) == 1) { // enemy notification
-        if (sd[0]!=NULL)
-            clif_guild_oppositionack(sd[0],0);
-    }
+		if( sd[0]!=NULL )
+			clif_guild_oppositionack(sd[0],0);
+	}
 
 
     for (i = 0; i < 2 - (flag & 1); i++) { // Retransmission of the relationship list to all members
-        struct map_session_data *sd;
-        if (g[i]!=NULL)
-            for (j=0; j<g[i]->max_member; j++)
-                if ((sd=g[i]->member[j].sd)!=NULL)
-                    clif_guild_allianceinfo(sd);
-    }
-    return 0;
+		struct map_session_data *sd;
+		if(g[i]!=NULL)
+			for(j=0;j<g[i]->max_member;j++)
+				if((sd=g[i]->member[j].sd)!=NULL)
+					clif_guild_allianceinfo(sd);
+	}
+	return 0;
 }
 
 /**
@@ -1602,23 +1625,23 @@ int guild_allianceack(int guild_id1,int guild_id2,int account_id1,int account_id
  */
 int guild_broken_sub(DBKey key, DBData *data, va_list ap)
 {
-    struct guild *g = db_data2ptr(data);
-    int guild_id=va_arg(ap,int);
-    int i,j;
-    struct map_session_data *sd=NULL;
+	struct guild *g = db_data2ptr(data);
+	int guild_id=va_arg(ap,int);
+	int i,j;
+	struct map_session_data *sd=NULL;
 
-    nullpo_ret(g);
+	nullpo_ret(g);
 
-    for (i=0; i<MAX_GUILDALLIANCE; i++) { // Destroy all relationships
-        if (g->alliance[i].guild_id==guild_id) {
-            for (j=0; j<g->max_member; j++)
-                if ((sd=g->member[j].sd)!=NULL)
-                    clif_guild_delalliance(sd,guild_id,g->alliance[i].opposition);
-            intif_guild_alliance(g->guild_id, guild_id,0,0,g->alliance[i].opposition|8);
-            g->alliance[i].guild_id=0;
-        }
-    }
-    return 0;
+	for(i=0;i<MAX_GUILDALLIANCE;i++){	// Destroy all relationships
+		if(g->alliance[i].guild_id==guild_id){
+			for(j=0;j<g->max_member;j++)
+				if( (sd=g->member[j].sd)!=NULL )
+					clif_guild_delalliance(sd,guild_id,g->alliance[i].opposition);
+			intif_guild_alliance(g->guild_id, guild_id,0,0,g->alliance[i].opposition|8);
+			g->alliance[i].guild_id=0;
+		}
+	}
+	return 0;
 }
 
 /**
@@ -1627,120 +1650,124 @@ int guild_broken_sub(DBKey key, DBData *data, va_list ap)
  */
 int castle_guild_broken_sub(DBKey key, DBData *data, va_list ap)
 {
-    char name[EVENT_NAME_LENGTH];
-    struct guild_castle *gc = db_data2ptr(data);
-    int guild_id = va_arg(ap, int);
+	char name[EVENT_NAME_LENGTH];
+	struct guild_castle *gc = db_data2ptr(data);
+	int guild_id = va_arg(ap, int);
 
-    nullpo_ret(gc);
+	nullpo_ret(gc);
 
-    if (gc->guild_id == guild_id) {
-        // We call castle_event::OnGuildBreak of all castles of the guild
-        // You can set all castle_events in the 'db/castle_db.txt'
-        safestrncpy(name, gc->castle_event, sizeof(name));
-        npc_event_do(strcat(name, "::OnGuildBreak"));
+	if (gc->guild_id == guild_id) {
+		// We call castle_event::OnGuildBreak of all castles of the guild
+		// You can set all castle_events in the 'db/castle_db.txt'
+		safestrncpy(name, gc->castle_event, sizeof(name));
+		npc_event_do(strcat(name, "::OnGuildBreak"));
 
-        //Save the new 'owner', this should invoke guardian clean up and other such things.
-        guild_castledatasave(gc->castle_id, 1, 0);
-    }
-    return 0;
+		//Save the new 'owner', this should invoke guardian clean up and other such things.
+		guild_castledatasave(gc->castle_id, 1, 0);
+	}
+	return 0;
 }
 
 //Invoked on /breakguild "Guild name"
 int guild_broken(int guild_id,int flag)
 {
-    struct guild *g = guild_search(guild_id);
-    struct map_session_data *sd = NULL;
-    int i;
+	struct guild *g = guild_search(guild_id);
+	struct map_session_data *sd = NULL;
+	int i;
 
-    if (flag!=0 || g==NULL)
-        return 0;
+	if(flag!=0 || g==NULL)
+		return 0;
 
-    for (i=0; i<g->max_member; i++) { // Destroy all relationships
-        if ((sd=g->member[i].sd)!=NULL) {
-            if (sd->state.storage_flag == 2)
-                storage_guild_storage_quit(sd,1);
-            sd->status.guild_id=0;
-            clif_guild_broken(g->member[i].sd,0);
-            clif_charnameupdate(sd); // [LuzZza]
-        }
-    }
+	for(i=0;i<g->max_member;i++){	// Destroy all relationships
+		if((sd=g->member[i].sd)!=NULL){
+			if(sd->state.storage_flag == 2)
+				storage_guild_storage_quit(sd,1);
+			sd->status.guild_id=0;
+			clif_guild_broken(g->member[i].sd,0);
+			clif_charnameupdate(sd); // [LuzZza]
+		}
+	}
 
-    guild_db->foreach(guild_db,guild_broken_sub,guild_id);
-    castle_db->foreach(castle_db,castle_guild_broken_sub,guild_id);
-    guild_storage_delete(guild_id);
-    idb_remove(guild_db,guild_id);
-    return 0;
+	guild_db->foreach(guild_db,guild_broken_sub,guild_id);
+	castle_db->foreach(castle_db,castle_guild_broken_sub,guild_id);
+	guild_storage_delete(guild_id);
+	idb_remove(guild_db,guild_id);
+	return 0;
 }
 
 //Changes the Guild Master to the specified player. [Skotlex]
 int guild_gm_change(int guild_id, struct map_session_data *sd)
 {
-    struct guild *g;
-    nullpo_ret(sd);
+	struct guild *g;
+	nullpo_ret(sd);
 
-    if (sd->status.guild_id != guild_id)
-        return 0;
+	if (sd->status.guild_id != guild_id)
+		return 0;
+	
+	g=guild_search(guild_id);
 
-    g=guild_search(guild_id);
+	nullpo_ret(g);
 
-    nullpo_ret(g);
-
-    if (strcmp(g->master, sd->status.name) == 0) //Nothing to change.
-        return 0;
+	if (strcmp(g->master, sd->status.name) == 0) //Nothing to change.
+		return 0;
 
-    //Notify servers that master has changed.
-    intif_guild_change_gm(guild_id, sd->status.name, strlen(sd->status.name)+1);
-    return 1;
+	//Notify servers that master has changed.
+	intif_guild_change_gm(guild_id, sd->status.name, strlen(sd->status.name)+1);
+	return 1;
 }
 
 //Notification from Char server that a guild's master has changed. [Skotlex]
 int guild_gm_changed(int guild_id, int account_id, int char_id)
 {
-    struct guild *g;
-    struct guild_member gm;
-    int pos, i;
-
-    g=guild_search(guild_id);
-
-    if (!g)
-        return 0;
-
-    for (pos=0; pos<g->max_member && !(
-             g->member[pos].account_id==account_id &&
-             g->member[pos].char_id==char_id);
-         pos++);
-
-    if (pos == 0 || pos == g->max_member) return 0;
-
-    memcpy(&gm, &g->member[pos], sizeof(struct guild_member));
-    memcpy(&g->member[pos], &g->member[0], sizeof(struct guild_member));
-    memcpy(&g->member[0], &gm, sizeof(struct guild_member));
-
-    g->member[pos].position = g->member[0].position;
-    g->member[0].position = 0; //Position 0: guild Master.
-    strcpy(g->master, g->member[0].name);
-
-    if (g->member[pos].sd && g->member[pos].sd->fd) {
-        clif_displaymessage(g->member[pos].sd->fd, msg_txt(678)); //"You no longer are the Guild Master."
-        g->member[pos].sd->state.gmaster_flag = 0;
-    }
-
-    if (g->member[0].sd && g->member[0].sd->fd) {
-        clif_displaymessage(g->member[0].sd->fd, msg_txt(679)); //"You have become the Guild Master!"
-        g->member[0].sd->state.gmaster_flag = g;
-        //Block his skills for 5 minutes to prevent abuse.
-        guild_block_skill(g->member[0].sd, 300000);
-    }
-
-    // announce the change to all guild members
-    for (i = 0; i < g->max_member; i++) {
-        if (g->member[i].sd && g->member[i].sd->fd) {
-            clif_guild_basicinfo(g->member[i].sd);
-            clif_guild_memberlist(g->member[i].sd);
-        }
-    }
-
-    return 1;
+	struct guild *g;
+	struct guild_member gm;
+	int pos, i;
+
+	g=guild_search(guild_id);
+
+	if (!g)
+		return 0;
+
+	for(pos=0; pos<g->max_member && !(
+		g->member[pos].account_id==account_id &&
+		g->member[pos].char_id==char_id);
+		pos++);
+
+	if (pos == 0 || pos == g->max_member) return 0;
+
+	memcpy(&gm, &g->member[pos], sizeof (struct guild_member));
+	memcpy(&g->member[pos], &g->member[0], sizeof(struct guild_member));
+	memcpy(&g->member[0], &gm, sizeof(struct guild_member));
+
+	g->member[pos].position = g->member[0].position;
+	g->member[0].position = 0; //Position 0: guild Master.
+	strcpy(g->master, g->member[0].name);
+
+	if (g->member[pos].sd && g->member[pos].sd->fd)
+	{
+		clif_displaymessage(g->member[pos].sd->fd, msg_txt(678)); //"You no longer are the Guild Master."
+		g->member[pos].sd->state.gmaster_flag = 0;
+	}
+	
+	if (g->member[0].sd && g->member[0].sd->fd)
+	{
+		clif_displaymessage(g->member[0].sd->fd, msg_txt(679)); //"You have become the Guild Master!"
+		g->member[0].sd->state.gmaster_flag = g;
+		//Block his skills for 5 minutes to prevent abuse.
+		guild_block_skill(g->member[0].sd, 300000);
+	}
+
+	// announce the change to all guild members
+	for( i = 0; i < g->max_member; i++ )
+	{
+		if( g->member[i].sd && g->member[i].sd->fd )
+		{
+			clif_guild_basicinfo(g->member[i].sd);
+			clif_guild_memberlist(g->member[i].sd);
+		}
+	}
+
+	return 1;
 }
 
 /*====================================================
@@ -1748,30 +1775,30 @@ int guild_gm_changed(int guild_id, int account_id, int char_id)
  *---------------------------------------------------*/
 int guild_break(struct map_session_data *sd,char *name)
 {
-    struct guild *g;
-    int i;
+	struct guild *g;
+	int i;
 
-    nullpo_ret(sd);
+	nullpo_ret(sd);
 
-    if ((g=guild_search(sd->status.guild_id))==NULL)
-        return 0;
-    if (strcmp(g->name,name)!=0)
-        return 0;
-    if (!sd->state.gmaster_flag)
-        return 0;
-    for (i=0; i<g->max_member; i++) {
-        if (g->member[i].account_id>0 && (
-                g->member[i].account_id!=sd->status.account_id ||
-                g->member[i].char_id!=sd->status.char_id))
-            break;
-    }
-    if (i<g->max_member) {
-        clif_guild_broken(sd,2);
-        return 0;
-    }
+	if( (g=guild_search(sd->status.guild_id))==NULL )
+		return 0;
+	if(strcmp(g->name,name)!=0)
+		return 0;
+	if(!sd->state.gmaster_flag)
+		return 0;
+	for(i=0;i<g->max_member;i++){
+		if(	g->member[i].account_id>0 && (
+			g->member[i].account_id!=sd->status.account_id ||
+			g->member[i].char_id!=sd->status.char_id ))
+			break;
+	}
+	if(i<g->max_member){
+		clif_guild_broken(sd,2);
+		return 0;
+	}
 
-    intif_guild_break(g->guild_id);
-    return 0;
+	intif_guild_break(g->guild_id);
+	return 0;
 }
 
 /**
@@ -1780,24 +1807,24 @@ int guild_break(struct map_session_data *sd,char *name)
  */
 void guild_castle_map_init(void)
 {
-    DBIterator *iter = NULL;
-    int num = db_size(castle_db);
+	DBIterator* iter = NULL;
+	int num = db_size(castle_db);
 
-    if (num > 0) {
-        struct guild_castle *gc = NULL;
-        int *castle_ids, *cursor;
+	if (num > 0) {
+		struct guild_castle* gc = NULL;
+		int *castle_ids, *cursor;
 
-        CREATE(castle_ids, int, num);
-        cursor = castle_ids;
-        iter = db_iterator(castle_db);
-        for (gc = dbi_first(iter); dbi_exists(iter); gc = dbi_next(iter)) {
-            *(cursor++) = gc->castle_id;
-        }
-        dbi_destroy(iter);
-        if (intif_guild_castle_dataload(num, castle_ids))
-            ShowStatus("Requested '"CL_WHITE"%d"CL_RESET"' guild castles from char-server...\n", num);
-        aFree(castle_ids);
-    }
+		CREATE(castle_ids, int, num);
+		cursor = castle_ids;
+		iter = db_iterator(castle_db);
+		for (gc = dbi_first(iter); dbi_exists(iter); gc = dbi_next(iter)) {
+			*(cursor++) = gc->castle_id;
+		}
+		dbi_destroy(iter);
+		if (intif_guild_castle_dataload(num, castle_ids))
+			ShowStatus("Requested '"CL_WHITE"%d"CL_RESET"' guild castles from char-server...\n", num);
+		aFree(castle_ids);
+	}
 }
 
 /**
@@ -1810,325 +1837,311 @@ void guild_castle_map_init(void)
  */
 int guild_castledatasave(int castle_id, int index, int value)
 {
-    struct guild_castle *gc = guild_castle_search(castle_id);
-
-    if (gc == NULL) {
-        ShowWarning("guild_castledatasave: guild castle '%d' not found\n", castle_id);
-        return 0;
-    }
-
-    switch (index) {
-        case 1: { // The castle's owner has changed? Update or remove Guardians too. [Skotlex]
-                int i;
-                struct mob_data *gd;
-                gc->guild_id = value;
-                for (i = 0; i < MAX_GUARDIANS; i++)
-                    if (gc->guardian[i].visible && (gd = map_id2md(gc->guardian[i].id)) != NULL)
-                        mob_guardian_guildchange(gd);
-                break;
-            }
-        case 2:
-            gc->economy = value;
-            break;
-        case 3: { // defense invest change -> recalculate guardian hp
-                int i;
-                struct mob_data *gd;
-                gc->defense = value;
-                for (i = 0; i < MAX_GUARDIANS; i++)
-                    if (gc->guardian[i].visible && (gd = map_id2md(gc->guardian[i].id)) != NULL)
-                        status_calc_mob(gd, 0);
-                break;
-            }
-        case 4:
-            gc->triggerE = value;
-            break;
-        case 5:
-            gc->triggerD = value;
-            break;
-        case 6:
-            gc->nextTime = value;
-            break;
-        case 7:
-            gc->payTime = value;
-            break;
-        case 8:
-            gc->createTime = value;
-            break;
-        case 9:
-            gc->visibleC = value;
-            break;
-        default:
-            if (index > 9 && index <= 9+MAX_GUARDIANS) {
-                gc->guardian[index-10].visible = value;
-                break;
-            }
-            ShowWarning("guild_castledatasave: index = '%d' is out of allowed range\n", index);
-            return 0;
-    }
-
-    if (!intif_guild_castle_datasave(castle_id, index, value)) {
-        guild_castle_reconnect(castle_id, index, value);
-    }
-    return 0;
+	struct guild_castle *gc = guild_castle_search(castle_id);
+
+	if (gc == NULL) {
+		ShowWarning("guild_castledatasave: guild castle '%d' not found\n", castle_id);
+		return 0;
+	}
+
+	switch (index) {
+	case 1: // The castle's owner has changed? Update or remove Guardians too. [Skotlex]
+	{
+		int i;
+		struct mob_data *gd;
+		gc->guild_id = value;
+		for (i = 0; i < MAX_GUARDIANS; i++)
+			if (gc->guardian[i].visible && (gd = map_id2md(gc->guardian[i].id)) != NULL)
+				mob_guardian_guildchange(gd);
+		break;
+	}
+	case 2:
+		gc->economy = value; break;
+	case 3: // defense invest change -> recalculate guardian hp
+	{
+		int i;
+		struct mob_data *gd;
+		gc->defense = value;
+		for (i = 0; i < MAX_GUARDIANS; i++)
+			if (gc->guardian[i].visible && (gd = map_id2md(gc->guardian[i].id)) != NULL)
+				status_calc_mob(gd, 0);
+		break;
+	}
+	case 4:
+		gc->triggerE = value; break;
+	case 5:
+		gc->triggerD = value; break;
+	case 6:
+		gc->nextTime = value; break;
+	case 7:
+		gc->payTime = value; break;
+	case 8:
+		gc->createTime = value; break;
+	case 9:
+		gc->visibleC = value; break;
+	default:
+		if (index > 9 && index <= 9+MAX_GUARDIANS) {
+			gc->guardian[index-10].visible = value;
+			break;
+		}
+		ShowWarning("guild_castledatasave: index = '%d' is out of allowed range\n", index);
+		return 0;
+	}
+
+	if (!intif_guild_castle_datasave(castle_id, index, value)) {
+		guild_castle_reconnect(castle_id, index, value);
+	}
+	return 0;
 }
 
 void guild_castle_reconnect_sub(void *key, void *data, va_list ap)
 {
-    int castle_id = GetWord((int)__64BPRTSIZE(key), 0);
-    int index = GetWord((int)__64BPRTSIZE(key), 1);
-    intif_guild_castle_datasave(castle_id, index, *(int *)data);
-    aFree(data);
+	int castle_id = GetWord((int)__64BPRTSIZE(key), 0);
+	int index = GetWord((int)__64BPRTSIZE(key), 1);
+	intif_guild_castle_datasave(castle_id, index, *(int *)data);
+	aFree(data);
 }
 
 /**
- * Saves pending guild castle data changes when char-server is
+ * Saves pending guild castle data changes when char-server is 
  * disconnected.
  * On reconnect pushes all changes to char-server for saving.
  */
 void guild_castle_reconnect(int castle_id, int index, int value)
 {
-    static struct linkdb_node *gc_save_pending = NULL;
+	static struct linkdb_node *gc_save_pending = NULL;
 
-    if (castle_id < 0) { // char-server reconnected
-        linkdb_foreach(&gc_save_pending, guild_castle_reconnect_sub);
-        linkdb_final(&gc_save_pending);
-    } else {
-        int *data;
-        CREATE(data, int, 1);
-        *data = value;
-        linkdb_replace(&gc_save_pending, (void *)__64BPRTSIZE((MakeDWord(castle_id, index))), data);
-    }
+	if (castle_id < 0) { // char-server reconnected
+		linkdb_foreach(&gc_save_pending, guild_castle_reconnect_sub);
+		linkdb_final(&gc_save_pending);
+	} else {
+		int *data;
+		CREATE(data, int, 1);
+		*data = value;
+		linkdb_replace(&gc_save_pending, (void*)__64BPRTSIZE((MakeDWord(castle_id, index))), data);
+	}
 }
 
 // Load castle data then invoke OnAgitInit* on last
 int guild_castledataloadack(int len, struct guild_castle *gc)
 {
-    int i;
-    int n = (len-4) / sizeof(struct guild_castle);
-    int ev;
-
-    nullpo_ret(gc);
-
-    //Last owned castle in the list invokes ::OnAgitInit
-    for (i = n-1; i >= 0 && !(gc[i].guild_id); --i);
-    ev = i; // offset of castle or -1
-
-    if (ev < 0) {  //No castles owned, invoke OnAgitInit as it is.
-        npc_event_doall("OnAgitInit");
-        npc_event_doall("OnAgitInit2");
-    } else // load received castles into memory, one by one
-        for (i = 0; i < n; i++, gc++) {
-            struct guild_castle *c = guild_castle_search(gc->castle_id);
-            if (!c) {
-                ShowError("guild_castledataloadack: castle id=%d not found.\n", gc->castle_id);
-                continue;
-            }
-
-            // update map-server castle data with new info
-            memcpy(&c->guild_id, &gc->guild_id, sizeof(struct guild_castle) - offsetof(struct guild_castle, guild_id));
-
-            if (c->guild_id) {
-                if (i != ev)
-                    guild_request_info(c->guild_id);
-                else { // last owned one
-                    guild_npc_request_info(c->guild_id, "::OnAgitInit");
-                    guild_npc_request_info(c->guild_id, "::OnAgitInit2");
-                }
-            }
-        }
-    ShowStatus("Received '"CL_WHITE"%d"CL_RESET"' guild castles from char-server.\n", n);
-    return 0;
+	int i;
+	int n = (len-4) / sizeof(struct guild_castle);
+	int ev;
+
+	nullpo_ret(gc);
+
+	//Last owned castle in the list invokes ::OnAgitInit
+	for( i = n-1; i >= 0 && !(gc[i].guild_id); --i );
+	ev = i; // offset of castle or -1
+
+	if( ev < 0 ) { //No castles owned, invoke OnAgitInit as it is.
+		npc_event_doall("OnAgitInit");
+		npc_event_doall("OnAgitInit2");
+	}
+	else // load received castles into memory, one by one
+	for( i = 0; i < n; i++, gc++ )
+	{
+		struct guild_castle *c = guild_castle_search(gc->castle_id);
+		if (!c) {
+			ShowError("guild_castledataloadack: castle id=%d not found.\n", gc->castle_id);
+			continue;
+		}
+
+		// update map-server castle data with new info
+		memcpy(&c->guild_id, &gc->guild_id, sizeof(struct guild_castle) - offsetof(struct guild_castle, guild_id));
+
+		if( c->guild_id )
+		{
+			if( i != ev )
+				guild_request_info(c->guild_id);
+			else { // last owned one
+				guild_npc_request_info(c->guild_id, "::OnAgitInit");
+				guild_npc_request_info(c->guild_id, "::OnAgitInit2");
+			}
+		}
+	}
+	ShowStatus("Received '"CL_WHITE"%d"CL_RESET"' guild castles from char-server.\n", n);
+	return 0;
 }
 
 /*====================================================
  * Start normal woe and triggers all npc OnAgitStart
  *---------------------------------------------------*/
 void guild_agit_start(void)
-{
-    // Run All NPC_Event[OnAgitStart]
-    int c = npc_event_doall("OnAgitStart");
-    ShowStatus("NPC_Event:[OnAgitStart] Run (%d) Events by @AgitStart.\n",c);
+{	// Run All NPC_Event[OnAgitStart]
+	int c = npc_event_doall("OnAgitStart");
+	ShowStatus("NPC_Event:[OnAgitStart] Run (%d) Events by @AgitStart.\n",c);
 }
 
 /*====================================================
  * End normal woe and triggers all npc OnAgitEnd
  *---------------------------------------------------*/
 void guild_agit_end(void)
-{
-    // Run All NPC_Event[OnAgitEnd]
-    int c = npc_event_doall("OnAgitEnd");
-    ShowStatus("NPC_Event:[OnAgitEnd] Run (%d) Events by @AgitEnd.\n",c);
+{	// Run All NPC_Event[OnAgitEnd]
+	int c = npc_event_doall("OnAgitEnd");
+	ShowStatus("NPC_Event:[OnAgitEnd] Run (%d) Events by @AgitEnd.\n",c);
 }
 
 /*====================================================
  * Start woe2 and triggers all npc OnAgitStart2
  *---------------------------------------------------*/
 void guild_agit2_start(void)
-{
-    // Run All NPC_Event[OnAgitStart2]
-    int c = npc_event_doall("OnAgitStart2");
-    ShowStatus("NPC_Event:[OnAgitStart2] Run (%d) Events by @AgitStart2.\n",c);
+{	// Run All NPC_Event[OnAgitStart2]
+	int c = npc_event_doall("OnAgitStart2");
+	ShowStatus("NPC_Event:[OnAgitStart2] Run (%d) Events by @AgitStart2.\n",c);
 }
 
 /*====================================================
  * End woe2 and triggers all npc OnAgitEnd2
  *---------------------------------------------------*/
 void guild_agit2_end(void)
-{
-    // Run All NPC_Event[OnAgitEnd2]
-    int c = npc_event_doall("OnAgitEnd2");
-    ShowStatus("NPC_Event:[OnAgitEnd2] Run (%d) Events by @AgitEnd2.\n",c);
+{	// Run All NPC_Event[OnAgitEnd2]
+	int c = npc_event_doall("OnAgitEnd2");
+	ShowStatus("NPC_Event:[OnAgitEnd2] Run (%d) Events by @AgitEnd2.\n",c);
 }
 
 // How many castles does this guild have?
 int guild_checkcastles(struct guild *g)
 {
-    int nb_cas = 0;
-    struct guild_castle *gc = NULL;
-    DBIterator *iter = db_iterator(castle_db);
+	int nb_cas = 0;
+	struct guild_castle* gc = NULL;
+	DBIterator *iter = db_iterator(castle_db);
 
-    for (gc = dbi_first(iter); dbi_exists(iter); gc = dbi_next(iter)) {
-        if (gc->guild_id == g->guild_id) {
-            nb_cas++;
-        }
-    }
-    dbi_destroy(iter);
-    return nb_cas;
+	for (gc = dbi_first(iter); dbi_exists(iter); gc = dbi_next(iter)) {
+		if (gc->guild_id == g->guild_id) {
+			nb_cas++;
+		}
+	}
+	dbi_destroy(iter);
+	return nb_cas;
 }
 
 // Are these two guilds allied?
 bool guild_isallied(int guild_id, int guild_id2)
 {
-    int i;
-    struct guild *g = guild_search(guild_id);
-    nullpo_ret(g);
-
-    ARR_FIND(0, MAX_GUILDALLIANCE, i, g->alliance[i].guild_id == guild_id2);
-    return(i < MAX_GUILDALLIANCE && g->alliance[i].opposition == 0);
-}
-
-void guild_flag_add(struct npc_data *nd)
-{
-    int i;
-
-    /* check */
-    for (i = 0; i < guild_flags_count; i++) {
-        if (guild_flags[i] && guild_flags[i]->bl.id == nd->bl.id) {
-            return;/* exists, most likely updated the id. */
-        }
-    }
-
-    i = guild_flags_count;/* save the current slot */
-    /* add */
-    RECREATE(guild_flags,struct npc_data *,++guild_flags_count);
-    /* save */
-    guild_flags[i] = nd;
-}
-
-void guild_flag_remove(struct npc_data *nd)
-{
-    int i, cursor;
-    if (guild_flags_count == 0)
-        return;
-    /* find it */
-    for (i = 0; i < guild_flags_count; i++) {
-        if (guild_flags[i] && guild_flags[i]->bl.id == nd->bl.id) { /* found */
-            guild_flags[i] = NULL;
-            break;
-        }
-    }
-
-    /* compact list */
-    for (i = 0, cursor = 0; i < guild_flags_count; i++) {
-        if (guild_flags[i] == NULL)
-            continue;
-
-        if (cursor != i) {
-            memmove(&guild_flags[cursor], &guild_flags[i], sizeof(struct npc_data *));
-        }
-
-        cursor++;
-    }
+	int i;
+	struct guild* g = guild_search(guild_id);
+	nullpo_ret(g);
+
+	ARR_FIND( 0, MAX_GUILDALLIANCE, i, g->alliance[i].guild_id == guild_id2 );
+	return( i < MAX_GUILDALLIANCE && g->alliance[i].opposition == 0 );
+}
+
+void guild_flag_add(struct npc_data *nd) {
+	int i;
+	
+	/* check */
+	for( i = 0; i < guild_flags_count; i++ ) {
+		if( guild_flags[i] && guild_flags[i]->bl.id == nd->bl.id ) {
+			return;/* exists, most likely updated the id. */
+		}
+	}
+
+	i = guild_flags_count;/* save the current slot */
+	/* add */
+	RECREATE(guild_flags,struct npc_data*,++guild_flags_count);
+	/* save */
+	guild_flags[i] = nd;
+}
+
+void guild_flag_remove(struct npc_data *nd) {
+	int i, cursor;
+	if( guild_flags_count == 0 )
+		return;
+	/* find it */
+	for( i = 0; i < guild_flags_count; i++ ) {
+		if( guild_flags[i] && guild_flags[i]->bl.id == nd->bl.id ) {/* found */
+			guild_flags[i] = NULL;
+			break;
+		}
+	}
+
+	/* compact list */
+	for( i = 0, cursor = 0; i < guild_flags_count; i++ ) {
+		if( guild_flags[i] == NULL )
+			continue;
+		
+		if( cursor != i ) {
+			memmove(&guild_flags[cursor], &guild_flags[i], sizeof(struct npc_data*));
+		}
+		
+		cursor++;
+	}
 
 }
 
 /**
  * @see DBApply
  */
-static int eventlist_db_final(DBKey key, DBData *data, va_list ap)
-{
-    struct eventlist *next = NULL;
-    struct eventlist *current = db_data2ptr(data);
-    while (current != NULL) {
-        next = current->next;
-        aFree(current);
-        current = next;
-    }
-    return 0;
+static int eventlist_db_final(DBKey key, DBData *data, va_list ap) {
+	struct eventlist *next = NULL;
+	struct eventlist *current = db_data2ptr(data);
+	while (current != NULL) {
+		next = current->next;
+		aFree(current);
+		current = next;
+	}
+	return 0;
 }
 
 /**
  * @see DBApply
  */
-static int guild_expcache_db_final(DBKey key, DBData *data, va_list ap)
-{
-    ers_free(expcache_ers, db_data2ptr(data));
-    return 0;
+static int guild_expcache_db_final(DBKey key, DBData *data, va_list ap) {
+	ers_free(expcache_ers, db_data2ptr(data));
+	return 0;
 }
 
 /**
  * @see DBApply
  */
-static int guild_castle_db_final(DBKey key, DBData *data, va_list ap)
-{
-    struct guild_castle *gc = db_data2ptr(data);
-    if (gc->temp_guardians)
-        aFree(gc->temp_guardians);
-    aFree(gc);
-    return 0;
+static int guild_castle_db_final(DBKey key, DBData *data, va_list ap) {
+	struct guild_castle* gc = db_data2ptr(data);
+	if( gc->temp_guardians )
+		aFree(gc->temp_guardians);
+	aFree(gc);
+	return 0;
 }
 
 /* called when scripts are reloaded/unloaded */
-void guild_flags_clear(void)
-{
-    int i;
-    for (i = 0; i < guild_flags_count; i++) {
-        if (guild_flags[i])
-            guild_flags[i] = NULL;
-    }
-
-    guild_flags_count = 0;
-}
-
-void do_init_guild(void)
-{
-    guild_db           = idb_alloc(DB_OPT_RELEASE_DATA);
-    castle_db          = idb_alloc(DB_OPT_BASE);
-    guild_expcache_db  = idb_alloc(DB_OPT_BASE);
-    guild_infoevent_db = idb_alloc(DB_OPT_BASE);
-    expcache_ers = ers_new(sizeof(struct guild_expcache),"guild.c::expcache_ers",ERS_OPT_NONE);
-
-    guild_flags_count = 0;
-
-    sv_readdb(db_path, "castle_db.txt", ',', 4, 5, -1, &guild_read_castledb);
-
-    memset(guild_skill_tree,0,sizeof(guild_skill_tree));
-    sv_readdb(db_path, "guild_skill_tree.txt", ',', 2+MAX_GUILD_SKILL_REQUIRE*2, 2+MAX_GUILD_SKILL_REQUIRE*2, -1, &guild_read_guildskill_tree_db); //guild skill tree [Komurka]
-
-    add_timer_func_list(guild_payexp_timer,"guild_payexp_timer");
-    add_timer_func_list(guild_send_xy_timer, "guild_send_xy_timer");
-    add_timer_interval(gettick()+GUILD_PAYEXP_INVERVAL,guild_payexp_timer,0,0,GUILD_PAYEXP_INVERVAL);
-    add_timer_interval(gettick()+GUILD_SEND_XY_INVERVAL,guild_send_xy_timer,0,0,GUILD_SEND_XY_INVERVAL);
-}
-
-void do_final_guild(void)
-{
-
-    db_destroy(guild_db);
-    castle_db->destroy(castle_db,guild_castle_db_final);
-    guild_expcache_db->destroy(guild_expcache_db,guild_expcache_db_final);
-    guild_infoevent_db->destroy(guild_infoevent_db,eventlist_db_final);
-    ers_destroy(expcache_ers);
-
-    aFree(guild_flags);/* never empty; created on boot */
+void guild_flags_clear(void) {
+	int i;
+	for( i = 0; i < guild_flags_count; i++ ) {
+		if( guild_flags[i] )
+			guild_flags[i] = NULL;
+	}
+	
+	guild_flags_count = 0;
+}
+
+void do_init_guild(void) {
+	guild_db           = idb_alloc(DB_OPT_RELEASE_DATA);
+	castle_db          = idb_alloc(DB_OPT_BASE);
+	guild_expcache_db  = idb_alloc(DB_OPT_BASE);
+	guild_infoevent_db = idb_alloc(DB_OPT_BASE);
+	expcache_ers = ers_new(sizeof(struct guild_expcache),"guild.c::expcache_ers",ERS_OPT_NONE);
+	
+	guild_flags_count = 0;
+	
+	sv_readdb(db_path, "castle_db.txt", ',', 4, 5, -1, &guild_read_castledb);
+
+	memset(guild_skill_tree,0,sizeof(guild_skill_tree));
+	sv_readdb(db_path, "guild_skill_tree.txt", ',', 2+MAX_GUILD_SKILL_REQUIRE*2, 2+MAX_GUILD_SKILL_REQUIRE*2, -1, &guild_read_guildskill_tree_db); //guild skill tree [Komurka]
+
+	add_timer_func_list(guild_payexp_timer,"guild_payexp_timer");
+	add_timer_func_list(guild_send_xy_timer, "guild_send_xy_timer");
+	add_timer_interval(gettick()+GUILD_PAYEXP_INVERVAL,guild_payexp_timer,0,0,GUILD_PAYEXP_INVERVAL);
+	add_timer_interval(gettick()+GUILD_SEND_XY_INVERVAL,guild_send_xy_timer,0,0,GUILD_SEND_XY_INVERVAL);
+}
+
+void do_final_guild(void) {
+	
+	db_destroy(guild_db);
+	castle_db->destroy(castle_db,guild_castle_db_final);
+	guild_expcache_db->destroy(guild_expcache_db,guild_expcache_db_final);
+	guild_infoevent_db->destroy(guild_infoevent_db,eventlist_db_final);
+	ers_destroy(expcache_ers);
+			
+	aFree(guild_flags);/* never empty; created on boot */
 }