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

12
engine/client/textedit.c
View file

@ -760,7 +760,7 @@ void Draw_CursorLine(int ox, int y, fileblock_t *b)
if (*d == '\t')
{
if (a == cx)
Draw_ColouredCharacter (x+ox, y, 11|M_COLOR_WHITE);
Draw_ColouredCharacter (x+ox, y, 11|CON_WHITEMASK);
x+=ts;
x-=x%ts;
d++;
@ -770,9 +770,9 @@ void Draw_CursorLine(int ox, int y, fileblock_t *b)
if (x+ox< vid.width)
{
if (a == cx)
Draw_ColouredCharacter (x+ox, y, 11|M_COLOR_WHITE);
Draw_ColouredCharacter (x+ox, y, 11|CON_WHITEMASK);
else
Draw_ColouredCharacter (x+ox, y, (int)*d | (colour<<8));
Draw_ColouredCharacter (x+ox, y, (int)*d | (colour<<CON_FGSHIFT));
}
d++;
x += 8;
@ -816,7 +816,7 @@ void Draw_NonCursorLine(int x, int y, fileblock_t *b)
continue;
}
if (x+nx < vid.width)
Draw_ColouredCharacter (x+nx, y, (int)*d | (colour<<8));
Draw_ColouredCharacter (x+nx, y, (int)*d | (colour<<CON_FGSHIFT));
d++;
nx += 8;
}
@ -894,9 +894,9 @@ void Editor_Draw(void)
x = 0;
if (madechanges)
Draw_Character (vid.width - 8, 0, '!'|128);
Draw_Character (vid.width - 8, 0, '!'|CON_HIGHCHARSMASK);
if (!insertkeyhit)
Draw_Character (vid.width - 16, 0, 'O'|128);
Draw_Character (vid.width - 16, 0, 'O'|CON_HIGHCHARSMASK);
Draw_String(0, 0, va("%6i:%4i:%s", cursorlinenum, cursorx+1, OpenEditorFile));
if (useeval)