From 608f959900968e83fd25231c72308fc608742dd5 Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Wed, 12 Dec 2012 22:36:08 -0800 Subject: Remove guilds, finally If anyone in the future wonders why I did this, just look at how many lines of code this eliminates. --- src/map/trade.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/map/trade.cpp') 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); } } -- cgit v1.2.3-60-g2f50