Commit 787a69c9 authored by rswindell's avatar rswindell
Browse files

When UTF-8 is enabled, don't bother asking about Ex-ASCII (CP437) support

(it's impleid).
parent 83875259
......@@ -821,7 +821,7 @@ void sbbs_t::maindflts(user_t* user)
,term&ANSI ? "ANSI ":"TTY "
,term&COLOR ? (term&ICE_COLOR ? text[TerminalIceColor] : text[TerminalColor]) : text[TerminalMonochrome]
,term&RIP ? "RIP " : nulstr
,term&UTF8 ? "UTF-8" : (term&NO_EXASCII ? "ASCII ":"CP437 ")
,term&UTF8 ? "UTF-8 " : (term&NO_EXASCII ? "ASCII ":"CP437 ")
,term&SWAP_DELETE ? "DEL=BS " : nulstr);
bprintf(text[UserDefaultsTerminal], truncsp(str));
if(user->rows)
......@@ -900,7 +900,7 @@ void sbbs_t::maindflts(user_t* user)
case 'T':
if(yesno(text[AutoTerminalQ])) {
user->misc |= AUTOTERM;
user->misc &= ~(ANSI|RIP|WIP|HTML|PETSCII);
user->misc &= ~(ANSI|RIP|WIP|HTML|PETSCII|UTF8);
}
else
user->misc &= ~AUTOTERM;
......@@ -933,7 +933,7 @@ void sbbs_t::maindflts(user_t* user)
if(sys_status&SS_ABORT)
break;
if(!(term&PETSCII)) {
if(!yesno(text[ExAsciiTerminalQ]))
if(!(user->misc&UTF8) && !yesno(text[ExAsciiTerminalQ]))
user->misc|=NO_EXASCII;
else
user->misc&=~NO_EXASCII;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment