From 8bbcde427d5ae3c376ad3b74e24b4c22f7ff35d6 Mon Sep 17 00:00:00 2001 From: Rumble Date: Thu, 28 Aug 2014 22:34:54 -0500 Subject: [PATCH] clean-up --- src/dg_scripts.c | 2 +- src/interpreter.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/dg_scripts.c b/src/dg_scripts.c index 0d00412..e17bec5 100644 --- a/src/dg_scripts.c +++ b/src/dg_scripts.c @@ -626,7 +626,7 @@ void script_trigger_check(void) char_data *ch; obj_data *obj; struct room_data *room=NULL; - int nr; + room_rnum nr; struct script_data *sc; for (ch = character_list; ch; ch = ch->next) { diff --git a/src/interpreter.c b/src/interpreter.c index 248f7bb..fd9460d 100644 --- a/src/interpreter.c +++ b/src/interpreter.c @@ -698,6 +698,7 @@ static void perform_complex_alias(struct txt_q *input_q, char *orig, struct alia strcpy(write_point, tokens[num]); /* strcpy: OK */ write_point += strlen(tokens[num]); } else if (*temp == ALIAS_GLOB_CHAR) { + skip_spaces(&orig); strcpy(write_point, orig); /* strcpy: OK */ write_point += strlen(orig); } else if ((*(write_point++) = *temp) == '$') /* redouble $ for act safety */