merge FileData and ResourceData.
This commit is contained in:
parent
d2cb44b1bf
commit
fe106d9bfe
38 changed files with 77 additions and 118 deletions
|
|
@ -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]];
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue