OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge remote-tracking branch 'gzdoom/master'

Browse source
This commit is contained in:
Magnus Norddahl 2024-01-10 04:03:35 +01:00
commit 805bce1166
214 changed files with 10327 additions and 6393 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/r_data/portalgroups.cpp
View file

@ -400,7 +400,7 @@ static void GroupLinePortals(FLevelLocals *Level)
for (unsigned i = 0; i < Level->linePortals.Size(); i++)
{
auto port = Level->linePortals[i];
const auto& port = Level->linePortals[i];
bool gotsome;
if (tempindex[i] == -1)

2
src/r_data/r_translate.cpp
View file

@ -494,7 +494,7 @@ static void R_CreatePlayerTranslation (float h, float s, float v, const FPlayerC
else
{
auto translump = fileSystem.ReadFile(colorset->Lump);
auto trans = translump.GetBytes();
auto trans = translump.bytes();
for (i = start; i <= end; ++i)
{
table->Remap[i] = GPalette.Remap[trans[i]];

2
src/r_data/sprites.cpp
View file

@ -947,7 +947,7 @@ CCMD (skins)
static void R_CreateSkinTranslation (const char *palname)
{
auto lump = fileSystem.ReadFile (palname);
auto otherPal = lump.GetBytes();
auto otherPal = lump.bytes();
for (int i = 0; i < 256; ++i)
{

2
src/r_data/v_palette.cpp
View file

@ -65,7 +65,7 @@ void InitPalette ()
if (lump != -1)
{
FileData cmap = fileSystem.ReadFile(lump);
auto cmapdata = cmap.GetBytes();
auto cmapdata = cmap.bytes();
GPalette.GenerateGlobalBrightmapFromColormap(cmapdata, 32);
MakeGoodRemap((uint32_t*)GPalette.BaseColors, GPalette.Remap, cmapdata + 7936); // last entry in colormap
}