From fca76baad8d9ef2c2ee47bcdd4ff71fc3df366aa Mon Sep 17 00:00:00 2001
From: lighta <lightaisme@gmail.com>
Date: Fri, 15 Nov 2013 12:05:44 -0500
Subject: [PATCH] Memleak fix

Fix some typo on channel ally
---
 src/common/mmo.h  |  1 +
 src/map/channel.c |  4 ++--
 src/map/guild.c   | 11 +----------
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/common/mmo.h b/src/common/mmo.h
index 92fb062639..8b184c5ef8 100644
--- a/src/common/mmo.h
+++ b/src/common/mmo.h
@@ -518,6 +518,7 @@ struct guild_skill {
 	int id,lv;
 };
 
+struct Channel;
 struct guild {
 	int guild_id;
 	short guild_lv, connect_member, max_member, average_lv;
diff --git a/src/map/channel.c b/src/map/channel.c
index 98fec438d4..126f1368f0 100644
--- a/src/map/channel.c
+++ b/src/map/channel.c
@@ -53,7 +53,7 @@ struct Channel* channel_create(char *name, char *pass, unsigned char color, enum
 	else
 		safestrncpy(channel->pass, pass, CHAN_NAME_LENGTH);
 
-	//ShowInfo("Create channel %s\n",channel->name);
+	//ShowInfo("Create channel %s type=%d, val=%d\n",channel->name,chantype,val);
 	switch(channel->type){
 	case CHAN_TYPE_MAP: channel->m = val; break;
 	case CHAN_TYPE_ALLY: channel->gid = val; break;
@@ -413,7 +413,7 @@ struct Channel* channel_name2channel(char *chname, struct map_session_data *sd,
 	else if(sd && (strcmpi(chname + 1,Channel_Config.ally_chname) == 0) && sd->guild){
 		channel = sd->guild->channel;
 		if(flag&1 && !channel) {
-			channel = channel_create(Channel_Config.map_chname,NULL,Channel_Config.map_chcolor,CHAN_TYPE_ALLY,sd->guild->guild_id);
+			channel = channel_create(Channel_Config.ally_chname,NULL,Channel_Config.ally_chcolor,CHAN_TYPE_ALLY,sd->guild->guild_id);
 			if(flag&2) channel_gjoin(sd,3);
 			sd->guild->channel = channel;
 		}
diff --git a/src/map/guild.c b/src/map/guild.c
index 4cd74f368d..1d0ec6b240 100644
--- a/src/map/guild.c
+++ b/src/map/guild.c
@@ -177,9 +177,6 @@ static bool guild_read_castledb(char* str[], int columns, int current)
 	safestrncpy(gc->castle_event, str[3], sizeof(gc->castle_event));
 
 	idb_put(castle_db,gc->castle_id,gc);
-
-	//intif_guild_castle_info(gc->castle_id);
-
 	return true;
 }
 
@@ -523,7 +520,7 @@ int guild_recv_info(struct guild *sg)
 			clif_guild_masterormember(sd);
 		}
 	} else {
-		before=*g;
+		before=*g;		
 	}
 	memcpy(g,sg,sizeof(struct guild));
 
@@ -543,12 +540,6 @@ int guild_recv_info(struct guild *sg)
 			bm++;
 	}
 
-	if(Channel_Config.ally_enable){
-		if(!g->channel){
-			g->channel = channel_create(Channel_Config.ally_chname,NULL,Channel_Config.ally_chcolor,CHAN_TYPE_ALLY,g->guild_id);
-			channel_ajoin(g);
-		}
-	}
 	for (i = 0; i < g->max_member; i++) { //Transmission of information at all members
 		sd = g->member[i].sd;
 		if( sd==NULL )