aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorEinar Johan Trøan Sømåen2013-01-26 17:29:38 +0100
committerEinar Johan Trøan Sømåen2013-01-26 17:29:38 +0100
commit8469b866cf9cdc2eb493f65bf34724e1ac25b6b5 (patch)
treeeb2003a6db0a43f48cfa7e628aea79d86c06dd36 /engines
parente0c5a78a2662fbc739e5ee68f6d37bbb00bfe9a9 (diff)
downloadscummvm-rg350-8469b866cf9cdc2eb493f65bf34724e1ac25b6b5.tar.gz
scummvm-rg350-8469b866cf9cdc2eb493f65bf34724e1ac25b6b5.tar.bz2
scummvm-rg350-8469b866cf9cdc2eb493f65bf34724e1ac25b6b5.zip
WINTERMUTE: Add override-tags to most of the overriden functions in base/gfx.
Diffstat (limited to 'engines')
-rw-r--r--engines/wintermute/base/gfx/osystem/base_render_osystem.h40
-rw-r--r--engines/wintermute/base/gfx/osystem/base_surface_osystem.h32
2 files changed, 36 insertions, 36 deletions
diff --git a/engines/wintermute/base/gfx/osystem/base_render_osystem.h b/engines/wintermute/base/gfx/osystem/base_render_osystem.h
index 2c89037183..5917551c64 100644
--- a/engines/wintermute/base/gfx/osystem/base_render_osystem.h
+++ b/engines/wintermute/base/gfx/osystem/base_render_osystem.h
@@ -44,17 +44,17 @@ public:
Common::String getName() const;
- bool initRenderer(int width, int height, bool windowed);
- bool flip();
+ bool initRenderer(int width, int height, bool windowed) override;
+ bool flip() override;
virtual bool indicatorFlip();
- bool fill(byte r, byte g, byte b, Common::Rect *rect = NULL);
- Graphics::PixelFormat getPixelFormat() const;
- void fade(uint16 alpha);
- void fadeToColor(byte r, byte g, byte b, byte a, Common::Rect *rect = NULL);
+ bool fill(byte r, byte g, byte b, Common::Rect *rect = NULL) override;
+ Graphics::PixelFormat getPixelFormat() const override;
+ void fade(uint16 alpha) override;
+ void fadeToColor(byte r, byte g, byte b, byte a, Common::Rect *rect = NULL) override;
- bool drawLine(int x1, int y1, int x2, int y2, uint32 color);
+ bool drawLine(int x1, int y1, int x2, int y2, uint32 color) override;
- BaseImage *takeScreenshot();
+ BaseImage *takeScreenshot() override;
void setAlphaMod(byte alpha);
void setColorMod(byte r, byte g, byte b);
@@ -62,29 +62,29 @@ public:
void invalidateTicketsFromSurface(BaseSurfaceOSystem *surf);
void drawFromTicket(RenderTicket *renderTicket);
- bool setViewport(int left, int top, int right, int bottom);
- bool setViewport(Rect32 *rect) { return BaseRenderer::setViewport(rect); }
- Rect32 getViewPort();
+ bool setViewport(int left, int top, int right, int bottom) override;
+ bool setViewport(Rect32 *rect) override { return BaseRenderer::setViewport(rect); }
+ Rect32 getViewPort() override;
void modTargetRect(Common::Rect *rect);
- void pointFromScreen(Point32 *point);
+ void pointFromScreen(Point32 *point) ;
void pointToScreen(Point32 *point);
- void dumpData(const char *filename);
+ void dumpData(const char *filename) override;
- float getScaleRatioX() const {
+ float getScaleRatioX() const override {
return _ratioX;
}
- float getScaleRatioY() const {
+ float getScaleRatioY() const override {
return _ratioY;
}
- virtual bool startSpriteBatch();
- virtual bool endSpriteBatch();
+ virtual bool startSpriteBatch() override;
+ virtual bool endSpriteBatch() override;
void endSaveLoad();
- void drawSurface(BaseSurfaceOSystem *owner, const Graphics::Surface *surf, Common::Rect *srcRect, Common::Rect *dstRect, bool mirrorX, bool mirrorY, bool disableAlpha = false);
+ void drawSurface(BaseSurfaceOSystem *owner, const Graphics::Surface *surf, Common::Rect *srcRect, Common::Rect *dstRect, bool mirrorX, bool mirrorY, bool disableAlpha = false) ;
void repeatLastDraw(int offsetX, int offsetY, int numTimesX, int numTimesY);
- BaseSurface *createSurface();
+ BaseSurface *createSurface() override;
private:
- void addDirtyRect(const Common::Rect &rect);
+ void addDirtyRect(const Common::Rect &rect) ;
void drawTickets();
// Non-dirty-rects:
void drawFromSurface(RenderTicket *ticket);
diff --git a/engines/wintermute/base/gfx/osystem/base_surface_osystem.h b/engines/wintermute/base/gfx/osystem/base_surface_osystem.h
index 5bbfa27179..9091ec65b1 100644
--- a/engines/wintermute/base/gfx/osystem/base_surface_osystem.h
+++ b/engines/wintermute/base/gfx/osystem/base_surface_osystem.h
@@ -41,28 +41,28 @@ public:
BaseSurfaceOSystem(BaseGame *inGame);
~BaseSurfaceOSystem();
- bool create(const Common::String &filename, bool defaultCK, byte ckRed, byte ckGreen, byte ckBlue, int lifeTime = -1, bool keepLoaded = false);
- bool create(int width, int height);
+ bool create(const Common::String &filename, bool defaultCK, byte ckRed, byte ckGreen, byte ckBlue, int lifeTime = -1, bool keepLoaded = false) override;
+ bool create(int width, int height) override;
- bool isTransparentAt(int x, int y);
- bool isTransparentAtLite(int x, int y);
+ bool isTransparentAt(int x, int y) override;
+ bool isTransparentAtLite(int x, int y) override;
- bool startPixelOp();
- bool endPixelOp();
+ bool startPixelOp() override;
+ bool endPixelOp() override;
- bool displayTransZoom(int x, int y, Rect32 rect, float zoomX, float zoomY, uint32 alpha = 0xFFFFFFFF, TSpriteBlendMode blendMode = BLEND_NORMAL, bool mirrorX = false, bool mirrorY = false);
- bool displayTrans(int x, int y, Rect32 rect, uint32 alpha = 0xFFFFFFFF, TSpriteBlendMode blendMode = BLEND_NORMAL, bool mirrorX = false, bool mirrorY = false);
- bool displayTransOffset(int x, int y, Rect32 rect, uint32 alpha = 0xFFFFFFFF, TSpriteBlendMode blendMode = BLEND_NORMAL, bool mirrorX = false, bool mirrorY = false, int offsetX = 0, int offsetY = 0);
- bool display(int x, int y, Rect32 rect, TSpriteBlendMode blendMode = BLEND_NORMAL, bool mirrorX = false, bool mirrorY = false);
- bool displayZoom(int x, int y, Rect32 rect, float zoomX, float zoomY, uint32 alpha = 0xFFFFFFFF, bool transparent = false, TSpriteBlendMode blendMode = BLEND_NORMAL, bool mirrorX = false, bool mirrorY = false);
- bool displayTransform(int x, int y, int hotX, int hotY, Rect32 Rect, float zoomX, float zoomY, uint32 alpha, float rotate, TSpriteBlendMode blendMode = BLEND_NORMAL, bool mirrorX = false, bool mirrorY = false);
- bool repeatLastDisplayOp(int offsetX, int offsetY, int numTimesX, int numTimesY);
- virtual bool putSurface(const Graphics::Surface &surface, bool hasAlpha = false);
+ bool displayTransZoom(int x, int y, Rect32 rect, float zoomX, float zoomY, uint32 alpha = 0xFFFFFFFF, TSpriteBlendMode blendMode = BLEND_NORMAL, bool mirrorX = false, bool mirrorY = false) override;
+ bool displayTrans(int x, int y, Rect32 rect, uint32 alpha = 0xFFFFFFFF, TSpriteBlendMode blendMode = BLEND_NORMAL, bool mirrorX = false, bool mirrorY = false) override;
+ bool displayTransOffset(int x, int y, Rect32 rect, uint32 alpha = 0xFFFFFFFF, TSpriteBlendMode blendMode = BLEND_NORMAL, bool mirrorX = false, bool mirrorY = false, int offsetX = 0, int offsetY = 0) override;
+ bool display(int x, int y, Rect32 rect, TSpriteBlendMode blendMode = BLEND_NORMAL, bool mirrorX = false, bool mirrorY = false) override;
+ bool displayZoom(int x, int y, Rect32 rect, float zoomX, float zoomY, uint32 alpha = 0xFFFFFFFF, bool transparent = false, TSpriteBlendMode blendMode = BLEND_NORMAL, bool mirrorX = false, bool mirrorY = false) override;
+ bool displayTransform(int x, int y, int hotX, int hotY, Rect32 Rect, float zoomX, float zoomY, uint32 alpha, float rotate, TSpriteBlendMode blendMode = BLEND_NORMAL, bool mirrorX = false, bool mirrorY = false) override;
+ bool repeatLastDisplayOp(int offsetX, int offsetY, int numTimesX, int numTimesY) override;
+ virtual bool putSurface(const Graphics::Surface &surface, bool hasAlpha = false) override;
/* static unsigned DLL_CALLCONV ReadProc(void *buffer, unsigned size, unsigned count, fi_handle handle);
static int DLL_CALLCONV SeekProc(fi_handle handle, long offset, int origin);
static long DLL_CALLCONV TellProc(fi_handle handle);*/
- virtual int getWidth() {
+ virtual int getWidth() override {
if (!_loaded) {
finishLoad();
}
@@ -71,7 +71,7 @@ public:
}
return _width;
}
- virtual int getHeight() {
+ virtual int getHeight() override {
if (!_loaded) {
finishLoad();
}