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

Apparently I'm the only one that has it out for the alphabet.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12537 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
Kevin 2008-04-08 15:22:04 +00:00
parent 2fdec7d617
commit db678f0eb0
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/map/guild.c
View File

@ -400,13 +400,14 @@ int guild_send_dot_remove(struct map_session_data *sd)
// 作成要求 // 作成要求
int guild_create(struct map_session_data *sd,char *name) int guild_create(struct map_session_data *sd,char *name)
{ {
char *tname = aStrdup(name); char tname[NAME_LENGTH];
nullpo_retr(0, sd); nullpo_retr(0, sd);
if(sd->status.guild_id || strlen(trim(tname)) < 2) safestrncpy(tname, name, NAME_LENGTH);
if(sd->status.guild_id || strlen(trim(tname)) == 0)
{ {
clif_guild_created(sd,1); // すでに所属している clif_guild_created(sd,1); // すでに所属している
aFree(tname);
return 0; return 0;
} }
if(!battle_config.guild_emperium_check || pc_search_inventory(sd,714) >= 0) { if(!battle_config.guild_emperium_check || pc_search_inventory(sd,714) >= 0) {
@ -414,11 +415,9 @@ int guild_create(struct map_session_data *sd,char *name)
guild_makemember(&m,sd); guild_makemember(&m,sd);
m.position=0; m.position=0;
intif_guild_create(name,&m); intif_guild_create(name,&m);
aFree(tname);
return 1; return 1;
} }
clif_guild_created(sd,3); // エンペリウムがいない clif_guild_created(sd,3); // エンペリウムがいない
aFree(tname);
return 0; return 0;
} }

8
src/map/party.c
View File

@ -109,18 +109,17 @@ struct party_data* party_searchname(const char* str)
int party_create(struct map_session_data *sd,char *name,int item,int item2) int party_create(struct map_session_data *sd,char *name,int item,int item2)
{ {
struct party_member leader; struct party_member leader;
char * tname = aStrdup(name); char tname[NAME_LENGTH];
safestrncpy(tname, name, NAME_LENGTH);
if(sd->status.party_id) { if(sd->status.party_id) {
clif_party_created(sd,2); clif_party_created(sd,2);
aFree(tname);
return 0; // "already in a party" return 0; // "already in a party"
} }
if(strlen(trim(tname)) < 2) if(strlen(trim(tname)) == 0)
{ {
clif_party_created(sd, 1); clif_party_created(sd, 1);
aFree(tname);
return 0; return 0;
} }
@ -131,7 +130,6 @@ int party_create(struct map_session_data *sd,char *name,int item,int item2)
leader.leader = 1; leader.leader = 1;
intif_create_party(&leader,name,item,item2); intif_create_party(&leader,name,item,item2);
aFree(tname);
return 0; return 0;
} }