diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/char/int_homun.c | 2 | ||||
| -rw-r--r-- | src/map/clif.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/char/int_homun.c b/src/char/int_homun.c index fc06995c6..886c56f06 100644 --- a/src/char/int_homun.c +++ b/src/char/int_homun.c @@ -92,7 +92,7 @@ int inter_homun_fromstr(char *str,struct s_homunculus *p) p->luk = tmp_int[17];
//Read skills.
- while(str[next] && str[next] != '\n') {
+ while(str[next] && str[next] != '\n' && str[next] != '\r') {
if (sscanf(str+next, "%d,%d,%n", &tmp_int[0], &tmp_int[1], &len) != 2)
return 2;
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;
}
|