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

Memleak fix

Browse Source 
Fix some typo on channel ally
This commit is contained in:
lighta 2013-11-15 12:05:44 -05:00
parent a200e3a2a8
commit fca76baad8
3 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/common/mmo.h
View File

@ -518,6 +518,7 @@ struct guild_skill {
int id,lv; int id,lv;
}; };
struct Channel;
struct guild { struct guild {
int guild_id; int guild_id;
short guild_lv, connect_member, max_member, average_lv; short guild_lv, connect_member, max_member, average_lv;

4
src/map/channel.c
View File

@ -53,7 +53,7 @@ struct Channel* channel_create(char *name, char *pass, unsigned char color, enum
else else
safestrncpy(channel->pass, pass, CHAN_NAME_LENGTH); 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){ switch(channel->type){
case CHAN_TYPE_MAP: channel->m = val; break; case CHAN_TYPE_MAP: channel->m = val; break;
case CHAN_TYPE_ALLY: channel->gid = 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){ else if(sd && (strcmpi(chname + 1,Channel_Config.ally_chname) == 0) && sd->guild){
channel = sd->guild->channel; channel = sd->guild->channel;
if(flag&1 && !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); if(flag&2) channel_gjoin(sd,3);
sd->guild->channel = channel; sd->guild->channel = channel;
} }

11
src/map/guild.c
View File

@ -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)); 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);
return true; return true;
} }
@ -523,7 +520,7 @@ int guild_recv_info(struct guild *sg)
clif_guild_masterormember(sd); clif_guild_masterormember(sd);
} }
} else { } else {
before=*g; before=*g;
} }
memcpy(g,sg,sizeof(struct guild)); memcpy(g,sg,sizeof(struct guild));
@ -543,12 +540,6 @@ int guild_recv_info(struct guild *sg)
bm++; 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 for (i = 0; i < g->max_member; i++) { //Transmission of information at all members
sd = g->member[i].sd; sd = g->member[i].sd;
if( sd==NULL ) if( sd==NULL )