OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Fixed: When using PALVERS on the sky, it used the scaling from the true color version. (Side Note: I changed a line that scales the sky position according to the y scaling factor. This is because a 2x high resolution sky at 2048x256 wasn't positioned the same as a 1024x128 unscaled version. I moved the expression to the > 200 height path only, but I'm not sure if it's even still needed.)

Browse source 
- Fixed: PALVERS crashed with unknown textures since a value was never given for %s.
- Fixed: FON2 loader didn't set ActiveColors correctly.

SVN r3973 (trunk)
This commit is contained in:
Braden Obrzut 2012-11-30 23:36:02 +00:00
commit c845675b9b
3 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/v_font.cpp
View file

@ -1073,7 +1073,7 @@ void FSingleLumpFont::LoadFON2 (int lump, const BYTE *data)
FontHeight = data[4] + data[5]*256;
FirstChar = data[6];
LastChar = data[7];
ActiveColors = data[10];
ActiveColors = data[10]+1;
PatchRemap = NULL;
RescalePalette = data[9] == 0;
@ -1125,9 +1125,9 @@ void FSingleLumpFont::LoadFON2 (int lump, const BYTE *data)
SpaceWidth = totalwidth * 2 / (3 * count);
}
memcpy(PaletteData, palette, (ActiveColors+1)*3);
memcpy(PaletteData, palette, ActiveColors*3);
data_p = palette + (ActiveColors+1)*3;
data_p = palette + ActiveColors*3;
for (i = 0; i < count; ++i)
{