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

The fix in r12521 will now temporarily trim white space before checking the string length when creating a guild/party. (bugreport:1328)

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

4
src/map/guild.c
View File

@ -400,9 +400,10 @@ 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);
nullpo_retr(0, sd); nullpo_retr(0, sd);
if(sd->status.guild_id || strlen(name) < 2) if(sd->status.guild_id || strlen(trim(tname)) < 2)
{ {
clif_guild_created(sd,1); // すでに所属している clif_guild_created(sd,1); // すでに所属している
return 0; return 0;
@ -415,6 +416,7 @@ int guild_create(struct map_session_data *sd,char *name)
return 1; return 1;
} }
clif_guild_created(sd,3); // エンペリウムがいない clif_guild_created(sd,3); // エンペリウムがいない
aFree(tname);
return 0; return 0;
} }

5
src/map/party.c
View File

@ -8,6 +8,7 @@
#include "../common/malloc.h" #include "../common/malloc.h"
#include "../common/showmsg.h" #include "../common/showmsg.h"
#include "../common/utils.h" #include "../common/utils.h"
#include "../common/strlib.h"
#include "party.h" #include "party.h"
#include "atcommand.h" //msg_txt() #include "atcommand.h" //msg_txt()
@ -108,13 +109,14 @@ 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);
if(sd->status.party_id) { if(sd->status.party_id) {
clif_party_created(sd,2); clif_party_created(sd,2);
return 0; // "already in a party" return 0; // "already in a party"
} }
if(strlen(name) < 2) if(strlen(trim(tname)) < 2)
{ {
clif_party_created(sd, 1); clif_party_created(sd, 1);
return 0; return 0;
@ -127,6 +129,7 @@ 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;
} }