From 3c8999edce9e1f0d5c0dee3ff8311e781d64c684 Mon Sep 17 00:00:00 2001 From: Lance Date: Sun, 27 Aug 2006 06:38:17 +0000 Subject: * Optional macro MEMSET_TURBO for faster low-level memory initializations. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8499 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/guild.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/map/guild.c') diff --git a/src/map/guild.c b/src/map/guild.c index ff972ffd9..de23c4254 100644 --- a/src/map/guild.c +++ b/src/map/guild.c @@ -94,7 +94,7 @@ int guild_read_guildskill_tree_db(void) FILE *fp; char line[1024],*p; - memset(guild_skill_tree,0,sizeof(guild_skill_tree)); + malloc_set(guild_skill_tree,0,sizeof(guild_skill_tree)); sprintf(line, "%s/guild_skill_tree.txt", db_path); if( (fp=fopen(line,"r"))==NULL){ ShowError("can't read %s\n", line); @@ -170,7 +170,7 @@ static int guild_read_castledb(void) while(fgets(line,1020,fp)){ if(line[0]=='/' && line[1]=='/') continue; - memset(str,0,sizeof(str)); + malloc_tsetdword(str,0,sizeof(str)); for(j=0,p=line;j<6 && p;j++){ str[j]=p; p=strchr(p,','); @@ -325,7 +325,7 @@ void guild_makemember(struct guild_member *m,struct map_session_data *sd) { nullpo_retv(sd); - memset(m,0,sizeof(struct guild_member)); + malloc_set(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; @@ -816,7 +816,7 @@ int guild_expulsion(struct map_session_data *sd,int guild_id, intif_guild_leave(g->guild_id,account_id,char_id,1,mes); //It's wrong way, member info will erased later //see guild_member_leaved [LuzZza] - //memset(&g->member[i],0,sizeof(struct guild_member)); + //malloc_set(&g->member[i],0,sizeof(struct guild_member)); return 0; } } @@ -846,7 +846,7 @@ int guild_member_leaved(int guild_id,int account_id,int char_id,int flag, else clif_guild_expulsion(online_member_sd, name, mes, account_id); - memset(&g->member[i],0,sizeof(struct guild_member)); + malloc_set(&g->member[i],0,sizeof(struct guild_member)); clif_guild_memberlist(online_member_sd); if(sd != NULL && sd->status.guild_id == guild_id) { -- cgit v1.2.3-70-g09d2