OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge https://github.com/coelckers/gzdoom

Browse source
This commit is contained in:
Rachael Alexanderson 2017-03-08 21:25:24 -05:00
commit cc9a2e5121
283 changed files with 3308 additions and 2963 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/textures/flattexture.cpp
View file

@ -51,12 +51,12 @@ public:
FFlatTexture (int lumpnum);
~FFlatTexture ();
const BYTE *GetColumn (unsigned int column, const Span **spans_out);
const BYTE *GetPixels ();
const uint8_t *GetColumn (unsigned int column, const Span **spans_out);
const uint8_t *GetPixels ();
void Unload ();
protected:
BYTE *Pixels;
uint8_t *Pixels;
Span DummySpans[2];
@ -147,7 +147,7 @@ void FFlatTexture::Unload ()
//
//==========================================================================
const BYTE *FFlatTexture::GetColumn (unsigned int column, const Span **spans_out)
const uint8_t *FFlatTexture::GetColumn (unsigned int column, const Span **spans_out)
{
if (Pixels == NULL)
{
@ -177,7 +177,7 @@ const BYTE *FFlatTexture::GetColumn (unsigned int column, const Span **spans_out
//
//==========================================================================
const BYTE *FFlatTexture::GetPixels ()
const uint8_t *FFlatTexture::GetPixels ()
{
if (Pixels == NULL)
{
@ -195,7 +195,7 @@ const BYTE *FFlatTexture::GetPixels ()
void FFlatTexture::MakeTexture ()
{
FWadLump lump = Wads.OpenLumpNum (SourceLump);
Pixels = new BYTE[Width*Height];
Pixels = new uint8_t[Width*Height];
long numread = lump.Read (Pixels, Width*Height);
if (numread < Width*Height)
{