OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- sound code and most of texture code converted to FileRdr.

Browse source 
This allowed to remove a lot of bad pointer voodoo in the music loader, because the new class does not allow duplication of the reader object
This commit is contained in:
Christoph Oelckers 2018-03-10 18:45:11 +01:00
commit 5fa63c396d
46 changed files with 333 additions and 307 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/textures/flattexture.cpp
View file

@ -74,7 +74,7 @@ protected:
//
//==========================================================================
FTexture *FlatTexture_TryCreate(FileReader & file, int lumpnum)
FTexture *FlatTexture_TryCreate(FileRdr & file, int lumpnum)
{
return new FFlatTexture(lumpnum);
}
@ -194,9 +194,9 @@ const uint8_t *FFlatTexture::GetPixels ()
void FFlatTexture::MakeTexture ()
{
FWadLump lump = Wads.OpenLumpNum (SourceLump);
auto lump = Wads.OpenLumpReader (SourceLump);
Pixels = new uint8_t[Width*Height];
long numread = lump.Read (Pixels, Width*Height);
auto numread = lump.Read (Pixels, Width*Height);
if (numread < Width*Height)
{
memset (Pixels + numread, 0xBB, Width*Height - numread);