- re-added the duplicit nj/gs name messages in msg_athena

- renamed atcommand_sub to is_atcommand_sub (charcommand too)
- reformatted conf-tmpl's comments a bit
- and a fix to the stable changelog to make my last commit more descriptive

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

10 files changed, 21 insertions, 20 deletions

diff --git a/src/char/char.c b/src/char/char.c
index 7366cad1d..262adb86f 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -4447,3 +4447,4 @@ int do_init(int argc, char **argv) {
 	return 0;
 }
 #endif //TXT_SQL_CONVERT
+
diff --git a/src/char_sql/inter.c b/src/char_sql/inter.c
index 64983cfc6..c7e4c7168 100644
--- a/src/char_sql/inter.c
+++ b/src/char_sql/inter.c
@@ -767,7 +767,7 @@ int inter_parse_frommap(int fd)
 	int len=0;
 	RFIFOHEAD(fd);
 	cmd=RFIFOW(fd,0);
-	// interŽIŠÇŠ�‚©‚𒲂ׂ
+	// interŽIŠÇŠ�‚©‚𒲂ׂé
 	if(cmd < 0x3000 || cmd >= 0x3000 + (sizeof(inter_recv_packet_length)/
 		sizeof(inter_recv_packet_length[0]) ) )
 		return 0;
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 06fa629e5..bfe70145e 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -778,7 +778,7 @@ int get_atcommand_level(const AtCommandType type) {
 }
 
 AtCommandType
-atcommand_sub(const int fd, struct map_session_data* sd, const char* str, int gmlvl) {
+is_atcommand_sub(const int fd, struct map_session_data* sd, const char* str, int gmlvl) {
 	AtCommandInfo info;
 	AtCommandType type;
 
@@ -852,7 +852,7 @@ is_atcommand(const int fd, struct map_session_data* sd, const char* message) {
 	if (!*str)
 		return AtCommand_None;
 
-	return atcommand_sub(fd,sd,str,pc_isGM(sd));
+	return is_atcommand_sub(fd,sd,str,pc_isGM(sd));
 }
 
 /*==========================================
diff --git a/src/map/atcommand.h b/src/map/atcommand.h
index 4bb08b217..db3e9cd88 100644
--- a/src/map/atcommand.h
+++ b/src/map/atcommand.h
@@ -301,7 +301,7 @@ typedef struct AtCommandInfo {
 AtCommandType
 is_atcommand(const int fd, struct map_session_data* sd, const char* message);
 AtCommandType
-atcommand_sub(const int fd, struct map_session_data* sd, const char* str, int gmlvl);
+is_atcommand_sub(const int fd, struct map_session_data* sd, const char* str, int gmlvl);
 
 AtCommandType atcommand(
 	struct map_session_data *sd,
diff --git a/src/map/charcommand.c b/src/map/charcommand.c
index 7d54fc5a6..8c360d8f8 100644
--- a/src/map/charcommand.c
+++ b/src/map/charcommand.c
@@ -123,7 +123,7 @@ int get_charcommand_level(const CharCommandType type) {
 }
 
 CharCommandType 
-charcommand_sub(const int fd, struct map_session_data* sd, const char* str, int gmlvl) {
+is_charcommand_sub(const int fd, struct map_session_data* sd, const char* str, int gmlvl) {
 	CharCommandInfo info;
 	CharCommandType type;
 
@@ -194,7 +194,7 @@ is_charcommand(const int fd, struct map_session_data* sd, const char* message) {
 	if (!*str)
 		return CharCommand_None;
 
-	return charcommand_sub(fd,sd,str,pc_isGM(sd));
+	return is_charcommand_sub(fd,sd,str,pc_isGM(sd));
 }
 
 /*==========================================
diff --git a/src/map/charcommand.h b/src/map/charcommand.h
index 05f02b774..5982ffe30 100644
--- a/src/map/charcommand.h
+++ b/src/map/charcommand.h
@@ -62,13 +62,13 @@ typedef struct CharCommandInfo {
 CharCommandType
 is_charcommand(const int fd, struct map_session_data* sd, const char* message);
 CharCommandType 
-charcommand_sub(const int fd, struct map_session_data* sd, const char* str, int gmlvl);
+is_charcommand_sub(const int fd, struct map_session_data* sd, const char* str, int gmlvl);
 
 CharCommandType charcommand(
 	struct map_session_data* sd, const int level, const char* message, CharCommandInfo* info);
 int get_charcommand_level(const CharCommandType type);
 
 int charcommand_config_read(const char *cfgName);
-extern char charcommand_symbol;	
+extern char charcommand_symbol;
 #endif
 
diff --git a/src/map/clif.c b/src/map/clif.c
index 779b23abd..b3b66e76b 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -4162,8 +4162,8 @@ int clif_clearchar_skillunit(struct skill_unit *unit,int fd)
 
 /*==========================================
  * Unknown... trap related?
- *------------------------------------------
  * Only affects units with class [139,153] client-side
+ *------------------------------------------
  */
 int clif_01ac(struct block_list *bl)
 {
diff --git a/src/map/itemdb.c b/src/map/itemdb.c
index 32a8f7d48..f1cbdb3f5 100644
--- a/src/map/itemdb.c
+++ b/src/map/itemdb.c
@@ -954,10 +954,10 @@ static int itemdb_read_sqldb(void)
 						script_free_code(id->script);
 					if (sql_row[19] != NULL) {
 						if (sql_row[19][0] == '{')
-							id->script = parse_script((unsigned char *) sql_row[19],item_db_name[i], ln, 0);
+							id->script = parse_script(sql_row[19],item_db_name[i], ln, 0);
 						else {
 							sprintf(script, "{%s}", sql_row[19]);
-							id->script = parse_script((unsigned char *) script, item_db_name[i], ln, 0);
+							id->script = parse_script(script, item_db_name[i], ln, 0);
 						}
 					} else id->script = NULL;
 	
@@ -965,10 +965,10 @@ static int itemdb_read_sqldb(void)
 						script_free_code(id->equip_script);
 					if (sql_row[20] != NULL) {
 						if (sql_row[20][0] == '{')
-							id->equip_script = parse_script((unsigned char *) sql_row[20], item_db_name[i], ln, 0);
+							id->equip_script = parse_script(sql_row[20], item_db_name[i], ln, 0);
 						else {
 							sprintf(script, "{%s}", sql_row[20]);
-							id->equip_script = parse_script((unsigned char *) script, item_db_name[i], ln, 0);
+							id->equip_script = parse_script(script, item_db_name[i], ln, 0);
 						}
 					} else id->equip_script = NULL;
 	
@@ -976,10 +976,10 @@ static int itemdb_read_sqldb(void)
 						script_free_code(id->unequip_script);
 					if (sql_row[21] != NULL) {
 						if (sql_row[21][0] == '{')
-							id->unequip_script = parse_script((unsigned char *) sql_row[21],item_db_name[i], ln, 0);
+							id->unequip_script = parse_script(sql_row[21],item_db_name[i], ln, 0);
 						else {
 							sprintf(script, "{%s}", sql_row[21]);
-							id->unequip_script = parse_script((unsigned char *) script, item_db_name[i], ln, 0);
+							id->unequip_script = parse_script(script, item_db_name[i], ln, 0);
 						}
 					} else id->unequip_script = NULL;
 				
diff --git a/src/map/map.c b/src/map/map.c
index 1032472cc..d580dd09c 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -3278,7 +3278,7 @@ int parse_console(char *buf) {
 	ShowInfo("Type of command: %s || Command: %s || Map: %s Coords: %d %d\n",type,command,map,x,y);
 
 	if ( strcmpi("admin",type) == 0 && n == 5 ) {
-		if( atcommand_sub(sd.fd,&sd,command,99) == AtCommand_None )
+		if( is_atcommand_sub(sd.fd,&sd,command,99) == AtCommand_None )
 			printf("Console: not atcommand\n");
 	} else if ( strcmpi("server",type) == 0 && n == 2 ) {
 		if ( strcmpi("shutdown", command) == 0 || strcmpi("exit",command) == 0 || strcmpi("quit",command) == 0 ) {
diff --git a/src/map/script.c b/src/map/script.c
index 0e1f03f16..dd2c07ef9 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -10344,7 +10344,7 @@ int buildin_atcommand(struct script_state *st)
 			while(*cmd != atcommand_symbol && *cmd != 0)
 				cmd++;
 		}
-		atcommand_sub(sd->fd, sd, cmd, 99);
+		is_atcommand_sub(sd->fd, sd, cmd, 99);
 	} else { //Use a dummy character.
 		struct map_session_data dummy_sd;
 		struct block_list *bl = NULL;
@@ -10360,7 +10360,7 @@ int buildin_atcommand(struct script_state *st)
 			while(*cmd != atcommand_symbol && *cmd != 0)
 				cmd++;
 		}
-		atcommand_sub(0, &dummy_sd, cmd, 99);
+		is_atcommand_sub(0, &dummy_sd, cmd, 99);
 	}
 
 	return 0;
@@ -10382,7 +10382,7 @@ int buildin_charcommand(struct script_state *st)
 			while(*cmd != charcommand_symbol && *cmd != 0)
 				cmd++;
 		}
-		charcommand_sub(sd->fd, sd, cmd,99);
+		is_charcommand_sub(sd->fd, sd, cmd,99);
 	} else { //Use a dummy character.
 		struct map_session_data dummy_sd;
 		struct block_list *bl = NULL;
@@ -10398,7 +10398,7 @@ int buildin_charcommand(struct script_state *st)
 			while(*cmd != charcommand_symbol && *cmd != 0)
 				cmd++;
 		}
-		charcommand_sub(0, &dummy_sd, cmd, 99);
+		is_charcommand_sub(0, &dummy_sd, cmd, 99);
 	}
 
 	return 0;