Explorar el Código

* Fixed a mistake in sv_split, causing CR being recognized as EOL character, even when only LF was specified (since r12459).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14594 54d463be-8e91-2dee-dedb-b68131a5f0ec
ai4rei hace 14 años
padre
commit
9eeaa7dc47
Se han modificado 2 ficheros con 3 adiciones y 1 borrados
  1. 2 0
      Changelog-Trunk.txt
  2. 1 1
      src/common/strlib.c

+ 2 - 0
Changelog-Trunk.txt

@@ -1,5 +1,7 @@
 Date	Added
 
+2010/12/16
+	* Fixed a mistake in sv_split, causing CR being recognized as EOL character, even when only LF was specified (since r12459). [Ai4rei]
 2010/12/15
 	* Corrected type of second argument of script command 'setbattleflag' from string to number (bugreport:4640, topic:261833, since r5407, related r14577). [Ai4rei]
 	* Fixed missing check in cooking, causing cooking kit requirement could be bypassed by sending 0x25b (CZ_REQ_MAKINGITEM) directly (bugreport:4642, since r13628). [Ai4rei]

+ 1 - 1
src/common/strlib.c

@@ -657,7 +657,7 @@ int sv_split(char* str, int len, int startoff, char delim, char** out_fields, in
 			end[0] = end[1] = '\0';
 		*out_fields = end + 2;
 	}
-	else if( (opt&SV_TERMINATE_LF) && end[0] == '\r' )
+	else if( (opt&SV_TERMINATE_CR) && end[0] == '\r' )
 	{
 		if( !(opt&SV_KEEP_TERMINATOR) )
 			end[0] = '\0';