OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

SVN r446 (trunk)

Browse source
This commit is contained in:
Randy Heit 2007-01-09 04:40:58 +00:00
commit 82ba0fb189
11 changed files with 298 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/v_text.cpp
View file

@ -200,47 +200,11 @@ void STACK_ARGS DCanvas::DrawText (int normalcolor, int x, int y, const char *st
if (c == TEXTCOLOR_ESCAPE)
{
int newcolor = *ch++;
if (newcolor == '\0')
EColorRange newcolor = V_ParseFontColor (ch, normalcolor, boldcolor);
if (newcolor != CR_UNDEFINED)
{
return;
range = Font->GetColorTranslation (newcolor);
}
else if (newcolor == '-') // Normal
{
newcolor = normalcolor;
}
else if (newcolor == '+') // Bold
{
newcolor = boldcolor;
}
else if (newcolor == '[') // Named
{
const BYTE *namestart = ch;
while (*ch != ']' && *ch != '\0')
{
ch++;
}
FName rangename((const char *)namestart, int(ch - namestart), true);
if (*ch != '\0')
{
ch++;
}
newcolor = V_FindFontColor (rangename);
}
else if (newcolor >= 'A' && newcolor < NUM_TEXT_COLORS + 'A') // Standard, uppercase
{
newcolor -= 'A';
}
else if (newcolor >= 'a' && newcolor < NUM_TEXT_COLORS + 'a') // Standard, lowercase
{
newcolor -= 'a';
}
else // Incomplete!
{
continue;
}
range = Font->GetColorTranslation ((EColorRange)newcolor);
continue;
}