OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- rewrote the operator>> methods of FileReader as normal functions for clarity.

Browse source
This commit is contained in:
Christoph Oelckers 2018-03-11 18:20:49 +01:00
commit 0be1ed252b
12 changed files with 150 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/v_font.cpp
View file

@ -1899,9 +1899,7 @@ void FFontChar2::MakeTexture ()
{
if (runlen != 0)
{
uint8_t color;
lump >> color;
uint8_t color = lump.ReadUInt8();
color = MIN (color, max);
if (SourceRemap != NULL)
{
@ -1921,18 +1919,14 @@ void FFontChar2::MakeTexture ()
}
else
{
int8_t code;
lump >> code;
int8_t code = lump.ReadInt8();
if (code >= 0)
{
runlen = code + 1;
}
else if (code != -128)
{
uint8_t color;
lump >> color;
uint8_t color = lump.ReadUInt8();
setlen = (-code) + 1;
setval = MIN (color, max);
if (SourceRemap != NULL)
@ -1951,8 +1945,7 @@ void FFontChar2::MakeTexture ()
{
for (int x = Width; x != 0; --x)
{
uint8_t color;
lump >> color;
uint8_t color = lump.ReadUInt8();
if (color > max)
{
color = max;