- use GZDoom's font code to fix the crash issues and moved around some files in the PK3.

This pulls in a lot of Doom specific font setup, this can be sorted out later as it won't get into the way.

# Conflicts:
#	source/CMakeLists.txt

# Conflicts:
#	source/glbackend/hw_draw2d.cpp

# Conflicts:
#	source/CMakeLists.txt

# Conflicts:
#	source/glbackend/gl_texture.cpp

# Conflicts:
#	source/CMakeLists.txt

# Conflicts:
#	source/build/src/palette.cpp
#	source/core/gamecontrol.cpp
This commit is contained in:
Christoph Oelckers 2020-04-05 22:51:53 +02:00
parent a70b7fa698
commit 531c68edfe
24 changed files with 1154 additions and 230 deletions

View file

@ -255,7 +255,7 @@ bool GLInstance::SetTextureInternal(int picnum, FTexture* tex, int palette, int
applytint = true;
if (!(h.f & HICTINT_APPLYOVERPALSWAP)) usepalswap = 0;
}
lookuppal = palmanager.LookupPalette(usepalette, usepalswap, false, 0);
lookuppal = TRANSLATION(usepalette + Translation_Remap, usepalswap);
}
}