diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-12-08 15:05:48 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-12-08 15:05:48 +0000 |
| commit | 600ed9e0e1db5b2993827ecb1ac5db36ffe56c7b (patch) | |
| tree | 0e9a2cefc176f5635ecd17237af105db0c2970d7 /src/map/clif.c | |
| parent | 06d3ecaabad6e81d0c6478d59632d0b4d4673423 (diff) | |
| download | hercules-600ed9e0e1db5b2993827ecb1ac5db36ffe56c7b.tar.gz hercules-600ed9e0e1db5b2993827ecb1ac5db36ffe56c7b.tar.bz2 hercules-600ed9e0e1db5b2993827ecb1ac5db36ffe56c7b.tar.xz hercules-600ed9e0e1db5b2993827ecb1ac5db36ffe56c7b.zip | |
- Now you can request a trade regardless of the state of the target trader.
- The trade will now fail when you accept it and either character is speaking with an npc, vending or has the storage open.
- Cleaned up some the trade ack function, added proper replies to some fail cases.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9438 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/clif.c')
| -rw-r--r-- | src/map/clif.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index 07c270f7c..50b2eb0ca 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -9606,13 +9606,9 @@ void clif_parse_TradeRequest(int fd,struct map_session_data *sd) return; //You can trade while in a chatroom. // @noask [LuzZza] - if(t_sd) { - if (t_sd->state.noask) { - clif_noask_sub(sd, t_sd, 0); - return; - } - if(!t_sd->chatID && clif_cant_act(t_sd)) - return; + if(t_sd && t_sd->state.noask) { + clif_noask_sub(sd, t_sd, 0); + return; } if(battle_config.basic_skill_check == 0 || pc_checkskill(sd,NV_BASIC) >= 1){ |