summaryrefslogtreecommitdiff
path: root/src/map/trade.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/map/trade.c')
-rw-r--r--src/map/trade.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/map/trade.c b/src/map/trade.c
index 83426c407..8bb47e0cb 100644
--- a/src/map/trade.c
+++ b/src/map/trade.c
@@ -61,7 +61,7 @@ void trade_traderequest(struct map_session_data *sd, struct map_session_data *ta
if( previous_sd ){
previous_sd->trade_partner = 0;
clif->tradecancelled(previous_sd);
- } // Once cancelled then continue to the new one.
+ } // Once canceled then continue to the new one.
sd->trade_partner = 0;
clif->tradecancelled(sd);
}
@@ -169,7 +169,7 @@ void trade_tradeack(struct map_session_data *sd, int type) {
/*==========================================
* Check here hacker for duplicate item in trade
* normal client refuse to have 2 same types of item (except equipment) in same trade window
- * normal client authorise only no equiped item and only from inventory
+ * normal client authorize only no equipped item and only from inventory
*------------------------------------------*/
int impossible_trade_check(struct map_session_data *sd)
{
@@ -187,9 +187,9 @@ int impossible_trade_check(struct map_session_data *sd)
// get inventory of player
memcpy(&inventory, &sd->status.inventory, sizeof(struct item) * MAX_INVENTORY);
- // remove this part: arrows can be trade and equiped
+ // remove this part: arrows can be trade and equipped
// re-added! [celest]
- // remove equiped items (they can not be trade)
+ // remove equipped items (they can not be trade)
for (i = 0; i < MAX_INVENTORY; i++)
if (inventory[i].nameid > 0 && inventory[i].equip && !(inventory[i].equip & EQP_AMMO))
memset(&inventory[i], 0, sizeof(struct item));
@@ -457,7 +457,7 @@ void trade_tradeok(struct map_session_data *sd) {
}
/*==========================================
- * 'Cancel' is pressed. (or trade was force-cancelled by the code)
+ * 'Cancel' is pressed. (or trade was force-canceled by the code)
*------------------------------------------*/
void trade_tradecancel(struct map_session_data *sd) {
struct map_session_data *target_sd;
@@ -466,7 +466,7 @@ void trade_tradecancel(struct map_session_data *sd) {
target_sd = map->id2sd(sd->trade_partner);
if(!sd->state.trading)
- { // Not trade acepted
+ { // Not trade accepted
if( target_sd ) {
target_sd->trade_partner = 0;
clif->tradecancelled(target_sd);