浏览代码

- Added svn:eol-style=native property on some recently added text files.
- Fixed a typo in script_commands.txt (bugreport:5998)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16278 54d463be-8e91-2dee-dedb-b68131a5f0ec

brianluau 13 年之前
父节点
当前提交
638642450a
共有 4 个文件被更改,包括 29 次插入31 次删除
  1. 26 26
      3rdparty/libconfig/Makefile.in
  2. 2 2
      doc/script_commands.txt
  3. 0 1
      src/common/evdp_epoll.c
  4. 1 2
      src/common/network.c

+ 26 - 26
3rdparty/libconfig/Makefile.in

@@ -1,26 +1,26 @@
-
-LIBCONFIG_OBJ = libconfig.o grammar.o scanctx.o scanner.o strbuf.o
-LIBCONFIG_H = libconfig.h grammar.h parsectx.h scanctx.h scanner.h strbuf.h wincompat.h
-
-@SET_MAKE@
-
-#####################################################################
-.PHONY : all clean help
-
-all: $(LIBCONFIG_OBJ)
-
-clean:
-	@echo "	CLEAN	libconfig"
-	@rm -rf *.o
-
-help:
-	@echo "possible targets are 'all' 'clean' 'help'"
-	@echo "'all'    - builds $(LIBCONFIG_OBJ)"
-	@echo "'clean'  - deletes $(LIBCONFIG_OBJ)"
-	@echo "'help'   - outputs this message"
-
-#####################################################################
-
-%.o: %.c $(LIBCONFIG_H)
-	@echo "	CC	$<"
-	@@CC@ @CFLAGS@ @DEFS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
+
+LIBCONFIG_OBJ = libconfig.o grammar.o scanctx.o scanner.o strbuf.o
+LIBCONFIG_H = libconfig.h grammar.h parsectx.h scanctx.h scanner.h strbuf.h wincompat.h
+
+@SET_MAKE@
+
+#####################################################################
+.PHONY : all clean help
+
+all: $(LIBCONFIG_OBJ)
+
+clean:
+	@echo "	CLEAN	libconfig"
+	@rm -rf *.o
+
+help:
+	@echo "possible targets are 'all' 'clean' 'help'"
+	@echo "'all'    - builds $(LIBCONFIG_OBJ)"
+	@echo "'clean'  - deletes $(LIBCONFIG_OBJ)"
+	@echo "'help'   - outputs this message"
+
+#####################################################################
+
+%.o: %.c $(LIBCONFIG_H)
+	@echo "	CC	$<"
+	@@CC@ @CFLAGS@ @DEFS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<

+ 2 - 2
doc/script_commands.txt

@@ -6706,12 +6706,12 @@ The first letter is position 0.
 	
 	
 	Returns the original string with the specified char inserted
 	Returns the original string with the specified char inserted
 	at the specified index. If index is out of range, the char 
 	at the specified index. If index is out of range, the char 
-	will be inserted on the end	of the string that it is closest.
+	will be inserted on the end of the string that it is closest.
 	Only the 1st char in the <char> parameter will be used.
 	Only the 1st char in the <char> parameter will be used.
 	
 	
 	Example:
 	Example:
 	
 	
-	setchar("laughter", "s", 0); //returns "slaughter"
+	insertchar("laughter", "s", 0); //returns "slaughter"
 	
 	
 ---------------------------------------
 ---------------------------------------
 
 

+ 0 - 1
src/common/evdp_epoll.c

@@ -230,4 +230,3 @@ void evdp_writable_remove(int32 fd, EVDP_DATA *ep){
 	
 	
 	return;	
 	return;	
 }//end: evdp_writable_remove()
 }//end: evdp_writable_remove()
-

+ 1 - 2
src/common/network.c

@@ -1,4 +1,4 @@
- //
+//
 // Network Subsystem (previously known as socket system)
 // Network Subsystem (previously known as socket system)
 //
 //
 // Author: Florian Wilkemeyer <fw@f-ws.de>
 // Author: Florian Wilkemeyer <fw@f-ws.de>
@@ -1059,4 +1059,3 @@ void network_parser_set_ro(int32 fd,
 	//
 	//
 	
 	
 }//end: network_parser_set_ro()
 }//end: network_parser_set_ro()
-