diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2014-11-19 17:44:13 -0800 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2014-11-19 18:19:45 -0800 |
| commit | 711680d652a8db17c1b91428b6d6835f30dfb4fd (patch) | |
| tree | 0d64c8314f8531e2a09c7dc5e242333ddec6582b /src/char | |
| parent | 078028058d2e9fbcde2147eb4154830e08652066 (diff) | |
| download | tmwa-711680d652a8db17c1b91428b6d6835f30dfb4fd.tar.gz tmwa-711680d652a8db17c1b91428b6d6835f30dfb4fd.tar.bz2 tmwa-711680d652a8db17c1b91428b6d6835f30dfb4fd.tar.xz tmwa-711680d652a8db17c1b91428b6d6835f30dfb4fd.zip | |
Magically allow "break" within WITH_VAR
Diffstat (limited to 'src/char')
| -rw-r--r-- | src/char/int_party.cpp | 4 | ||||
| -rw-r--r-- | src/char/inter.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/char/int_party.cpp b/src/char/int_party.cpp index 9a9dbd9..5000ff2 100644 --- a/src/char/int_party.cpp +++ b/src/char/int_party.cpp @@ -327,7 +327,7 @@ void mapif_party_created(Session *s, AccountId account_id, Option<PartyPair> p_) { Packet_Fixed<0x3820> fixed_20; fixed_20.account_id = account_id; - if OPTION_IS_SOME(p, p_) + if OPTION_IS_SOME_NOLOOP(p, p_) { fixed_20.error = 0; fixed_20.party_id = p.party_id; @@ -524,7 +524,7 @@ static void mapif_parse_PartyInfo(Session *s, PartyId party_id) { Option<P<PartyMost>> maybe_party_most = party_db.search(party_id); - if OPTION_IS_SOME(party_most, maybe_party_most) + if OPTION_IS_SOME_NOLOOP(party_most, maybe_party_most) mapif_party_info(s, PartyPair{party_id, party_most}); else mapif_party_noinfo(s, party_id); diff --git a/src/char/inter.cpp b/src/char/inter.cpp index 03d027a..eccfc1b 100644 --- a/src/char/inter.cpp +++ b/src/char/inter.cpp @@ -270,7 +270,7 @@ void mapif_account_reg_reply(Session *s, AccountId account_id) Packet_Head<0x3804> head_04; head_04.account_id = account_id; std::vector<Packet_Repeat<0x3804>> repeat_04; - if OPTION_IS_SOME(reg, reg_) + if OPTION_IS_SOME_NOLOOP(reg, reg_) { repeat_04.resize(reg->reg_num); assert (reg->reg_num < ACCOUNT_REG_NUM); |