tbaMUD Continued development of the CircleMUD core

    case SCMD_UNAFFECT:
	  half_chop(argument, arg, arg2);
	  bool find = FALSE, found = FALSE;
	  if (*arg2 && arg2 != NULL)
	     find = TRUE;
	  if (vict->affected || AFF_FLAGS(vict)) {
		while (vict->affected && found == FALSE) {
			/* Ok, we're looking for something, is this it? */
			if (find == TRUE && !strcmp(arg2, skill_name(vict->affected->type))) {
			    if (AFF_FLAGGED(vict, vict->affected->bitvector))
					REMOVE_BIT(AFF_FLAGS(vict), vict->affected->bitvector);
				affect_remove(vict, vict->affected);
				if (!vict->affected->next || !(vict->affected->next->type == vict->affected->type))
					found = TRUE;
			/* We're looking for somthing and we've cycled all the way through yet been
			unable to find it... so we need to break out of the loop */
			} else if (!vict->affected->next && find == TRUE) {
				break;
			/* Not looking for something, so remove them all */
			} else if (find == FALSE) {
				affect_remove(vict, vict->affected);
			}
		}
			if (find == FALSE) { /* Not looking, we removed all */
				AFF_FLAGS(vict) = 0;
				send_to_char(vict, "There is a brief flash of light!\r\nYou feel very different.\r\n");
				send_to_char(ch, "All spells removed.\r\n");
			} else if (found == TRUE) { /* Looking, found, removed */
				send_to_char(vict, "There is a brief flash of light!\r\nYou feel slightly different.\r\n");
				send_to_char(ch, "The spell %s has been removed.\r\n", arg2);
			} else { /* Looking, and couldn't find */
				send_to_char(ch, "%s does not seem affected by %s.\r\n", CAP(arg), arg2);
			}
      } else {
		send_to_char(ch, "Your victim does not have any affections!\r\n");
		return;
      }
      break;

    case SCMD_UNAFFECT:
	  skip_spaces(&argument);
	  bool find = FALSE, found = FALSE;
	  int qend, skill = 0;
	  if (*argument && argument != NULL) {
	     find = TRUE;
		  if (*argument != '\'') {
			send_to_char(ch, "Spell must be enclosed in: ''\r\n");
			return;
	  	}
		  for (qend = 1; argument[qend] && argument[qend] != '\''; qend++)
		    argument[qend] = LOWER(argument[qend]);
		  if (argument[qend] != '\'') {
			send_to_char(ch, "Spell must be enclosed in: ''\r\n");
			return;
		  }
		  strlcpy(arg2, (argument + 1), sizeof(arg2));		/* strcpy: OK (MAX_INPUT_LENGTH <= MAX_STRING_LENGTH) */
		  arg2[qend -1] = '{{uie-code}}';
		  skill = find_skill_num(arg2);
		  if (skill <= 0 || skill > MAX_SPELLS) {
			send_to_char(ch, "Unrecognized spell.\r\n");
			return;
		  }
		  /* Ok, we found it, and now we want to make sure we have the full spell name */
		  if (strcmp(arg2, skill_name(skill)))
			strlcpy(arg2, skill_name(skill), sizeof(arg2));
	  }

	  if (vict->affected || AFF_FLAGS(vict)) {
		while (vict->affected) {
			/* Not looking for something, so remove them all */
			if (find == FALSE) {
				affect_remove(vict, vict->affected);
			}
			/* Ok, we're looking for something, is this it? */
			else if (find == TRUE && skill == vict->affected->type) {
			    if (AFF_FLAGGED(vict, vict->affected->bitvector))
					REMOVE_BIT(AFF_FLAGS(vict), vict->affected->bitvector);
				affect_remove(vict, vict->affected);
				if (!vict->affected || !(vict->affected->next->type == vict->affected->type)) {
					found = TRUE;
					break;
				}
			/* We're looking for somthing and we've cycled all the way through yet been
			unable to find it... so we need to break out of the loop */
			}
			else if (!vict->affected->next && find == TRUE)
				break;
		}
			if (find == FALSE) { /* Not looking, we removed all */
				AFF_FLAGS(vict) = 0;
				send_to_char(vict, "There is a brief flash of light!\r\nYou feel very different.\r\n");
				send_to_char(ch, "All spells removed.\r\n");
			} else if (found == TRUE) { /* Looking, found, removed */
				send_to_char(vict, "There is a brief flash of light!\r\nYou feel slightly different.\r\n");
				send_to_char(ch, "The spell %s has been removed.\r\n", arg2);
			} else { /* Looking, and couldn't find */
				send_to_char(ch, "%s does not seem affected by %s.\r\n", GET_NAME(vict), arg2);
			}
      } else {
		send_to_char(ch, "Your victim does not have any affections!\r\n");
		return;
      }
      break;