diff options
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/trade.c | 14 | ||||
| -rw-r--r-- | src/map/trade.h | 3 |
2 files changed, 9 insertions, 8 deletions
diff --git a/src/map/trade.c b/src/map/trade.c index e137f7105..b3082515a 100644 --- a/src/map/trade.c +++ b/src/map/trade.c @@ -1,13 +1,15 @@ -// Copyright (c) Athena Dev Teams - Licensed under GNU GPL -// For more information, see LICENCE in the main folder +// Copyright (c) Hercules Dev Team, licensed under GNU GPL. +// See the LICENSE file +// Portions Copyright (c) Athena Dev Teams #include "../common/nullpo.h" #include "../common/socket.h" + +#include "trade.h" #include "clif.h" #include "itemdb.h" #include "map.h" #include "path.h" -#include "trade.h" #include "pc.h" #include "npc.h" #include "battle.h" @@ -20,10 +22,6 @@ #include <stdio.h> #include <string.h> - -//Max distance from traders to enable a trade to take place. -#define TRADE_DISTANCE 2 - struct trade_interface trade_s; /*========================================== @@ -517,7 +515,7 @@ void trade_tradecommit(struct map_session_data *sd) { return; if ((tsd = map->id2sd(sd->trade_partner)) == NULL) { - trade_tradecancel(sd); + trade->cancel(sd); return; } diff --git a/src/map/trade.h b/src/map/trade.h index e8ac4a8c4..d0b900504 100644 --- a/src/map/trade.h +++ b/src/map/trade.h @@ -5,6 +5,9 @@ #ifndef _TRADE_H_ #define _TRADE_H_ +//Max distance from traders to enable a trade to take place. +#define TRADE_DISTANCE 2 + struct map_session_data; struct trade_interface { |