summaryrefslogtreecommitdiff
path: root/src/map/trade.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/map/trade.cpp')
-rw-r--r--src/map/trade.cpp6
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);
}
}