OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- the fourth.

Browse source
This commit is contained in:
Christoph Oelckers 2017-03-08 18:47:52 +01:00
commit 8ab562ef13
107 changed files with 1041 additions and 1041 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/v_text.cpp
View file

@ -132,7 +132,7 @@ DEFINE_ACTION_FUNCTION(_Screen, DrawChar)
void DCanvas::DrawTextCommon(FFont *font, int normalcolor, double x, double y, const char *string, DrawParms &parms)
{
int w;
const BYTE *ch;
const uint8_t *ch;
int c;
double cx;
double cy;
@ -154,7 +154,7 @@ void DCanvas::DrawTextCommon(FFont *font, int normalcolor, double x, double y, c
kerning = font->GetDefaultKerning();
ch = (const BYTE *)string;
ch = (const uint8_t *)string;
cx = x;
cy = y;
@ -254,7 +254,7 @@ DEFINE_ACTION_FUNCTION(_Screen, DrawText)
//
//==========================================================================
static void breakit (FBrokenLines *line, FFont *font, const BYTE *start, const BYTE *stop, FString &linecolor)
static void breakit (FBrokenLines *line, FFont *font, const uint8_t *start, const uint8_t *stop, FString &linecolor)
{
if (!linecolor.IsEmpty())
{
@ -265,11 +265,11 @@ static void breakit (FBrokenLines *line, FFont *font, const BYTE *start, const B
line->Width = font->StringWidth (line->Text);
}
FBrokenLines *V_BreakLines (FFont *font, int maxwidth, const BYTE *string, bool preservecolor, unsigned int *count)
FBrokenLines *V_BreakLines (FFont *font, int maxwidth, const uint8_t *string, bool preservecolor, unsigned int *count)
{
TArray<FBrokenLines> Lines(128);
const BYTE *space = NULL, *start = string;
const uint8_t *space = NULL, *start = string;
int c, w, nw;
FString lastcolor, linecolor;
bool lastWasSpace = false;
@ -285,7 +285,7 @@ FBrokenLines *V_BreakLines (FFont *font, int maxwidth, const BYTE *string, bool
{
if (*string == '[')
{
const BYTE *start = string;
const uint8_t *start = string;
while (*string != ']' && *string != '\0')
{
string++;
@ -355,7 +355,7 @@ FBrokenLines *V_BreakLines (FFont *font, int maxwidth, const BYTE *string, bool
// String here is pointing one character after the '\0'
if (--string - start >= 1)
{
const BYTE *s = start;
const uint8_t *s = start;
while (s < string)
{