summaryrefslogtreecommitdiff
path: root/src/map/trade.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-05-18 13:52:56 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-05-18 13:52:56 +0000
commit129beea8f2c3b35af17332b451f9f9d4c233af5e (patch)
tree972a94b1737995e8641ae7651bdcff6d8cde582e /src/map/trade.c
parent6bbaccfc314ed0bbb7a3d9af84e54917e1cf7971 (diff)
downloadhercules-129beea8f2c3b35af17332b451f9f9d4c233af5e.tar.gz
hercules-129beea8f2c3b35af17332b451f9f9d4c233af5e.tar.bz2
hercules-129beea8f2c3b35af17332b451f9f9d4c233af5e.tar.xz
hercules-129beea8f2c3b35af17332b451f9f9d4c233af5e.zip
- NPC_AGIUP will now give movement boost of 50%
- Fixed WZ_WATERBALL number of hits when used by non-players. - MO_BODYRELOCATION will send the slide packet with the actual src's coordinates rather than selected tile. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6638 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/trade.c')
-rw-r--r--src/map/trade.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/trade.c b/src/map/trade.c
index 5de4ffd91..3597eed71 100644
--- a/src/map/trade.c
+++ b/src/map/trade.c
@@ -157,7 +157,7 @@ int impossible_trade_check(struct map_session_data *sd) {
{ // if more than the player have -> hack
sprintf(message_to_gm, msg_txt(538), sd->status.name, sd->status.account_id); // Hack on trade: character '%s' (account: %d) try to trade more items that he has.
intif_wis_message_to_gm(wisp_server_name, battle_config.hack_info_GM_level, message_to_gm);
- sprintf(message_to_gm, msg_txt(539), sd->status.inventory[index].amount, sd->status.inventory[index].nameid, sd->deal.item[i].amount); // This player has %d of a kind of item (id: %d), and try to trade %d of them.
+ sprintf(message_to_gm, msg_txt(539), inventory[index].amount, inventory[index].nameid, sd->deal.item[i].amount); // This player has %d of a kind of item (id: %d), and try to trade %d of them.
intif_wis_message_to_gm(wisp_server_name, battle_config.hack_info_GM_level, message_to_gm);
// if we block people
if (battle_config.ban_hack_trade < 0) {
@@ -446,7 +446,7 @@ void trade_tradecommit(struct map_session_data *sd) {
sd->state.deal_locked = 2;
- if (sd->state.deal_locked < 2 || tsd->state.deal_locked < 2)
+ if (tsd->state.deal_locked < 2)
return; //Not yet time for trading.
//Now is a good time (to save on resources) to check that the trade can indeed be made and it's not exploitable.