- 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

1 files changed, 4 insertions, 4 deletions

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;