- Removed function inter_party_logged, which after some testing and thinking, has been concluded is no longer necessary.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9818 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
parent
148f3fca88
commit
f96bd44c5a
@ -3602,9 +3602,6 @@ int parse_char(int fd) {
|
|||||||
WFIFOSET(map_fd, WFIFOW(map_fd,2));
|
WFIFOSET(map_fd, WFIFOW(map_fd,2));
|
||||||
}
|
}
|
||||||
set_char_online(i, cd->char_id, cd->account_id);
|
set_char_online(i, cd->char_id, cd->account_id);
|
||||||
//Sets char online in the party and breaks even share if needed.
|
|
||||||
inter_party_logged(cd->party_id, cd->account_id, cd->char_id);
|
|
||||||
|
|
||||||
auth_fifo_pos++;
|
auth_fifo_pos++;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -394,33 +394,6 @@ int mapif_party_optionchanged(int fd,struct party *p, int account_id, int flag)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
//Checks whether the even-share setting of a party is broken when a character logs in. [Skotlex]
|
|
||||||
int inter_party_logged(int party_id, int account_id, int char_id)
|
|
||||||
{
|
|
||||||
struct party_data *p;
|
|
||||||
int i;
|
|
||||||
if (!party_id)
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
p = idb_get(party_db, party_id);
|
|
||||||
if(p==NULL)
|
|
||||||
return 0;
|
|
||||||
for (i = 0; i < MAX_PARTY; i++)
|
|
||||||
if(p->party.member[i].account_id == account_id &&
|
|
||||||
p->party.member[i].char_id == char_id)
|
|
||||||
{
|
|
||||||
p->party.member[i].online = 1;
|
|
||||||
p->party.count++;
|
|
||||||
if(p->party.member[i].lv < p->min_lv ||
|
|
||||||
p->party.member[i].lv > p->max_lv)
|
|
||||||
int_party_check_lv(p);
|
|
||||||
//Send online update to map servers
|
|
||||||
mapif_party_membermoved(&p->party, i);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
// ƒp?ƒeƒB?‘Þ’Ê’m
|
// ƒp?ƒeƒB?‘Þ’Ê’m
|
||||||
int mapif_party_leaved(int party_id,int account_id, int char_id) {
|
int mapif_party_leaved(int party_id,int account_id, int char_id) {
|
||||||
unsigned char buf[16];
|
unsigned char buf[16];
|
||||||
|
@ -11,7 +11,6 @@ int inter_party_save(void);
|
|||||||
int inter_party_parse_frommap(int fd);
|
int inter_party_parse_frommap(int fd);
|
||||||
|
|
||||||
int inter_party_leave(int party_id,int account_id, int char_id);
|
int inter_party_leave(int party_id,int account_id, int char_id);
|
||||||
int inter_party_logged(int party_id, int account_id, int char_id);
|
|
||||||
|
|
||||||
extern char party_txt[1024];
|
extern char party_txt[1024];
|
||||||
|
|
||||||
|
@ -3410,8 +3410,6 @@ int parse_char(int fd) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
set_char_online(i, auth_fifo[auth_fifo_pos].char_id, auth_fifo[auth_fifo_pos].account_id);
|
set_char_online(i, auth_fifo[auth_fifo_pos].char_id, auth_fifo[auth_fifo_pos].account_id);
|
||||||
//Checks to see if the even share setting of the party must be broken.
|
|
||||||
inter_party_logged(char_dat.party_id, char_dat.account_id, char_dat.char_id);
|
|
||||||
auth_fifo_pos++;
|
auth_fifo_pos++;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -459,40 +459,6 @@ int mapif_party_optionchanged(int fd,struct party *p,int account_id,int flag)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
//Checks whether the even-share setting of a party is broken when a character logs in. [Skotlex]
|
|
||||||
int inter_party_logged(int party_id, int account_id, int char_id)
|
|
||||||
{
|
|
||||||
struct party_data *p;
|
|
||||||
int i;
|
|
||||||
|
|
||||||
if (party_id <= 0)
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
if (!party_id)
|
|
||||||
return 0;
|
|
||||||
p = inter_party_fromsql(party_id);
|
|
||||||
if(!p) //Non existant party?
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
for(i = 0; i < MAX_PARTY; i++)
|
|
||||||
if(p->party.member[i].account_id==account_id &&
|
|
||||||
p->party.member[i].char_id==char_id)
|
|
||||||
{
|
|
||||||
if (!p->party.member[i].online) {
|
|
||||||
p->party.member[i].online = 1;
|
|
||||||
p->party.count++;
|
|
||||||
if(p->party.member[i].lv < p->min_lv ||
|
|
||||||
p->party.member[i].lv > p->max_lv)
|
|
||||||
int_party_check_lv(p);
|
|
||||||
//Send online update to map servers
|
|
||||||
mapif_party_membermoved(&p->party, i);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
// パーティ脱退通知
|
// パーティ脱退通知
|
||||||
int mapif_party_leaved(int party_id,int account_id, int char_id) {
|
int mapif_party_leaved(int party_id,int account_id, int char_id) {
|
||||||
unsigned char buf[16];
|
unsigned char buf[16];
|
||||||
|
@ -22,7 +22,6 @@ int inter_party_parse_frommap(int fd);
|
|||||||
int inter_party_sql_init(void);
|
int inter_party_sql_init(void);
|
||||||
void inter_party_sql_final(void);
|
void inter_party_sql_final(void);
|
||||||
int inter_party_leave(int party_id,int account_id, int char_id);
|
int inter_party_leave(int party_id,int account_id, int char_id);
|
||||||
int inter_party_logged(int party_id, int account_id, int char_id);
|
|
||||||
int inter_party_CharOnline(int char_id, int party_id);
|
int inter_party_CharOnline(int char_id, int party_id);
|
||||||
int inter_party_CharOffline(int char_id, int party_id);
|
int inter_party_CharOffline(int char_id, int party_id);
|
||||||
//Required for the TXT->SQL converter
|
//Required for the TXT->SQL converter
|
||||||
|
Loading…
x
Reference in New Issue
Block a user