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

Fixed a mistake in r11895 where guild invitation data was being cleared too soon, causing a check to fail when confirmation arrived from the charserver.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11902 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ultramage 2007-12-13 23:29:41 +00:00
parent 9bfc5b4425
commit 822ba1ddd7
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/map/guild.c
View File

@ -684,12 +684,10 @@ int guild_reply_invite(struct map_session_data* sd, int guild_id, int flag)
//NOTE: this can be NULL because the person might have logged off in the meantime
tsd = map_id2sd(sd->guild_invite_account);
// zero out the status data
sd->guild_invite = 0;
sd->guild_invite_account = 0;
if( flag == 0 )
{// rejected
sd->guild_invite = 0;
sd->guild_invite_account = 0;
if( tsd ) clif_guild_inviteack(tsd,1);
}
else
@ -699,11 +697,17 @@ int guild_reply_invite(struct map_session_data* sd, int guild_id, int flag)
int i;
if( (g=guild_search(guild_id)) == NULL )
{
sd->guild_invite = 0;
sd->guild_invite_account = 0;
return 0;
}
ARR_FIND( 0, g->max_member, i, g->member[i].account_id == 0 );
if( i == g->max_member )
{
sd->guild_invite = 0;
sd->guild_invite_account = 0;
if( tsd ) clif_guild_inviteack(tsd,3);
return 0;
}
@ -728,7 +732,7 @@ int guild_member_added(int guild_id,int account_id,int char_id,int flag)
// キャラ側に登録できなかったため脱退要求を出す
if (flag == 0) {
ShowError("guild: member added error %d is not online\n",account_id);
intif_guild_leave(guild_id,account_id,char_id,0,"**“o˜^Ž¸”s**");
intif_guild_leave(guild_id,account_id,char_id,0,"** Data Error **");
}
return 0;
}