tbaMUD Continued development of the CircleMUD core

(!IS_NPC(ch) ? (PRF_FLAGGED((ch), PRF_COLOR_1) ? 1 : 0) +  (PRF_FLAGGED((ch), PRF_COLOR_2) ? 2 : 0) : 0)  >= 2 ?  "\x1B[0;32m" : ""

(!IS_NPC(ch) ? (PRF_FLAGGED((ch), PRF_COLOR_1) || PRF_FLAGGED((ch), PRF_COLOR_2) ? 1 : 0) : 0) ?  "\x1B[0;32m" : "";

Add screen.h to comm.c and replace proc_colours:

 static size_t proc_colors(char *txt, size_t maxlen, int char_colour_pref)
{
  char *d, *s, *c, *p;
  int i;
  int colour_level = C_NRM;

  if (!txt || !strchr(txt, '@')) /* skip out if no color codes     */
    return strlen(txt);

  s = txt;
  CREATE(d, char, maxlen);
  p = d;

  for( ; *s && ((size_t)(d-p) < maxlen); ) {
    /* no color code - just copy */
    if (*s != '@') {
      *d++ = *s++;
      continue;
    }

    /* if we get here we have a color code */
    s++; /* s now points to the code */

    switch(*s)
    {
    case 0:     *d++ = '@'; continue;        /* string was terminated with @; make sure s stays at the 0 */
    case '@':   *d++ = '@'; break;           /* Always a @ */
    case '+':   colour_level = C_SPR; break; /* high colour - show even if SPARSE */
    case '=':   colour_level = C_NRM; break; /* normal colour */
    case '-':   colour_level = C_CMP; break; /* low colour - show only if COMPLETE */
    default:
      if (char_colour_pref >= colour_level) { /* only copy the new code if above the level */
        for (i = 0; CCODE[i] != '!'; i++) { /* do we find it ? */
          if ((*s) == CCODE[i]) {           /* if so :*/
            /* c now points to the first char in color code*/
            for(c = ANSI[i] ; *c && ((size_t)(d-p) < maxlen); )
               *d++ = *c++;
            break;
          }
        }
      }
      break;
    }
    /* Whatever the code was (even invalid), skip it */
    s++;

  } /* for loop */

  /* make sure txt is NULL - terminated */
  d = 0;
  strncpy(txt, p, maxlen-1);

  free(p);

  return strlen(txt);
}

and in vwrite_to_output, remove the if(t->character) check and insert this:


   {
    // Inherit colour settings if switched
    struct char_data *dest = t->original ? t->original : t->character;
    int colour_level = dest ? _clrlevel(dest) : 0;
    wantsize = size = proc_colors(txt, sizeof(txt), colour_level);
  }