summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKirieZ <guilherme.menaldo@outlook.com>2016-12-20 19:22:18 -0200
committerKirieZ <guilherme.menaldo@outlook.com>2016-12-20 19:22:18 -0200
commit19c07f43a7d58462a6437ab92d5690302304c592 (patch)
tree51f919b80822f4a981571661a54dca0b22f6494a
parentea449a7a5720335ff1b19ef0f3b97361c606355e (diff)
downloadhercules-19c07f43a7d58462a6437ab92d5690302304c592.tar.gz
hercules-19c07f43a7d58462a6437ab92d5690302304c592.tar.bz2
hercules-19c07f43a7d58462a6437ab92d5690302304c592.tar.xz
hercules-19c07f43a7d58462a6437ab92d5690302304c592.zip
Follow-up ea449a7, fixed coding-style
-rw-r--r--src/char/int_party.c13
-rw-r--r--src/map/party.c10
2 files changed, 10 insertions, 13 deletions
diff --git a/src/char/int_party.c b/src/char/int_party.c
index a7adea30d..df1d339cf 100644
--- a/src/char/int_party.c
+++ b/src/char/int_party.c
@@ -639,23 +639,20 @@ int mapif_parse_PartyLeave(int fd, int party_id, int account_id, int char_id)
inter_party->tosql(&p->party,PS_DELMEMBER,i);
j = p->party.member[i].lv;
- if(p->party.member[i].online) p->party.count--;
+ if (p->party.member[i].online > 0) p->party.count--;
memset(&p->party.member[i], 0, sizeof(struct party_member));
p->size--;
- if (j == p->min_lv || j == p->max_lv || p->family)
- {
+ if (j == p->min_lv || j == p->max_lv || p->family) {
if(p->family) p->family = 0; //Family state broken.
inter_party->check_lv(p);
}
- if( leader ) {
+ if (leader) {
// Member was party leader, pick a new leader
i = 0;
- while (i < MAX_PARTY && p->party.member[i].account_id == 0) {
- i++;
- }
+ while (i < MAX_PARTY && p->party.member[i].account_id == 0) i++;
- if( i < MAX_PARTY ) {
+ if (i < MAX_PARTY) {
// Update party's leader
p->party.member[i].leader = 1;
inter_party->tosql(&p->party, PS_LEADER, i);
diff --git a/src/map/party.c b/src/map/party.c
index 1a9ac1cbe..aad38efa5 100644
--- a/src/map/party.c
+++ b/src/map/party.c
@@ -302,12 +302,12 @@ int party_recv_info(const struct party *sp, int char_id)
}
ARR_FIND(0, MAX_PARTY, j, p->party.member[j].leader == 1);
- if( j == MAX_PARTY ) {
+ if (j == MAX_PARTY) {
// Leader has changed
- int i;
- ARR_FIND(0, MAX_PARTY, i, sp->member[i].leader == 1);
- if( i < MAX_PARTY ) {
- clif->PartyLeaderChanged(map->id2sd(sp->member[i].account_id), 0, sp->member[i].account_id);
+ int k;
+ ARR_FIND(0, MAX_PARTY, k, sp->member[k].leader == 1);
+ if (i < MAX_PARTY) {
+ clif->PartyLeaderChanged(map->id2sd(sp->member[k].account_id), 0, sp->member[k].account_id);
} else {
party->broken(p->party.party_id); // Should not happen, Party is leaderless, disband
}