summaryrefslogtreecommitdiff
path: root/src/map/script.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/map/script.c')
-rw-r--r--src/map/script.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/map/script.c b/src/map/script.c
index 8dd8cf071..e2395aab4 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -11006,16 +11006,17 @@ BUILDIN_FUNC(message)
*------------------------------------------*/
BUILDIN_FUNC(npctalk)
{
- const char *str;
+ const char* str;
char message[255];
- struct npc_data *nd=(struct npc_data *)map_id2bl(st->oid);
- str=script_getstr(st,2);
+ struct npc_data* nd = (struct npc_data *)map_id2bl(st->oid);
+ str = script_getstr(st,2);
if(nd) {
memcpy(message, nd->name, NAME_LENGTH);
- strcat(message," : ");
- strncat(message,str, 254); //Prevent overflow possibility. [Skotlex]
+ strtok(message, "#"); // discard extra name identifier if present
+ strcat(message, " : ");
+ strncat(message, str, 254); //Prevent overflow possibility. [Skotlex]
clif_message(&(nd->bl), message);
}