diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/char/char.c | 2 | ||||
| -rw-r--r-- | src/char_sql/char.c | 2 | ||||
| -rw-r--r-- | src/login/login.c | 2 | ||||
| -rw-r--r-- | src/login_sql/login.c | 2 | ||||
| -rw-r--r-- | src/map/clif.c | 2 | ||||
| -rw-r--r-- | src/map/map.c | 2 | ||||
| -rw-r--r-- | src/tool/Makefile | 2 | ||||
| -rw-r--r-- | src/tool/convert.c | 3 | ||||
| -rw-r--r-- | src/tool/grfio.c | 1 | ||||
| -rw-r--r-- | src/tool/mapcache.c | 1 |
10 files changed, 9 insertions, 10 deletions
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> |