summaryrefslogtreecommitdiff
path: root/src/map/clif.cpp
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2015-01-03 21:50:12 -0800
committerBen Longbons <b.r.longbons@gmail.com>2015-01-03 21:50:12 -0800
commit4c91abd6a020ee030114ae3f22d8f6066e7528be (patch)
tree9f76256eabe4900a7eef6cbb94b7ed2378b93f48 /src/map/clif.cpp
parent0a202555d2e12866b3619af92f50cb38ea4adb12 (diff)
parent711680d652a8db17c1b91428b6d6835f30dfb4fd (diff)
downloadtmwa-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/clif.cpp')
-rw-r--r--src/map/clif.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/map/clif.cpp b/src/map/clif.cpp
index edca352..61fa8c5 100644
--- a/src/map/clif.cpp
+++ b/src/map/clif.cpp
@@ -401,7 +401,7 @@ int clif_send(const Buffer& buf, dumb_ptr<block_list> bl, SendWho type)
p_ = party_search(sd->status.party_id);
}
}
- if OPTION_IS_SOME(p, p_)
+ if OPTION_IS_SOME_NOLOOP(p, p_)
{
for (int i = 0; i < MAX_PARTY; i++)
{
@@ -1231,17 +1231,19 @@ int clif_selllist(dumb_ptr<map_session_data> sd)
{
if (!sd->status.inventory[i].nameid)
continue;
- if OPTION_IS_SOME(sdidi, sd->inventory_data[i])
+ if OPTION_IS_SOME_NOLOOP(sdidi, sd->inventory_data[i])
{
int val = sdidi->value_sell;
if (val < 0)
- continue;
+ goto continue_outer;
Packet_Repeat<0x00c7> info;
info.ioff2 = i.shift();
info.base_price = val;
info.actual_price = val;
repeat_c7.push_back(info);
}
+ continue_outer:
+ ;
}
send_packet_repeatonly<0x00c7, 4, 10>(s, repeat_c7);
@@ -3553,7 +3555,7 @@ RecvResult clif_parse_GetCharNameRequest(Session *s, dumb_ptr<map_session_data>
{
Option<PartyPair> p_ = party_search(ssd->status.party_id);
- if OPTION_IS_SOME(p, p_)
+ if OPTION_IS_SOME_NOLOOP(p, p_)
{
party_name = p->name;
send = 1;
@@ -4086,7 +4088,7 @@ RecvResult clif_parse_EquipItem(Session *s, dumb_ptr<map_session_data> sd)
if (sd->npc_id)
return rv;
- if OPTION_IS_SOME(sdidi, sd->inventory_data[index])
+ if OPTION_IS_SOME_NOLOOP(sdidi, sd->inventory_data[index])
{
EPOS epos = fixed.epos_ignored;
if (sdidi->type == ItemType::ARROW)