- Removed a missing file reference in the athena-start script

- Fixed a #error "<malloc.h> has been replaced by <stdlib.h>" problem
- Fixed the msg_silent setting not being announced every time

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10077 54d463be-8e91-2dee-dedb-b68131a5f0ec

12 files changed, 17 insertions, 15 deletions

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 5b81d4c0e..70a940d96 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,6 +3,10 @@ Date	Added
 AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
+2007/03/28
+	* Removed a missing file reference in the athena-start script
+	* Fixed a #error "<malloc.h> has been replaced by <stdlib.h>" problem
+	* Fixed the msg_silent setting not being announced every time [ultramage]
 2007/03/27
 	* Cleaned up some the mob skill use code. The skill re-use delay is set at
 	  the time the skill is used rather than when it finishes casting. The
diff --git a/athena-start b/athena-start
index 85cc18bc2..7a69be4c1 100644
--- a/athena-start
+++ b/athena-start
@@ -17,7 +17,6 @@ M_SRV_C2=./conf/battle_athena.conf
 M_SRV_C3=./conf/atcommand_athena.conf

 M_SRV_C4=./conf/script_athena.conf

 M_SRV_C5=./conf/msg_athena.conf

-M_SRV_C6=./conf/grf-files.txt

 

 print_start() {

 #	more << EOF

@@ -114,7 +113,7 @@ check_account() {
 

 check_files() {

 

-	for i in ${L_SRV} ${C_SRV} ${M_SRV} ${L_SRV_C} ${C_SRV_C} ${C_SRV_C2} ${M_SRV_C} ${M_SRV_C2} ${M_SRV_C3} ${M_SRV_C4} ${M_SRV_C5} ${M_SRV_C6}

+	for i in ${L_SRV} ${C_SRV} ${M_SRV} ${L_SRV_C} ${C_SRV_C} ${C_SRV_C2} ${M_SRV_C} ${M_SRV_C2} ${M_SRV_C3} ${M_SRV_C4} ${M_SRV_C5}

 	do

 		if [ ! -f ./$i ]; then

     		echo "$i does not exist, or can't run."

@@ -169,8 +168,8 @@ case $1 in
 #			exec ${C_SRV} ${C_SRV_C} ${C_SRV_C2} > /dev/null&

 #			exec ${M_SRV} ${M_SRV_C} ${M_SRV_C2} > /dev/null&

 			exec ${C_SRV} ${C_SRV_C} ${C_SRV_C2}&

-#			exec nice -n -20 ${M_SRV} ${M_SRV_C} ${M_SRV_C2} ${M_SRV_C3} ${M_SRV_C4} ${M_SRV_C5} ${M_SRV_C6}&

-			exec ${M_SRV} ${M_SRV_C} ${M_SRV_C2} ${M_SRV_C3} ${M_SRV_C4} ${M_SRV_C5} ${M_SRV_C6}&

+#			exec nice -n -20 ${M_SRV} ${M_SRV_C} ${M_SRV_C2} ${M_SRV_C3} ${M_SRV_C4} ${M_SRV_C5}&

+			exec ${M_SRV} ${M_SRV_C} ${M_SRV_C2} ${M_SRV_C3} ${M_SRV_C4} ${M_SRV_C5}&

 

 			echo "Now Started Athena."

 		else

@@ -267,7 +266,7 @@ case $1 in
 				map=$(ps ax | grep "${M_SRV}" | grep "${map}" | wc -l)

 			fi

 			if [ ${map} -eq 0 ]; then

-				exec ${M_SRV} ${M_SRV_C} ${M_SRV_C2} ${M_SRV_C3} ${M_SRV_C4} ${M_SRV_C5} ${M_SRV_C6}&

+				exec ${M_SRV} ${M_SRV_C} ${M_SRV_C2} ${M_SRV_C3} ${M_SRV_C4} ${M_SRV_C5}&

 			fi

 		fi

 	;;

diff --git a/src/char/char.c b/src/char/char.c
index 2c4fa32f5..be691808a 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -4093,8 +4093,8 @@ int char_config_read(const char *cfgName) {
 		if(strcmpi(w1,"timestamp_format") == 0) {
 			strncpy(timestamp_format, w2, 20);
 		} else if(strcmpi(w1,"console_silent")==0){
+			ShowInfo("Console Silent Setting: %d\n", atoi(w2));
 			msg_silent = atoi(w2);
-			ShowInfo("Console Silent Setting: %d\n", msg_silent);
 #ifndef TXT_SQL_CONVERT
 		} else if(strcmpi(w1,"stdout_with_ansisequence")==0){
 			stdout_with_ansisequence = config_switch(w2);
diff --git a/src/char_sql/char.c b/src/char_sql/char.c
index b9fa206df..693ddee12 100644
--- a/src/char_sql/char.c
+++ b/src/char_sql/char.c
@@ -4033,8 +4033,8 @@ int char_config_read(const char *cfgName) {
 		if(strcmpi(w1,"timestamp_format")==0) {
 			strncpy(timestamp_format, w2, 20);
 		} else if(strcmpi(w1,"console_silent")==0){
+			ShowInfo("Console Silent Setting: %d\n", atoi(w2));
 			msg_silent = atoi(w2);
-			ShowInfo("Console Silent Setting: %d\n", msg_silent);
 		} else if(strcmpi(w1,"stdout_with_ansisequence")==0){
 			stdout_with_ansisequence = config_switch(w2);
 		} else if (strcmpi(w1, "userid") == 0) {
diff --git a/src/login/login.c b/src/login/login.c
index ceff51a41..25f91c3d6 100644
--- a/src/login/login.c
+++ b/src/login/login.c
@@ -3585,8 +3585,8 @@ int login_config_read(const char* cfgName)
 			} else if(strcmpi(w1,"stdout_with_ansisequence")==0){
 				stdout_with_ansisequence = config_switch(w2);
 			} else if(strcmpi(w1,"console_silent")==0){
+				ShowInfo("Console Silent Setting: %d\n", atoi(w2));
 				msg_silent = atoi(w2);
-				ShowInfo("Console Silent Setting: %d\n", msg_silent);
 			} else if (strcmpi(w1, "admin_state") == 0) {
 				admin_state = config_switch(w2);
 			} else if (strcmpi(w1, "admin_pass") == 0) {
diff --git a/src/login_sql/login.c b/src/login_sql/login.c
index 03ecb4982..6173d0fe1 100644
--- a/src/login_sql/login.c
+++ b/src/login_sql/login.c
@@ -1887,8 +1887,8 @@ int login_config_read(const char* cfgName)
 		} else if(!strcmpi(w1,"stdout_with_ansisequence")) {
 			stdout_with_ansisequence = config_switch(w2);
 		} else if(!strcmpi(w1,"console_silent")) {
+			ShowInfo("Console Silent Setting: %d\n", atoi(w2));
 			msg_silent = atoi(w2);
-			ShowInfo("Console Silent Setting: %d\n", msg_silent);
 		}
 		else if (!strcmpi(w1, "bind_ip")) {
 			char login_ip_str[128];
diff --git a/src/map/clif.c b/src/map/clif.c
index b2d70f55e..ded779626 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -9225,7 +9225,7 @@ void clif_parse_EquipItem(int fd,struct map_session_data *sd)
 		return;
 	}
 	
-	//Client doesn't sends the position for ammo.
+	//Client doesn't send the position for ammo.
 	if(sd->inventory_data[index]->type == IT_AMMO)
 		pc_equipitem(sd,index,EQP_AMMO);
 	else
diff --git a/src/map/map.c b/src/map/map.c
index e2815ecdd..785b98504 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -2734,8 +2734,8 @@ int map_config_read(char *cfgName) {
 			} else if(strcmpi(w1,"stdout_with_ansisequence")==0){
 				stdout_with_ansisequence = config_switch(w2);
 			} else if(strcmpi(w1,"console_silent")==0){
+				ShowInfo("Console Silent Setting: %d\n", atoi(w2));
 				msg_silent = atoi(w2);
-				ShowInfo("Console Silent Setting: %d\n", msg_silent);
 			} else if (strcmpi(w1, "userid")==0){
 				chrif_setuserid(w2);
 			} else if (strcmpi(w1, "passwd") == 0) {
diff --git a/src/tool/Makefile b/src/tool/Makefile
index 415606525..286b839f3 100644
--- a/src/tool/Makefile
+++ b/src/tool/Makefile
@@ -12,4 +12,4 @@ mapcache:
 	$(CC) -o ../../$@ mapcache.c grfio.o ../zlib/unz.o -lz
 
 clean:
-	rm -rf ../../tools/adduser ../../tools/convert ../../mapcache
+	rm -rf *.o ../../tools/adduser ../../tools/convert ../../mapcache
diff --git a/src/tool/convert.c b/src/tool/convert.c
index 0072b5b75..5cb096fdb 100644
--- a/src/tool/convert.c
+++ b/src/tool/convert.c
@@ -284,7 +284,8 @@ int mmo_char_convert(char *fname1,char *fname2)
   	  fprintf(ofp,"%s" RETCODE,line);
     }
   }
-  fcloseall();
+  fclose(ifp);
+  fclose(ofp);
   return 0;
 }
 
diff --git a/src/tool/grfio.c b/src/tool/grfio.c
index 7df12696c..3b19ca2f8 100644
--- a/src/tool/grfio.c
+++ b/src/tool/grfio.c
@@ -27,7 +27,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
-#include <malloc.h>
 #include <sys/stat.h>
 
 #include "grfio.h"
diff --git a/src/tool/mapcache.c b/src/tool/mapcache.c
index 79de65e0b..d088a9d52 100644
--- a/src/tool/mapcache.c
+++ b/src/tool/mapcache.c
@@ -4,7 +4,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <malloc.h>
 
 #ifndef _WIN32
 #include <unistd.h>