diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2013-05-23 13:58:57 -0700 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2013-05-23 13:58:57 -0700 |
| commit | 543e4b419239f37321bc5a224d56773d1fe6ebfe (patch) | |
| tree | b1af74736f9ecaf4e7b7770c9fbff59e971d3f4b /src/map/trade.cpp | |
| parent | cce12d0d059b3328ad74446b389445bd43e0a90b (diff) | |
| download | tmwa-543e4b419239f37321bc5a224d56773d1fe6ebfe.tar.gz tmwa-543e4b419239f37321bc5a224d56773d1fe6ebfe.tar.bz2 tmwa-543e4b419239f37321bc5a224d56773d1fe6ebfe.tar.xz tmwa-543e4b419239f37321bc5a224d56773d1fe6ebfe.zip | |
Rename fields of block_list in preparation for subclassing
This is necessary because at least some of the subclasses overlap names.
Diffstat (limited to 'src/map/trade.cpp')
| -rw-r--r-- | src/map/trade.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/map/trade.cpp b/src/map/trade.cpp index 6e81602..13f7a4d 100644 --- a/src/map/trade.cpp +++ b/src/map/trade.cpp @@ -45,11 +45,11 @@ void trade_traderequest(struct map_session_data *sd, int target_id) } else { - if (sd->bl.m != target_sd->bl.m - || (sd->bl.x - target_sd->bl.x <= -5 - || sd->bl.x - target_sd->bl.x >= 5) - || (sd->bl.y - target_sd->bl.y <= -5 - || sd->bl.y - target_sd->bl.y >= 5)) + if (sd->bl.bl_m != target_sd->bl.bl_m + || (sd->bl.bl_x - target_sd->bl.bl_x <= -5 + || sd->bl.bl_x - target_sd->bl.bl_x >= 5) + || (sd->bl.bl_y - target_sd->bl.bl_y <= -5 + || sd->bl.bl_y - target_sd->bl.bl_y >= 5)) { clif_tradestart(sd, 0); //too far } |