summaryrefslogtreecommitdiff
path: root/src/char
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/char
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/char')
-rw-r--r--src/char/int_homun.c2
1 files changed, 1 insertions, 1 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;