summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorpanikon <panikon@zoho.com>2014-06-18 00:10:06 -0300
committerpanikon <panikon@zoho.com>2014-06-18 00:10:06 -0300
commitc924056673e213847ea2ff9ed04cb5f42ae40104 (patch)
tree3cf3d81109a8a2577d12d11c6cd7200573ef7150 /src
parenteb113a7719f501fb214ff8791ee20b9bb047dee8 (diff)
parent10575735040034bec6caeb110d38b2b807ca7e4d (diff)
downloadhercules-c924056673e213847ea2ff9ed04cb5f42ae40104.tar.gz
hercules-c924056673e213847ea2ff9ed04cb5f42ae40104.tar.bz2
hercules-c924056673e213847ea2ff9ed04cb5f42ae40104.tar.xz
hercules-c924056673e213847ea2ff9ed04cb5f42ae40104.zip
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src')
-rw-r--r--src/map/trade.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/trade.c b/src/map/trade.c
index b3960bef9..3bbb73568 100644
--- a/src/map/trade.c
+++ b/src/map/trade.c
@@ -168,7 +168,7 @@ void trade_tradeack(struct map_session_data *sd, int type) {
/**
* Checks if an impossible trade will occur
- * Normal clients refuse to have 2 same types of item (except equipament) in the same trade window
+ * Normal clients refuse to have 2 items of the same type (except equipment) in the same trade window
* Normal clients authorize only no equipped items and only items from inventory
* @retval 0 The trade can continue
* @retval 1 Hack attempt