diff options
author | Ben Longbons <b.r.longbons@gmail.com> | 2015-01-03 21:50:12 -0800 |
---|---|---|
committer | Ben Longbons <b.r.longbons@gmail.com> | 2015-01-03 21:50:12 -0800 |
commit | 4c91abd6a020ee030114ae3f22d8f6066e7528be (patch) | |
tree | 9f76256eabe4900a7eef6cbb94b7ed2378b93f48 /src/map/party.cpp | |
parent | 0a202555d2e12866b3619af92f50cb38ea4adb12 (diff) | |
parent | 711680d652a8db17c1b91428b6d6835f30dfb4fd (diff) | |
download | tmwa-4c91abd6a020ee030114ae3f22d8f6066e7528be.tar.gz tmwa-4c91abd6a020ee030114ae3f22d8f6066e7528be.tar.bz2 tmwa-4c91abd6a020ee030114ae3f22d8f6066e7528be.tar.xz tmwa-4c91abd6a020ee030114ae3f22d8f6066e7528be.zip |
Merge remote-tracking branch 'origin/hotfix'
Conflicts:
src/map/chrif.cpp
Diffstat (limited to 'src/map/party.cpp')
-rw-r--r-- | src/map/party.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/party.cpp b/src/map/party.cpp index 8150743..0a9d2c5 100644 --- a/src/map/party.cpp +++ b/src/map/party.cpp @@ -213,7 +213,7 @@ static PartyPair handle_info(const PartyPair sp) { Option<PartyPair> p_ = party_search(sp.party_id); - if OPTION_IS_SOME(p, p_) + if OPTION_IS_SOME_NOLOOP(p, p_) { *p.party_most = *sp.party_most; return p; @@ -459,7 +459,7 @@ int party_member_leaved(PartyId party_id, AccountId account_id, CharName name) { dumb_ptr<map_session_data> sd = map_id2sd(account_to_block(account_id)); Option<PartyPair> p_ = party_search(party_id); - if OPTION_IS_SOME(p, p_) + if OPTION_IS_SOME_NOLOOP(p, p_) { int i; for (i = 0; i < MAX_PARTY; i++) |