This commit is contained in:
Rumble 2014-08-28 22:34:54 -05:00
parent 5c864a030d
commit 8bbcde427d
2 changed files with 2 additions and 1 deletions

View file

@ -626,7 +626,7 @@ void script_trigger_check(void)
char_data *ch; char_data *ch;
obj_data *obj; obj_data *obj;
struct room_data *room=NULL; struct room_data *room=NULL;
int nr; room_rnum nr;
struct script_data *sc; struct script_data *sc;
for (ch = character_list; ch; ch = ch->next) { for (ch = character_list; ch; ch = ch->next) {

View file

@ -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 */ strcpy(write_point, tokens[num]); /* strcpy: OK */
write_point += strlen(tokens[num]); write_point += strlen(tokens[num]);
} else if (*temp == ALIAS_GLOB_CHAR) { } else if (*temp == ALIAS_GLOB_CHAR) {
skip_spaces(&orig);
strcpy(write_point, orig); /* strcpy: OK */ strcpy(write_point, orig); /* strcpy: OK */
write_point += strlen(orig); write_point += strlen(orig);
} else if ((*(write_point++) = *temp) == '$') /* redouble $ for act safety */ } else if ((*(write_point++) = *temp) == '$') /* redouble $ for act safety */