summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-10-06 13:28:36 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-10-06 13:28:36 +0000
commitcf10605ca4f989fdffaf12c06006a8f8fa14c383 (patch)
tree076d123a03bb4b8e3f0e046afe0ddcc58679470e /src/map
parent0274c80ae6686b12763ca9ec9a5911e313bdaf64 (diff)
downloadhercules-cf10605ca4f989fdffaf12c06006a8f8fa14c383.tar.gz
hercules-cf10605ca4f989fdffaf12c06006a8f8fa14c383.tar.bz2
hercules-cf10605ca4f989fdffaf12c06006a8f8fa14c383.tar.xz
hercules-cf10605ca4f989fdffaf12c06006a8f8fa14c383.zip
- Now you can trade while in a chatroom.
- Fixed homun-txt reading when the file has DOS line-type delimiters (\r\n) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8944 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/clif.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index 3164fe950..35ade7ce3 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -9533,8 +9533,8 @@ void clif_parse_TradeRequest(int fd,struct map_session_data *sd)
RFIFOHEAD(fd);
t_sd = map_id2sd(RFIFOL(sd->fd,2));
- if(clif_cant_act(sd))
- return;
+ if(!sd->chatID && clif_cant_act(sd))
+ return; //You can trade while in a chatroom.
// @noask [LuzZza]
if(t_sd) {
@@ -9542,7 +9542,7 @@ void clif_parse_TradeRequest(int fd,struct map_session_data *sd)
clif_noask_sub(sd, t_sd, 0);
return;
}
- if(clif_cant_act(t_sd))
+ if(!t_sd->chatID && clif_cant_act(t_sd))
return;
}