diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2012-12-12 22:36:08 -0800 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2012-12-12 22:36:08 -0800 |
| commit | 608f959900968e83fd25231c72308fc608742dd5 (patch) | |
| tree | 33a250f00947d7c83ba50779da466b5f5885db9f /src/map/trade.cpp | |
| parent | d8e5c96fbbed5d526dd77d2e427bcb3090bddd58 (diff) | |
| download | tmwa-608f959900968e83fd25231c72308fc608742dd5.tar.gz tmwa-608f959900968e83fd25231c72308fc608742dd5.tar.bz2 tmwa-608f959900968e83fd25231c72308fc608742dd5.tar.xz tmwa-608f959900968e83fd25231c72308fc608742dd5.zip | |
Remove guilds, finally
If anyone in the future wonders why I did this,
just look at how many lines of code this eliminates.
Diffstat (limited to 'src/map/trade.cpp')
| -rw-r--r-- | src/map/trade.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/map/trade.cpp b/src/map/trade.cpp index 147db1b..4d5a9cd 100644 --- a/src/map/trade.cpp +++ b/src/map/trade.cpp @@ -25,7 +25,7 @@ void trade_traderequest (struct map_session_data *sd, int target_id) { if (!battle_config.invite_request_check) { - if (target_sd->guild_invite > 0 || target_sd->party_invite > 0) + if (target_sd->party_invite > 0) { clif_tradestart (sd, 2); // 相手はPT要請中かGuild要請中 return; @@ -91,10 +91,8 @@ void trade_tradeack (struct map_session_data *sd, int type) npc_event_dequeue (target_sd); //close STORAGE window if it's open. It protects from spooffing packets [Lupus] - if (sd->state.storage_flag == 1) + if (sd->state.storage_open) storage_storageclose (sd); - else if (sd->state.storage_flag == 2) - storage_guild_storageclose (sd); } } |