diff --git a/src/am_map.cpp b/src/am_map.cpp index c6e6ba19ba..2f6c04c6d8 100644 --- a/src/am_map.cpp +++ b/src/am_map.cpp @@ -3088,7 +3088,7 @@ static void DrawMarker (FTexture *tex, double x, double y, int yadjust, DTA_TranslationIndex, translation, DTA_Alpha, alpha, DTA_FillColor, fillcolor, - DTA_RenderStyle, uint32_t(renderstyle), + DTA_RenderStyle, renderstyle.AsDWORD, TAG_DONE); } diff --git a/src/r_data/renderstyle.h b/src/r_data/renderstyle.h index 68bc9a2421..21c41278a5 100644 --- a/src/r_data/renderstyle.h +++ b/src/r_data/renderstyle.h @@ -133,7 +133,6 @@ union FRenderStyle uint32_t AsDWORD; inline FRenderStyle &operator= (ERenderStyle legacy); - operator uint32_t() const { return AsDWORD; } bool operator==(const FRenderStyle &o) const { return AsDWORD == o.AsDWORD; } void CheckFuzz(); bool IsVisible(double alpha) const throw(); diff --git a/src/textures/automaptexture.cpp b/src/textures/automaptexture.cpp index 27080669ee..c07eded6ed 100644 --- a/src/textures/automaptexture.cpp +++ b/src/textures/automaptexture.cpp @@ -51,7 +51,6 @@ class FAutomapTexture : public FWorldTexture { public: FAutomapTexture(int lumpnum); - ~FAutomapTexture (); uint8_t *MakeTexture (FRenderStyle style); }; diff --git a/src/textures/jpegtexture.cpp b/src/textures/jpegtexture.cpp index abf1e34ec4..93aac09ca0 100644 --- a/src/textures/jpegtexture.cpp +++ b/src/textures/jpegtexture.cpp @@ -183,7 +183,6 @@ class FJPEGTexture : public FWorldTexture { public: FJPEGTexture (int lumpnum, int width, int height); - ~FJPEGTexture (); FTextureFormat GetFormat () override; int CopyTrueColorPixels(FBitmap *bmp, int x, int y, int rotate, FCopyInfo *inf = NULL) override; diff --git a/src/textures/pcxtexture.cpp b/src/textures/pcxtexture.cpp index efe12e3c21..f5635c7a38 100644 --- a/src/textures/pcxtexture.cpp +++ b/src/textures/pcxtexture.cpp @@ -85,7 +85,6 @@ class FPCXTexture : public FWorldTexture { public: FPCXTexture (int lumpnum, PCXHeader &); - ~FPCXTexture (); FTextureFormat GetFormat () override; diff --git a/src/textures/rawpagetexture.cpp b/src/textures/rawpagetexture.cpp index 7e9268c6e4..adf8abffff 100644 --- a/src/textures/rawpagetexture.cpp +++ b/src/textures/rawpagetexture.cpp @@ -50,7 +50,6 @@ class FRawPageTexture : public FWorldTexture { public: FRawPageTexture (int lumpnum); - ~FRawPageTexture (); uint8_t *MakeTexture (FRenderStyle style) override; }; diff --git a/src/textures/shadertexture.cpp b/src/textures/shadertexture.cpp index 2834c93189..67d4db683a 100644 --- a/src/textures/shadertexture.cpp +++ b/src/textures/shadertexture.cpp @@ -134,6 +134,7 @@ public: 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); + return 0; } bool UseBasePalette() override diff --git a/src/v_palette.cpp b/src/v_palette.cpp index 436fe84dcd..af4aae4fba 100644 --- a/src/v_palette.cpp +++ b/src/v_palette.cpp @@ -374,9 +374,7 @@ static bool FixBuildPalette (uint8_t *opal, int lump, bool blood) void InitPalette () { uint8_t pal[768]; - bool usingBuild = false; - int lump; - + ReadPalette(Wads.CheckNumForName("PLAYPAL"), pal); GPalette.SetPalette (pal);