- if (MyConnect(victim)) {
-#ifdef HEAD_IN_SAND_KILLWHO
- sendcmdto_one(&me, CMD_KILL, victim, "%C :%s", victim,
- comment);
-#else
- sendcmdto_one(sptr, CMD_KILL, victim, "%C :%s", victim,
- comment);
-#endif
- }
- return exit_client_msg(cptr, victim, sptr, "Killed (%s)", comment);
+ if (MyConnect(victim))
+ sendcmdto_one(feature_bool(FEAT_HIS_KILLWHO) ? &his : sptr, CMD_KILL,
+ victim, "%C :%s %s", victim, feature_bool(FEAT_HIS_KILLWHO)
+ ? feature_str(FEAT_HIS_SERVERNAME) : cli_name(sptr), msg);
+ return exit_client_msg(cptr, victim, feature_bool(FEAT_HIS_KILLWHO)
+ ? &me : sptr, "Killed (%s %s)",
+ feature_bool(FEAT_HIS_KILLWHO) ?
+ feature_str(FEAT_HIS_SERVERNAME) : cli_name(sptr),
+ msg);