summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/char/int_guild.c4
-rw-r--r--src/char/int_party.c4
-rw-r--r--src/char_sql/int_guild.c8
-rw-r--r--src/char_sql/int_party.c6
-rw-r--r--src/map/clif.c2
-rw-r--r--src/map/clif.h2
-rw-r--r--src/map/guild.c2
-rw-r--r--src/map/guild.h2
-rw-r--r--src/map/intif.c14
-rw-r--r--src/map/party.c6
-rw-r--r--src/map/party.h2
12 files changed, 27 insertions, 26 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 42efdb0db..840b76b3c 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2010/05/31
+ * Replaced all occurrences of 'leaved' with 'withdraw'. [Paradox924X]
* Rewrote and optimized clif_hpmeter to employ map_foreachinarea() rather than an iteration over every session (bugreport:3956). [Paradox924X]
* Rewrote and reorganized checks in @autotrade to check and display most useful information first (bugreport:4253). [Paradox924X]
2010/05/30
diff --git a/src/char/int_guild.c b/src/char/int_guild.c
index e9b77f184..f5f7222f9 100644
--- a/src/char/int_guild.c
+++ b/src/char/int_guild.c
@@ -714,7 +714,7 @@ int mapif_guild_memberadded(int fd, int guild_id, int account_id, int char_id, i
}
// 脱退/追放通知
-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[79];
@@ -1096,7 +1096,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);
memset(&g->member[i], 0, sizeof(struct guild_member));
diff --git a/src/char/int_party.c b/src/char/int_party.c
index 78b856ebd..04d638049 100644
--- a/src/char/int_party.c
+++ b/src/char/int_party.c
@@ -365,7 +365,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;
@@ -564,7 +564,7 @@ int mapif_parse_PartyLeave(int fd, int party_id, int account_id, int char_id)
if(p->party.member[i].account_id == account_id &&
p->party.member[i].char_id == char_id)
{
- mapif_party_leaved(party_id, account_id, char_id);
+ mapif_party_withdraw(party_id, account_id, char_id);
lv = p->party.member[i].lv;
if(p->party.member[i].online) p->party.count--;
memset(&p->party.member[i], 0, sizeof(struct party_member));
diff --git a/src/char_sql/int_guild.c b/src/char_sql/int_guild.c
index 8a499a095..93a4c9ded 100644
--- a/src/char_sql/int_guild.c
+++ b/src/char_sql/int_guild.c
@@ -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));
diff --git a/src/char_sql/int_party.c b/src/char_sql/int_party.c
index a2e580416..07dbcdb7d 100644
--- a/src/char_sql/int_party.c
+++ b/src/char_sql/int_party.c
@@ -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.
diff --git a/src/map/clif.c b/src/map/clif.c
index ec8cbddac..c63722a32 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -5850,7 +5850,7 @@ int clif_party_option(struct party_data *p,struct map_session_data *sd,int flag)
/*==========================================
* パーティ脱退（脱退前に呼ぶこと）
*------------------------------------------*/
-int clif_party_leaved(struct party_data* p, struct map_session_data* sd, int account_id, const char* name, int flag)
+int clif_party_withdraw(struct party_data* p, struct map_session_data* sd, int account_id, const char* name, int flag)
{
unsigned char buf[64];
int i;
diff --git a/src/map/clif.h b/src/map/clif.h
index c1522db96..61962bf99 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -276,7 +276,7 @@ int clif_party_info(struct party_data *p, struct map_session_data *sd);
int clif_party_invite(struct map_session_data *sd,struct map_session_data *tsd);
void clif_party_inviteack(struct map_session_data* sd, const char* nick, int flag);
int clif_party_option(struct party_data *p,struct map_session_data *sd,int flag);
-int clif_party_leaved(struct party_data* p, struct map_session_data* sd, int account_id, const char* name, int flag);
+int clif_party_withdraw(struct party_data* p, struct map_session_data* sd, int account_id, const char* name, int flag);
int clif_party_message(struct party_data* p, int account_id, const char* mes, int len);
void clif_party_move(struct party* p, struct map_session_data* sd, int online);
int clif_party_xy(struct map_session_data *sd);
diff --git a/src/map/guild.c b/src/map/guild.c
index b6d1b05ae..937a90ea9 100644
--- a/src/map/guild.c
+++ b/src/map/guild.c
@@ -844,7 +844,7 @@ int guild_expulsion(struct map_session_data* sd, int guild_id, int account_id, i
return 0;
}
-int guild_member_leaved(int guild_id, int account_id, int char_id, int flag, const char* name, const char* mes)
+int guild_member_withdraw(int guild_id, int account_id, int char_id, int flag, const char* name, const char* mes)
{
int i;
struct guild* g = guild_search(guild_id);
diff --git a/src/map/guild.h b/src/map/guild.h
index 67cfd3544..753de0da1 100644
--- a/src/map/guild.h
+++ b/src/map/guild.h
@@ -56,7 +56,7 @@ void guild_member_joined(struct map_session_data *sd);
int guild_member_added(int guild_id,int account_id,int char_id,int flag);
int guild_leave(struct map_session_data *sd,int guild_id,
int account_id,int char_id,const char *mes);
-int guild_member_leaved(int guild_id,int account_id,int char_id,int flag,
+int guild_member_withdraw(int guild_id,int account_id,int char_id,int flag,
const char *name,const char *mes);
int guild_expulsion(struct map_session_data *sd,int guild_id,
int account_id,int char_id,const char *mes);
diff --git a/src/map/intif.c b/src/map/intif.c
index 49330073e..c0ac8f9d4 100644
--- a/src/map/intif.c
+++ b/src/map/intif.c
@@ -1036,11 +1036,11 @@ int intif_parse_PartyOptionChanged(int fd)
return 0;
}
// パーティ脱退通知
-int intif_parse_PartyMemberLeaved(int fd)
+int intif_parse_PartyMemberWithdraw(int fd)
{
if(battle_config.etc_log)
- ShowInfo("intif: party member leaved: Party(%d), Account(%d), Char(%d)\n",RFIFOL(fd,2),RFIFOL(fd,6),RFIFOL(fd,10));
- party_member_leaved(RFIFOL(fd,2),RFIFOL(fd,6),RFIFOL(fd,10));
+ ShowInfo("intif: party member withdraw: Party(%d), Account(%d), Char(%d)\n",RFIFOL(fd,2),RFIFOL(fd,6),RFIFOL(fd,10));
+ party_member_withdraw(RFIFOL(fd,2),RFIFOL(fd,6),RFIFOL(fd,10));
return 0;
}
// パーティ解散通知
@@ -1091,9 +1091,9 @@ int intif_parse_GuildMemberAdded(int fd)
return 0;
}
// ギルドメンバ脱退/追放通知
-int intif_parse_GuildMemberLeaved(int fd)
+int intif_parse_GuildMemberWithdraw(int fd)
{
- guild_member_leaved(RFIFOL(fd,2),RFIFOL(fd,6),RFIFOL(fd,10),RFIFOB(fd,14),(char *)RFIFOP(fd,55),(char *)RFIFOP(fd,15));
+ guild_member_withdraw(RFIFOL(fd,2),RFIFOL(fd,6),RFIFOL(fd,10),RFIFOB(fd,14),(char *)RFIFOP(fd,55),(char *)RFIFOP(fd,15));
return 0;
}
@@ -2029,14 +2029,14 @@ int intif_parse(int fd)
case 0x3821: intif_parse_PartyInfo(fd); break;
case 0x3822: intif_parse_PartyMemberAdded(fd); break;
case 0x3823: intif_parse_PartyOptionChanged(fd); break;
- case 0x3824: intif_parse_PartyMemberLeaved(fd); break;
+ case 0x3824: intif_parse_PartyMemberWithdraw(fd); break;
case 0x3825: intif_parse_PartyMove(fd); break;
case 0x3826: intif_parse_PartyBroken(fd); break;
case 0x3827: intif_parse_PartyMessage(fd); break;
case 0x3830: intif_parse_GuildCreated(fd); break;
case 0x3831: intif_parse_GuildInfo(fd); break;
case 0x3832: intif_parse_GuildMemberAdded(fd); break;
- case 0x3834: intif_parse_GuildMemberLeaved(fd); break;
+ case 0x3834: intif_parse_GuildMemberWithdraw(fd); break;
case 0x3835: intif_parse_GuildMemberInfoShort(fd); break;
case 0x3836: intif_parse_GuildBroken(fd); break;
case 0x3837: intif_parse_GuildMessage(fd); break;
diff --git a/src/map/party.c b/src/map/party.c
index 381b0a878..53755b777 100644
--- a/src/map/party.c
+++ b/src/map/party.c
@@ -516,7 +516,7 @@ int party_leave(struct map_session_data *sd)
}
/// Invoked (from char-server) when a party member leaves the party.
-int party_member_leaved(int party_id, int account_id, int char_id)
+int party_member_withdraw(int party_id, int account_id, int char_id)
{
struct map_session_data* sd = map_id2sd(account_id);
struct party_data* p = party_search(party_id);
@@ -527,7 +527,7 @@ int party_member_leaved(int party_id, int account_id, int char_id)
ARR_FIND( 0, MAX_PARTY, i, p->party.member[i].account_id == account_id && p->party.member[i].char_id == char_id );
if( i < MAX_PARTY )
{
- clif_party_leaved(p,sd,account_id,p->party.member[i].name,0x00);
+ clif_party_withdraw(p,sd,account_id,p->party.member[i].name,0x00);
memset(&p->party.member[i], 0, sizeof(p->party.member[0]));
memset(&p->data[i], 0, sizeof(p->data[0]));
p->party.count--;
@@ -567,7 +567,7 @@ int party_broken(int party_id)
{
if( p->data[i].sd!=NULL )
{
- clif_party_leaved(p,p->data[i].sd,p->party.member[i].account_id,p->party.member[i].name,0x10);
+ clif_party_withdraw(p,p->data[i].sd,p->party.member[i].account_id,p->party.member[i].name,0x10);
p->data[i].sd->status.party_id=0;
}
}
diff --git a/src/map/party.h b/src/map/party.h
index 55142fa7e..25142e4af 100644
--- a/src/map/party.h
+++ b/src/map/party.h
@@ -46,7 +46,7 @@ void party_member_joined(struct map_session_data *sd);
int party_member_added(int party_id,int account_id,int char_id,int flag);
int party_leave(struct map_session_data *sd);
int party_removemember(struct map_session_data *sd,int account_id,char *name);
-int party_member_leaved(int party_id,int account_id,int char_id);
+int party_member_withdraw(int party_id,int account_id,int char_id);
void party_reply_invite(struct map_session_data *sd,int account_id,int flag);
int party_recv_noinfo(int party_id);
int party_recv_info(struct party *sp);
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-08 01:16:47 +0000