PennMUSH Community

Changeset 661

Show
Ignore:
Timestamp:
01/27/07 05:19:02 (2 years ago)
Author:
penndev
Message:

PennMUSH 1.8.3p0 release with ANSI_NORMAL fixes.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • releases/1.8.3/0/hdrs/ansi.h

    r654 r661  
    7272#define ANSI_END        MARKUP_START "c/" MARKUP_END 
    7373#define ANSI_ENDALL     MARKUP_START "c/a" MARKUP_END 
     74 
     75#define ANSI_NORMAL     ANSI_ENDALL 
    7476 
    7577void init_ansi_codes(void); 

  • releases/1.8.3/0/src/funstr.c

    r654 r661  
    593593  int matches; 
    594594  int i; 
    595   int j; 
    596595  char *qregs[NUMQ]; 
    597596  int nqregs; 

  • releases/1.8.3/0/src/markup.c

    r659 r661  
    4141#define ANSI_FINISH  "m" 
    4242 
    43 #define ANSI_NORMAL   "\x1B[0m" 
     43#define COL_NORMAL   "\x1B[0m" 
    4444 
    4545/* COL_* and VAL_* defines */ 
    …… 
    529529  if (cur->fore == 'n') { 
    530530    if (old->bits || (old->fore && old->fore != 'n') || old->back) { 
    531       return safe_str(ANSI_NORMAL, buff, bp); 
     531      return safe_str(COL_NORMAL, buff, bp); 
    532532    } 
    533533  } 
    …… 
    540540  if ((old->bits & ~(cur->bits)) || 
    541541      (old->fore && !cur->fore) || (old->back && !cur->back)) { 
    542     safe_str(ANSI_NORMAL, buff, bp); 
     542    safe_str(COL_NORMAL, buff, bp); 
    543543    old = &ansi_normal; 
    544544  } 
    …… 
    550550 
    551551  if (!(cur->fore || cur->back || cur->bits || cur->offbits)) { 
    552     return safe_str(ANSI_NORMAL, buff, bp); 
     552    return safe_str(COL_NORMAL, buff, bp); 
    553553  } 
    554554 
    …… 
    891891       * it overwrites (rather than modifies) */ 
    892892      for (tmp = ptr; *tmp && *tmp != 'm'; tmp++) ; 
    893       if (strcmp(ptr, ANSI_NORMAL) != 0) { 
     893      if (strcmp(ptr, COL_NORMAL) != 0) { 
    894894    struct ansi_data cur; 
    895895    read_raw_ansi_data(&cur, ptr); 
    …… 
    950950 
    951951  /* For everything left on the stack: 
    952    * If it's an ANSI code, close it with ANSI_NORMAL and i. 
     952   * If it's an ANSI code, close it with COL_NORMAL and i. 
    953953   * If it's an HTML code, assume it's a standalone, and leave 
    954954   *   its stop point where it is. */