fte/fteqw
2
0
Fork 1
Code Issues Pull requests Releases 1 Activity Actions

THIS COMMIT MOST LIKELY BREAKS THINGS.

Browse source 
changed conchars from 16-bit to 32-bit
added support for RGBI fg and bg colors
better support for ^8/^9 text codes
fix to echoish menu sounds
added plugin stuff for centerprints/server messages/chat messages, not finalized (?)
GL/SW color character functions improved (although neither handle transparent characters, and SW needs improvement with the palette remapping)


git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1750 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
TimeServ 2006-01-01 09:01:15 +00:00
parent 8ef3ae1182
commit a8889d8f24
31 changed files with 632 additions and 575 deletions
Download patch file Download diff file Expand all files Collapse all files

44
engine/client/sbar.c
View file

@ -110,7 +110,7 @@ void Sbar_ChatModeOverlay(void);
void Draw_FunString(int x, int y, unsigned char *str)
{
int ext = COLOR_WHITE<<8;
int ext = CON_WHITEMASK;
int extstack[4];
int extstackdepth = 0;
@ -120,21 +120,21 @@ void Draw_FunString(int x, int y, unsigned char *str)
if (*str == '^')
{
str++;
if (*str >= '0' && *str <= '7')
if (*str >= '0' && *str <= '9')
{
ext = (*str++-'0')*256 + (ext&~CON_COLOURMASK); //change colour only.
ext = q3codemasks[*str++-'0'] | (ext&~CON_Q3MASK); //change colour only.
continue;
}
else if (*str == 'a')
{
str++;
ext = (ext & ~CON_2NDCHARSETTEXT) + (CON_2NDCHARSETTEXT - (ext & CON_2NDCHARSETTEXT));
ext ^= CON_2NDCHARSETTEXT;
continue;
}
else if (*str == 'b')
{
str++;
ext = (ext & ~CON_BLINKTEXT) + (CON_BLINKTEXT - (ext & CON_BLINKTEXT));
ext ^= CON_BLINKTEXT;
continue;
}
else if (*str == 's') //store on stack (it's great for names)
@ -159,26 +159,26 @@ void Draw_FunString(int x, int y, unsigned char *str)
}
else if (*str == '^')
{
Draw_ColouredCharacter(x, y, '^' + ext);
Draw_ColouredCharacter(x, y, '^' | ext);
str++;
}
else
{
Draw_ColouredCharacter(x, y, '^' + ext);
Draw_ColouredCharacter(x, y, '^' | ext);
x += 8;
Draw_ColouredCharacter (x, y, (*str++) + ext);
Draw_ColouredCharacter (x, y, (*str++) | ext);
}
x += 8;
continue;
}
Draw_ColouredCharacter (x, y, (*str++) + ext);
Draw_ColouredCharacter (x, y, (*str++) | ext);
x += 8;
}
}
void Draw_FunStringLen(int x, int y, unsigned char *str, int len)
{
int ext = COLOR_WHITE<<8;
int ext = CON_WHITEMASK;
int extstack[4];
int extstackdepth = 0;
@ -191,21 +191,21 @@ void Draw_FunStringLen(int x, int y, unsigned char *str, int len)
if (*str == '^')
{
str++;
if (*str >= '0' && *str <= '7')
if (*str >= '0' && *str <= '9')
{
ext = (*str++-'0')*256 + (ext&~CON_COLOURMASK); //change colour only.
ext = q3codemasks[*str++-'0'] | (ext&~CON_Q3MASK); //change colour only.
continue;
}
else if (*str == 'a')
{
str++;
ext = (ext & ~CON_2NDCHARSETTEXT) + (CON_2NDCHARSETTEXT - (ext & CON_2NDCHARSETTEXT));
ext ^= CON_2NDCHARSETTEXT;
continue;
}
else if (*str == 'b')
{
str++;
ext = (ext & ~CON_BLINKTEXT) + (CON_BLINKTEXT - (ext & CON_BLINKTEXT));
ext ^= CON_BLINKTEXT;
continue;
}
else if (*str == 's') //store on stack (it's great for names)
@ -229,19 +229,19 @@ void Draw_FunStringLen(int x, int y, unsigned char *str, int len)
}
else if (*str == '^')
{
Draw_ColouredCharacter(x, y, '^' + ext);
Draw_ColouredCharacter(x, y, '^' | ext);
str++;
}
else
{
Draw_ColouredCharacter(x, y, '^' + ext);
Draw_ColouredCharacter(x, y, '^' | ext);
x += 8;
Draw_ColouredCharacter (x, y, (*str++) + ext);
Draw_ColouredCharacter (x, y, (*str++) | ext);
}
x += 8;
continue;
}
Draw_ColouredCharacter (x, y, (*str++) + ext);
Draw_ColouredCharacter (x, y, (*str++) | ext);
x += 8;
}
}
@ -2056,7 +2056,7 @@ void Sbar_DeathmatchOverlay (int start)
y += skip;
}
Draw_Character(0,0,COLOR_WHITE<<8);
Draw_Character(0,0,CON_WHITEMASK);
if (y >= vid.height-10) // we ran over the screen size, squish
largegame = true;
@ -2157,7 +2157,7 @@ void Sbar_ChatModeOverlay(void)
y += skip;
}
Draw_Character(0,0,COLOR_WHITE<<8);
Draw_Character(0,0,CON_WHITEMASK);
if (y >= vid.height-10) // we ran over the screen size, squish
largegame = true;
@ -2240,7 +2240,7 @@ void Sbar_MiniDeathmatchOverlay (void)
f = s->frags;
sprintf (num, "%3i",f);
Draw_ColouredCharacter ( x+8 , y, (COLOR_WHITE<<8)|num[0]);
Draw_ColouredCharacter ( x+8 , y, CON_WHITEMASK|num[0]);
Draw_Character ( x+16, y, num[1]);
Draw_Character ( x+24, y, num[2]);
@ -2270,7 +2270,7 @@ void Sbar_MiniDeathmatchOverlay (void)
// draw seperator
x += 208;
for (y = sbar_rect.height - sb_lines; y < sbar_rect.height - 6; y += 2)
Draw_ColouredCharacter(x, y, (COLOR_WHITE<<8)|14);
Draw_ColouredCharacter(x, y, CON_WHITEMASK|14);
x += 16;