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

Replaced all occurrences of 'leaved' with 'withdraw'.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14319 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
Paradox924X
2010-06-01 00:52:39 +00:00
parent 024b015009
commit e2bd29e7c2
12 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/char_sql/int_guild.c
View File

@@ -995,7 +995,7 @@ int mapif_guild_memberadded(int fd,int guild_id,int account_id,int char_id,int f
}
// ACK member leave
int mapif_guild_leaved(int guild_id,int account_id,int char_id,int flag, const char *name, const char *mes)
int mapif_guild_withdraw(int guild_id,int account_id,int char_id,int flag, const char *name, const char *mes)
{
unsigned char buf[55+NAME_LENGTH];
WBUFW(buf, 0)=0x3834;
@@ -1006,7 +1006,7 @@ int mapif_guild_leaved(int guild_id,int account_id,int char_id,int flag, const c
memcpy(WBUFP(buf,15),mes,40);
memcpy(WBUFP(buf,55),name,NAME_LENGTH);
mapif_sendall(buf,55+NAME_LENGTH);
ShowInfo("int_guild: guild leaved (%d - %d: %s - %s)\n",guild_id,account_id,name,mes);
ShowInfo("int_guild: guild withdraw (%d - %d: %s - %s)\n",guild_id,account_id,name,mes);
return 0;
}
@@ -1376,7 +1376,7 @@ int mapif_parse_GuildLeave(int fd, int guild_id, int account_id, int char_id, in
// Unknown guild, just update the player
if( SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `guild_id`='0' WHERE `account_id`='%d' AND `char_id`='%d'", char_db, account_id, char_id) )
Sql_ShowDebug(sql_handle);
// mapif_guild_leaved(guild_id,account_id,char_id,flag,g->member[i].name,mes);
// mapif_guild_withdraw(guild_id,account_id,char_id,flag,g->member[i].name,mes);
return 0;
}
@@ -1405,7 +1405,7 @@ int mapif_parse_GuildLeave(int fd, int guild_id, int account_id, int char_id, in
safestrncpy(g->expulsion[j].mes, mes, 40);
}
mapif_guild_leaved(guild_id,account_id,char_id,flag,g->member[i].name,mes);
mapif_guild_withdraw(guild_id,account_id,char_id,flag,g->member[i].name,mes);
inter_guild_removemember_tosql(g->member[i].account_id,g->member[i].char_id);
memset(&g->member[i],0,sizeof(struct guild_member));

6
src/char_sql/int_party.c
View File

@@ -412,7 +412,7 @@ int mapif_party_optionchanged(int fd,struct party *p,int account_id,int flag)
}
// パーティ脱退通知
int mapif_party_leaved(int party_id,int account_id, int char_id) {
int mapif_party_withdraw(int party_id,int account_id, int char_id) {
unsigned char buf[16];
WBUFW(buf,0) = 0x3824;
@@ -608,14 +608,14 @@ int mapif_parse_PartyLeave(int fd, int party_id, int account_id, int char_id)
if (i >= MAX_PARTY)
return 0; //Member not found?
mapif_party_leaved(party_id, account_id, char_id);
mapif_party_withdraw(party_id, account_id, char_id);
if (p->party.member[i].leader){
p->party.member[i].account_id = 0;
for (j = 0; j < MAX_PARTY; j++) {
if (!p->party.member[j].account_id)
continue;
mapif_party_leaved(party_id, p->party.member[j].account_id, p->party.member[j].char_id);
mapif_party_withdraw(party_id, p->party.member[j].account_id, p->party.member[j].char_id);
p->party.member[j].account_id = 0;
}
//Party gets deleted on the check_empty call below.