diff options
| author | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-03-22 16:31:56 +0000 |
|---|---|---|
| committer | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-03-22 16:31:56 +0000 |
| commit | b5735b90f5ec847a89acd80509e8ba2ce23a3905 (patch) | |
| tree | c784ba41982fe5370eee9245d9fe65063b389328 /src/map/trade.c | |
| parent | e52e5e17df12881d87065106a96ed48a9d302555 (diff) | |
| download | hercules-b5735b90f5ec847a89acd80509e8ba2ce23a3905.tar.gz hercules-b5735b90f5ec847a89acd80509e8ba2ce23a3905.tar.bz2 hercules-b5735b90f5ec847a89acd80509e8ba2ce23a3905.tar.xz hercules-b5735b90f5ec847a89acd80509e8ba2ce23a3905.zip | |
Check changelog ^^
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1267 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/trade.c')
| -rw-r--r-- | src/map/trade.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/map/trade.c b/src/map/trade.c index 62dd65831..7709376fb 100644 --- a/src/map/trade.c +++ b/src/map/trade.c @@ -4,6 +4,7 @@ #include <stdio.h> #include <string.h> +#include "../common/nullpo.h" #include "clif.h" #include "itemdb.h" #include "map.h" @@ -16,8 +17,6 @@ #include "intif.h" #include "atcommand.h" -#include "nullpo.h" - /*========================================== * 取引要請を相手に送る *------------------------------------------ @@ -34,7 +33,10 @@ void trade_traderequest(struct map_session_data *sd, int target_id) { return; } } - if ((target_sd->trade_partner != 0) || (sd->trade_partner != 0)) { + if(pc_isGM(sd) && pc_isGM(sd) < battle_config.gm_can_drop_lv) { + clif_displaymessage(sd->fd, msg_txt(246)); + trade_tradecancel(sd); // GM is not allowed to trade + } else if ((target_sd->trade_partner != 0) || (sd->trade_partner != 0)) { trade_tradecancel(sd); // person is in another trade } else { if (sd->bl.m != target_sd->bl.m || |