- comment = cli_name(cptr);
-
- if (parc > 1) {
- comment = parv[parc - 1];
-
- if (0 == strncmp("Local kill", comment, 10) || 0 == strncmp(comment, "Killed", 6))
- comment = cli_name(cptr);
- else if (strlen(comment) > TOPICLEN)
- comment[TOPICLEN] = '\0';
- }
- return exit_client(cptr, sptr, sptr, comment);
+ if (parc > 1 && !BadPtr(parv[parc - 1]))
+ return exit_client_msg(cptr, sptr, sptr, "Quit: %s", parv[parc - 1]);
+ else
+ return exit_client(cptr, sptr, sptr, "Quit");