From 146b5d2d066e06b255fa0095da1dafe25f0ac695 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Thu, 22 Sep 2016 09:06:21 +0200 Subject: [PATCH] - use 'override' qualifier on renderer interface. Bad things can happen if these get changed in ZDoom without adapting to the change so better let the compiler handle this automatically. --- src/gl/scene/gl_scene.cpp | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/gl/scene/gl_scene.cpp b/src/gl/scene/gl_scene.cpp index ccceeac5f..cca452800 100644 --- a/src/gl/scene/gl_scene.cpp +++ b/src/gl/scene/gl_scene.cpp @@ -979,25 +979,25 @@ void FGLRenderer::WriteSavePic (player_t *player, FILE *file, int width, int hei struct FGLInterface : public FRenderer { - bool UsesColormap() const; + bool UsesColormap() const override; void PrecacheTexture(FTexture *tex, int cache); void PrecacheSprite(FTexture *tex, SpriteHits &hits); - void Precache(BYTE *texhitlist, TMap &actorhitlist); - void RenderView(player_t *player); - void WriteSavePic (player_t *player, FILE *file, int width, int height); - void StateChanged(AActor *actor); - void StartSerialize(FArchive &arc); - void EndSerialize(FArchive &arc); - void RenderTextureView (FCanvasTexture *self, AActor *viewpoint, int fov); - sector_t *FakeFlat(sector_t *sec, sector_t *tempsec, int *floorlightlevel, int *ceilinglightlevel, bool back); - void SetFogParams(int _fogdensity, PalEntry _outsidefogcolor, int _outsidefogdensity, int _skyfog); - void PreprocessLevel(); - void CleanLevelData(); - bool RequireGLNodes(); + void Precache(BYTE *texhitlist, TMap &actorhitlist) override; + void RenderView(player_t *player) override; + void WriteSavePic (player_t *player, FILE *file, int width, int height) override; + void StateChanged(AActor *actor) override; + void StartSerialize(FArchive &arc) override; + void EndSerialize(FArchive &arc) override; + void RenderTextureView (FCanvasTexture *self, AActor *viewpoint, int fov) override; + sector_t *FakeFlat(sector_t *sec, sector_t *tempsec, int *floorlightlevel, int *ceilinglightlevel, bool back) override; + void SetFogParams(int _fogdensity, PalEntry _outsidefogcolor, int _outsidefogdensity, int _skyfog) override; + void PreprocessLevel() override; + void CleanLevelData() override; + bool RequireGLNodes() override; - int GetMaxViewPitch(bool down); - void ClearBuffer(int color); - void Init(); + int GetMaxViewPitch(bool down) override; + void ClearBuffer(int color) override; + void Init() override; }; //===========================================================================