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

11
src/textures/texturemanager.cpp
View file

@ -51,11 +51,16 @@
#include "farchive.h"
#include "v_video.h"
#include "r_renderer.h"
#include "r_sky.h"
#include "textures/textures.h"
FTextureManager TexMan;
CVAR(Bool, vid_nopalsubstitutions, false, CVAR_ARCHIVE)
CUSTOM_CVAR(Bool, vid_nopalsubstitutions, false, CVAR_ARCHIVE)
{
// This is in case the sky texture has been substituted.
R_InitSkyMap ();
}
//==========================================================================
//
@ -1026,13 +1031,13 @@ void FTextureManager::InitPalettedVersions()
FTextureID pic1 = CheckForTexture(sc.String, FTexture::TEX_Any);
if (!pic1.isValid())
{
sc.ScriptMessage("Unknown texture %s to replace");
sc.ScriptMessage("Unknown texture %s to replace", sc.String);
}
sc.MustGetString();
FTextureID pic2 = CheckForTexture(sc.String, FTexture::TEX_Any);
if (!pic2.isValid())
{
sc.ScriptMessage("Unknown texture %s to use as replacement");
sc.ScriptMessage("Unknown texture %s to use as replacement", sc.String);
}
if (pic1.isValid() && pic2.isValid())
{