kyonshi/grenzland-mud
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Rumble
2014-08-28 23:10:44 -05:00
parent 43d7f71c10
commit 70713e2535
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/interpreter.c
View File

@@ -699,11 +699,7 @@ static void perform_complex_alias(struct txt_q *input_q, char *orig, struct alia
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); skip_spaces(&orig);
<<<<<<< HEAD
strcpy(write_point, orig); /* strcpy: OK */ strcpy(write_point, orig); /* strcpy: OK */
=======
strcpy(write_point, orig); /* strcpy: OK */
>>>>>>> f81cf2451717859aecaebb3ca07daf7b9d9a45a5
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 */
*(write_point++) = '$'; *(write_point++) = '$';