- made it compile again.

This commit is contained in:
Christoph Oelckers 2018-03-18 13:47:40 +01:00
parent de8db297a6
commit 94eadb1a8c
8 changed files with 3 additions and 9 deletions

View file

@ -3088,7 +3088,7 @@ static void DrawMarker (FTexture *tex, double x, double y, int yadjust,
DTA_TranslationIndex, translation, DTA_TranslationIndex, translation,
DTA_Alpha, alpha, DTA_Alpha, alpha,
DTA_FillColor, fillcolor, DTA_FillColor, fillcolor,
DTA_RenderStyle, uint32_t(renderstyle), DTA_RenderStyle, renderstyle.AsDWORD,
TAG_DONE); TAG_DONE);
} }

View file

@ -133,7 +133,6 @@ union FRenderStyle
uint32_t AsDWORD; uint32_t AsDWORD;
inline FRenderStyle &operator= (ERenderStyle legacy); inline FRenderStyle &operator= (ERenderStyle legacy);
operator uint32_t() const { return AsDWORD; }
bool operator==(const FRenderStyle &o) const { return AsDWORD == o.AsDWORD; } bool operator==(const FRenderStyle &o) const { return AsDWORD == o.AsDWORD; }
void CheckFuzz(); void CheckFuzz();
bool IsVisible(double alpha) const throw(); bool IsVisible(double alpha) const throw();

View file

@ -51,7 +51,6 @@ class FAutomapTexture : public FWorldTexture
{ {
public: public:
FAutomapTexture(int lumpnum); FAutomapTexture(int lumpnum);
~FAutomapTexture ();
uint8_t *MakeTexture (FRenderStyle style); uint8_t *MakeTexture (FRenderStyle style);
}; };

View file

@ -183,7 +183,6 @@ class FJPEGTexture : public FWorldTexture
{ {
public: public:
FJPEGTexture (int lumpnum, int width, int height); FJPEGTexture (int lumpnum, int width, int height);
~FJPEGTexture ();
FTextureFormat GetFormat () override; FTextureFormat GetFormat () override;
int CopyTrueColorPixels(FBitmap *bmp, int x, int y, int rotate, FCopyInfo *inf = NULL) override; int CopyTrueColorPixels(FBitmap *bmp, int x, int y, int rotate, FCopyInfo *inf = NULL) override;

View file

@ -85,7 +85,6 @@ class FPCXTexture : public FWorldTexture
{ {
public: public:
FPCXTexture (int lumpnum, PCXHeader &); FPCXTexture (int lumpnum, PCXHeader &);
~FPCXTexture ();
FTextureFormat GetFormat () override; FTextureFormat GetFormat () override;

View file

@ -50,7 +50,6 @@ class FRawPageTexture : public FWorldTexture
{ {
public: public:
FRawPageTexture (int lumpnum); FRawPageTexture (int lumpnum);
~FRawPageTexture ();
uint8_t *MakeTexture (FRenderStyle style) override; uint8_t *MakeTexture (FRenderStyle style) override;
}; };

View file

@ -134,6 +134,7 @@ public:
int CopyTrueColorPixels(FBitmap *bmp, int x, int y, int rotate, FCopyInfo *inf = NULL) override int CopyTrueColorPixels(FBitmap *bmp, int x, int y, int rotate, FCopyInfo *inf = NULL) override
{ {
bmp->CopyPixelData(x, y, Pixels, Width, Height, Height, 1, rotate, translationtables[TRANSLATION_Standard][8]->Palette, inf); bmp->CopyPixelData(x, y, Pixels, Width, Height, Height, 1, rotate, translationtables[TRANSLATION_Standard][8]->Palette, inf);
return 0;
} }
bool UseBasePalette() override bool UseBasePalette() override

View file

@ -374,9 +374,7 @@ static bool FixBuildPalette (uint8_t *opal, int lump, bool blood)
void InitPalette () void InitPalette ()
{ {
uint8_t pal[768]; uint8_t pal[768];
bool usingBuild = false;
int lump;
ReadPalette(Wads.CheckNumForName("PLAYPAL"), pal); ReadPalette(Wads.CheckNumForName("PLAYPAL"), pal);
GPalette.SetPalette (pal); GPalette.SetPalette (pal);