diff --git a/src/db.c b/src/db.c index c63895e..63f215b 100644 --- a/src/db.c +++ b/src/db.c @@ -3965,7 +3965,6 @@ void load_config( void ) strncpy(buf, "Reading menu in load_config()", sizeof(buf)); CONFIG_MENU = fread_string(fl, buf); parse_at(CONFIG_MENU); - parse_at(CONFIG_MENU); } else if (!str_cmp(tag, "min_rent_cost")) CONFIG_MIN_RENT_COST = num; else if (!str_cmp(tag, "min_wizlist_lev")) diff --git a/src/protocol.c b/src/protocol.c index c699207..f70b864 100644 --- a/src/protocol.c +++ b/src/protocol.c @@ -547,6 +547,31 @@ const char *ProtocolOutput( descriptor_t *apDescriptor, const char *apData, int case '\t': /* Two tabs in a row will display an actual tab */ pCopyFrom = Tab; break; + case '_': + pCopyFrom = "\x1B[4m"; /* Underline */ + break; + case '+': + pCopyFrom = "\x1B[1m"; /* Bold */ + break; + case '-': + pCopyFrom = "\x1B[5m"; /* Blinking??? */ + break; + case '*': + pCopyFrom = "@"; /* The At Symbol... I don't really like this, but it seems like + a simple way to allow for the @ symbol while maintain portability + between pre-ProtocolOutput() muds and post ProtocolOutput() muds.*/ + break; + /* 1,2,3 to be used a MUD's base colour palette. Just to maintain + * some sort of common colouring scheme amongst coders/builders */ + case '1': + pCopyFrom = ColourRGB(apDescriptor, "F022"); + break; + case '2': + pCopyFrom = ColourRGB(apDescriptor, "F055"); + break; + case '3': + pCopyFrom = ColourRGB(apDescriptor, "F555"); + break; case 'n': pCopyFrom = s_Clean; break; diff --git a/src/utils.c b/src/utils.c index b951382..0ad81af 100644 --- a/src/utils.c +++ b/src/utils.c @@ -1500,8 +1500,5 @@ char * convert_from_tabs(char * string) strcpy(buf, string); parse_tab(buf); - if (strchr(buf, '\t')) - mudlog(CMP, LVL_GOD, TRUE, "STILL TABS?! [%s]", buf); - return(buf); }