@@ -64,68 +64,68 @@ class GUIEditDisplay : public Display
6464public:
6565
6666 GUIEditDisplay ( void );
67- virtual ~GUIEditDisplay ( void );
67+ virtual ~GUIEditDisplay ( void ) override ;
6868
69- virtual void draw ( void ) { };
69+ virtual void draw ( void ) override { };
7070
7171 // / draw a line on the display in pixel coordinates with the specified color
7272 virtual void drawLine ( Int startX, Int startY, Int endX, Int endY,
73- Real lineWidth, UnsignedInt lineColor );
73+ Real lineWidth, UnsignedInt lineColor ) override ;
7474 virtual void drawLine ( Int startX, Int startY, Int endX, Int endY,
75- Real lineWidth, UnsignedInt lineColor1, UnsignedInt lineColor2 ) { }
75+ Real lineWidth, UnsignedInt lineColor1, UnsignedInt lineColor2 ) override { }
7676 // / draw a rect border on the display in pixel coordinates with the specified color
7777 virtual void drawOpenRect ( Int startX, Int startY, Int width, Int height,
78- Real lineWidth, UnsignedInt lineColor );
78+ Real lineWidth, UnsignedInt lineColor ) override ;
7979 // / draw a filled rect on the display in pixel coords with the specified color
8080 virtual void drawFillRect ( Int startX, Int startY, Int width, Int height,
81- UnsignedInt color );
81+ UnsignedInt color ) override ;
8282
8383 // / Draw a percentage of a rectangle, much like a clock
84- virtual void drawRectClock (Int startX, Int startY, Int width, Int height, Int percent, UnsignedInt color) { }
85- virtual void drawRemainingRectClock (Int startX, Int startY, Int width, Int height, Int percent, UnsignedInt color) { }
84+ virtual void drawRectClock (Int startX, Int startY, Int width, Int height, Int percent, UnsignedInt color) override { }
85+ virtual void drawRemainingRectClock (Int startX, Int startY, Int width, Int height, Int percent, UnsignedInt color) override { }
8686
8787 // / draw an image fit within the screen coordinates
8888 virtual void drawImage ( const Image *image, Int startX, Int startY,
89- Int endX, Int endY, Color color = 0xFFFFFFFF , DrawImageMode mode=DRAW_IMAGE_ALPHA);
89+ Int endX, Int endY, Color color = 0xFFFFFFFF , DrawImageMode mode=DRAW_IMAGE_ALPHA) override ;
9090 // / image clipping support
91- virtual void setClipRegion ( IRegion2D *region );
92- virtual Bool isClippingEnabled ( void );
93- virtual void enableClipping ( Bool onoff );
91+ virtual void setClipRegion ( IRegion2D *region ) override ;
92+ virtual Bool isClippingEnabled ( void ) override ;
93+ virtual void enableClipping ( Bool onoff ) override ;
9494
9595 // These are stub functions to allow compilation:
9696
9797 // / Create a video buffer that can be used for this display
98- virtual VideoBuffer* createVideoBuffer ( void ) { return nullptr ; }
98+ virtual VideoBuffer* createVideoBuffer ( void ) override { return nullptr ; }
9999
100100 // / draw a video buffer fit within the screen coordinates
101- virtual void drawScaledVideoBuffer ( VideoBuffer *buffer, VideoStreamInterface *stream ) { }
101+ virtual void drawScaledVideoBuffer ( VideoBuffer *buffer, VideoStreamInterface *stream ) override { }
102102 virtual void drawVideoBuffer ( VideoBuffer *buffer, Int startX, Int startY,
103- Int endX, Int endY ) { }
104- virtual void takeScreenShot (void ){ }
105- virtual void toggleMovieCapture (void ) {}
103+ Int endX, Int endY ) override { }
104+ virtual void takeScreenShot (void ) override { }
105+ virtual void toggleMovieCapture (void ) override {}
106106
107107 // methods that we need to stub
108- virtual void setTimeOfDay ( TimeOfDay tod ) {}
108+ virtual void setTimeOfDay ( TimeOfDay tod ) override {}
109109 virtual void createLightPulse ( const Coord3D *pos, const RGBColor *color, Real innerRadius, Real attenuationWidth,
110- UnsignedInt increaseFrameTime, UnsignedInt decayFrameTime ) {}
111- virtual void setShroudLevel (Int x, Int y, CellShroudStatus setting) {}
112- void setBorderShroudLevel (UnsignedByte level){}
113- virtual void clearShroud () {}
114- virtual void preloadModelAssets ( AsciiString model ) {}
115- virtual void preloadTextureAssets ( AsciiString texture ) {}
116- virtual void toggleLetterBox (void ) {}
117- virtual void enableLetterBox (Bool enable) {}
110+ UnsignedInt increaseFrameTime, UnsignedInt decayFrameTime ) override {}
111+ virtual void setShroudLevel (Int x, Int y, CellShroudStatus setting) override {}
112+ virtual void setBorderShroudLevel (UnsignedByte level) override {}
113+ virtual void clearShroud () override {}
114+ virtual void preloadModelAssets ( AsciiString model ) override {}
115+ virtual void preloadTextureAssets ( AsciiString texture ) override {}
116+ virtual void toggleLetterBox (void ) override {}
117+ virtual void enableLetterBox (Bool enable) override {}
118118#if defined(RTS_DEBUG)
119119 virtual void dumpModelAssets (const char *path) {}
120120#endif
121- virtual void doSmartAssetPurgeAndPreload (const char * usageFileName) {}
121+ virtual void doSmartAssetPurgeAndPreload (const char * usageFileName) override {}
122122#if defined(RTS_DEBUG)
123123 virtual void dumpAssetUsage (const char * mapname) {}
124124#endif
125125
126- virtual Real getAverageFPS (void ) { return 0 ; }
127- virtual Real getCurrentFPS (void ) { return 0 ; }
128- virtual Int getLastFrameDrawCalls ( void ) { return 0 ; }
126+ virtual Real getAverageFPS (void ) override { return 0 ; }
127+ virtual Real getCurrentFPS (void ) override { return 0 ; }
128+ virtual Int getLastFrameDrawCalls ( void ) override { return 0 ; }
129129
130130protected:
131131
0 commit comments