[Scummvm-git-logs] scummvm master -> de6bde08a7803c9a6115cd0c9d078ebbb3c2f06f

sev- sev at scummvm.org
Fri Jan 31 14:46:45 UTC 2020 

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
de6bde08a7 WINTERMUTE: Added override keywords


Commit: de6bde08a7803c9a6115cd0c9d078ebbb3c2f06f
    https://github.com/scummvm/scummvm/commit/de6bde08a7803c9a6115cd0c9d078ebbb3c2f06f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-31T15:46:23+01:00

Commit Message:
WINTERMUTE: Added override keywords

Changed paths:
    engines/wintermute/ad/ad_actor.h
    engines/wintermute/ad/ad_entity.h
    engines/wintermute/ad/ad_game.h
    engines/wintermute/ad/ad_inventory_box.h
    engines/wintermute/ad/ad_item.h
    engines/wintermute/ad/ad_response_box.h
    engines/wintermute/ad/ad_scene.h
    engines/wintermute/ad/ad_waypoint_group.h
    engines/wintermute/base/base.h
    engines/wintermute/base/base_fader.h
    engines/wintermute/base/base_frame.h
    engines/wintermute/base/base_game.h
    engines/wintermute/base/base_keyboard_state.h
    engines/wintermute/base/base_object.h
    engines/wintermute/base/base_region.h
    engines/wintermute/base/base_script_holder.h
    engines/wintermute/base/base_sprite.h
    engines/wintermute/base/base_sub_frame.h
    engines/wintermute/base/font/base_font_truetype.h
    engines/wintermute/base/gfx/osystem/base_render_osystem.h
    engines/wintermute/base/gfx/osystem/base_surface_osystem.h
    engines/wintermute/base/particles/part_emitter.h
    engines/wintermute/base/scriptables/script_ext_array.h
    engines/wintermute/base/scriptables/script_ext_date.h
    engines/wintermute/base/scriptables/script_ext_directory.h
    engines/wintermute/base/scriptables/script_ext_file.h
    engines/wintermute/base/scriptables/script_ext_math.h
    engines/wintermute/base/scriptables/script_ext_mem_buffer.h
    engines/wintermute/base/scriptables/script_ext_string.h
    engines/wintermute/base/scriptables/script_value.h
    engines/wintermute/debugger/debugger_controller.h
    engines/wintermute/detection.cpp
    engines/wintermute/persistent.h
    engines/wintermute/ui/ui_button.h
    engines/wintermute/ui/ui_edit.h
    engines/wintermute/ui/ui_entity.h
    engines/wintermute/ui/ui_object.h
    engines/wintermute/ui/ui_text.h
    engines/wintermute/ui/ui_window.h


diff --git a/engines/wintermute/ad/ad_actor.h b/engines/wintermute/ad/ad_actor.h
index 863a055..90df7e4 100644
--- a/engines/wintermute/ad/ad_actor.h
+++ b/engines/wintermute/ad/ad_actor.h
@@ -48,11 +48,11 @@ public:
 	TDirection angleToDirection(int angle);
 	DECLARE_PERSISTENT(AdActor, AdTalkHolder)
 	virtual int32 getHeight() override;
-	BaseSprite *getTalkStance(const char *stance);
+	BaseSprite *getTalkStance(const char *stance) override;
 	virtual void goTo(int x, int y, TDirection afterWalkDir = DI_NONE);
 	BasePoint *_targetPoint;
-	virtual bool update();
-	virtual bool display();
+	virtual bool update() override;
+	virtual bool display() override;
 	virtual void turnTo(TDirection dir);
 	AdActor(BaseGame *inGame/*=nullptr*/);
 	virtual ~AdActor();
@@ -79,7 +79,7 @@ private:
 	Common::String _turnLeftAnimName;
 	Common::String _turnRightAnimName;
 	BaseArray<AdSpriteSet *> _anims;
-	virtual bool playAnim(const char *filename);
+	virtual bool playAnim(const char *filename) override;
 	AdSpriteSet *getAnimByName(const Common::String &animName);
 
 	// scripting interface
diff --git a/engines/wintermute/ad/ad_entity.h b/engines/wintermute/ad/ad_entity.h
index 5407093..7611b96 100644
--- a/engines/wintermute/ad/ad_entity.h
+++ b/engines/wintermute/ad/ad_entity.h
@@ -43,8 +43,8 @@ public:
 	virtual int32 getHeight() override;
 	BaseRegion *_region;
 	virtual bool saveAsText(BaseDynamicBuffer *buffer, int indent) override;
-	virtual bool update();
-	virtual bool display();
+	virtual bool update() override;
+	virtual bool display() override;
 	AdEntity(BaseGame *inGame);
 	virtual ~AdEntity();
 	bool loadFile(const char *filename);
diff --git a/engines/wintermute/ad/ad_game.h b/engines/wintermute/ad/ad_game.h
index 0e5abc9..1594163 100644
--- a/engines/wintermute/ad/ad_game.h
+++ b/engines/wintermute/ad/ad_game.h
@@ -61,7 +61,7 @@ public:
 	bool deleteItem(AdItem *Item);
 	char *_itemsFile;
 	bool _tempDisableSaveState;
-	virtual bool resetContent();
+	virtual bool resetContent() override;
 	bool addItem(AdItem *item);
 	AdItem *getItemByName(const char *name) const;
 
@@ -99,11 +99,11 @@ public:
 	void setPrevSceneFilename(const char *name);
 
 	AdItem *_selectedItem;
-	bool cleanup();
+	bool cleanup() override;
 	DECLARE_PERSISTENT(AdGame, BaseGame)
 
 	void finishSentences();
-	bool showCursor();
+	bool showCursor() override;
 
 	TGameStateEx _stateEx;
 
@@ -119,8 +119,8 @@ public:
 
 	BaseArray<AdObject *> _objects;
 
-	virtual bool loadFile(const char *filename);
-	virtual bool loadBuffer(char *buffer, bool complete = true);
+	virtual bool loadFile(const char *filename) override;
+	virtual bool loadBuffer(char *buffer, bool complete = true) override;
 
 	bool loadItemsFile(const char *filename, bool merge = false);
 	bool loadItemsBuffer(char *buffer, bool merge = false);
diff --git a/engines/wintermute/ad/ad_inventory_box.h b/engines/wintermute/ad/ad_inventory_box.h
index 4673f2e..6405927 100644
--- a/engines/wintermute/ad/ad_inventory_box.h
+++ b/engines/wintermute/ad/ad_inventory_box.h
@@ -41,12 +41,12 @@ public:
 	bool _hideSelected;
 	DECLARE_PERSISTENT(AdInventoryBox, BaseObject)
 	bool _visible;
-	virtual bool display();
+	virtual bool display() override;
 	UIButton *_closeButton;
 	int32 _spacing;
 	int32 _scrollOffset;
 	Rect32 _itemsArea;
-	bool listen(BaseScriptHolder *param1, uint32 param2);
+	bool listen(BaseScriptHolder *param1, uint32 param2) override;
 	UIWindow *_window;
 	AdInventoryBox(BaseGame *inGame);
 	virtual ~AdInventoryBox();
diff --git a/engines/wintermute/ad/ad_item.h b/engines/wintermute/ad/ad_item.h
index 092a645..dcfd1dd 100644
--- a/engines/wintermute/ad/ad_item.h
+++ b/engines/wintermute/ad/ad_item.h
@@ -38,10 +38,10 @@ class AdItem : public AdTalkHolder {
 	using Wintermute::AdObject::display;
 
 public:
-	bool update();
+	bool update() override;
 	DECLARE_PERSISTENT(AdItem, AdTalkHolder)
 	bool display(int x, int y);
-	bool getExtendedFlag(const char *flagName);
+	bool getExtendedFlag(const char *flagName) override;
 	bool _inInventory;
 	bool _cursorCombined;
 	BaseSprite *_spriteHover;
diff --git a/engines/wintermute/ad/ad_response_box.h b/engines/wintermute/ad/ad_response_box.h
index c808a7b..9ef5a62 100644
--- a/engines/wintermute/ad/ad_response_box.h
+++ b/engines/wintermute/ad/ad_response_box.h
@@ -54,7 +54,7 @@ public:
 
 	DECLARE_PERSISTENT(AdResponseBox, BaseObject)
 	ScScript *_waitingScript;
-	virtual bool listen(BaseScriptHolder *param1, uint32 param2);
+	virtual bool listen(BaseScriptHolder *param1, uint32 param2) override;
 	typedef enum {
 		EVENT_PREV,
 		EVENT_NEXT,
@@ -62,7 +62,7 @@ public:
 	} TResponseEvent;
 
 	bool weedResponses();
-	bool display();
+	bool display() override;
 
 	bool createButtons();
 	bool invalidateButtons();
diff --git a/engines/wintermute/ad/ad_scene.h b/engines/wintermute/ad/ad_scene.h
index 71567d2..dfae8f1 100644
--- a/engines/wintermute/ad/ad_scene.h
+++ b/engines/wintermute/ad/ad_scene.h
@@ -109,7 +109,7 @@ public:
 	uint32 _scrollTimeH;
 	uint32 _lastTimeH;
 
-	virtual bool display();
+	virtual bool display() override;
 	uint32 _pfMaxTime;
 	bool initLoop();
 	void pathFinderStep();
@@ -152,7 +152,7 @@ public:
 	BaseArray<AdScaleLevel *> _scaleLevels;
 	BaseArray<AdRotLevel *> _rotLevels;
 
-	virtual bool restoreDeviceObjects();
+	virtual bool restoreDeviceObjects() override;
 	int getPointsDist(const BasePoint &p1, const BasePoint &p2, BaseObject *requester = nullptr);
 
 	// scripting interface
diff --git a/engines/wintermute/ad/ad_waypoint_group.h b/engines/wintermute/ad/ad_waypoint_group.h
index 32d5e9b..8eb6f69 100644
--- a/engines/wintermute/ad/ad_waypoint_group.h
+++ b/engines/wintermute/ad/ad_waypoint_group.h
@@ -47,8 +47,8 @@ public:
 	bool _active;
 	BaseArray<BasePoint *> _points;
 
-	virtual ScValue *scGetProperty(const Common::String &name);
-	virtual bool scSetProperty(const char *name, ScValue *value);
+	virtual ScValue *scGetProperty(const Common::String &name) override;
+	virtual bool scSetProperty(const char *name, ScValue *value) override;
 private:
 	int32 _editorSelectedPoint;
 	float _lastMimicScale;
diff --git a/engines/wintermute/base/base.h b/engines/wintermute/base/base.h
index e6ed7c5..5eabaff 100644
--- a/engines/wintermute/base/base.h
+++ b/engines/wintermute/base/base.h
@@ -39,6 +39,7 @@ namespace Wintermute {
 
 class BaseGame;
 class BaseDynamicBuffer;
+class BasePersistenceManager;
 
 class BaseClass {
 public:
@@ -52,6 +53,9 @@ public:
 	BaseClass(BaseGame *GameOwner);
 	virtual ~BaseClass();
 	BaseGame *_gameRef;
+
+	virtual const char *getClassName() { return ""; }
+	virtual bool persist(BasePersistenceManager *persistMgr) { return true; }
 protected:
 	Common::HashMap<Common::String, Common::String> _editorProps;
 	Common::HashMap<Common::String, Common::String>::iterator _editorPropsIter;
diff --git a/engines/wintermute/base/base_fader.h b/engines/wintermute/base/base_fader.h
index f742954..8c20b19 100644
--- a/engines/wintermute/base/base_fader.h
+++ b/engines/wintermute/base/base_fader.h
@@ -40,8 +40,8 @@ public:
 	bool fadeOut(uint32 targetColor, uint32 duration, bool system = false);
 	bool fadeIn(uint32 sourceColor, uint32 duration, bool system = false);
 	bool deactivate();
-	bool display();
-	bool update();
+	bool display() override;
+	bool update() override;
 	DECLARE_PERSISTENT(BaseFader, BaseObject)
 	BaseFader(BaseGame *inGame);
 	virtual ~BaseFader();
diff --git a/engines/wintermute/base/base_frame.h b/engines/wintermute/base/base_frame.h
index 8d261c9..833c52a 100644
--- a/engines/wintermute/base/base_frame.h
+++ b/engines/wintermute/base/base_frame.h
@@ -47,7 +47,7 @@ public:
 	DECLARE_PERSISTENT(BaseFrame, BaseScriptable)
 
 	bool getBoundingRect(Rect32 *rect, int x, int y, float scaleX = 100, float scaleY = 100);
-	bool saveAsText(BaseDynamicBuffer *buffer, int indent);
+	bool saveAsText(BaseDynamicBuffer *buffer, int indent) override;
 	int32 _moveY;
 	int32 _moveX;
 	uint32 _delay;
diff --git a/engines/wintermute/base/base_game.h b/engines/wintermute/base/base_game.h
index b9ce201..9dd8fe0 100644
--- a/engines/wintermute/base/base_game.h
+++ b/engines/wintermute/base/base_game.h
@@ -195,11 +195,11 @@ public:
 
 	bool getIsLoading() const { return _loading; }
 
-	virtual bool handleMouseWheel(int32 delta);
+	virtual bool handleMouseWheel(int32 delta) override;
 	bool _quitting;
 	virtual bool getVersion(byte *verMajor, byte *verMinor, byte *extMajor, byte *extMinor) const;
 
-	virtual bool handleKeypress(Common::Event *event, bool printable = false);
+	virtual bool handleKeypress(Common::Event *event, bool printable = false) override;
 	virtual void handleKeyRelease(Common::Event *event);
 
 	bool unfreeze();
@@ -219,7 +219,7 @@ public:
 	bool loadGame(uint32 slot);
 	bool loadGame(const char *filename);
 	bool saveGame(int32 slot, const char *desc, bool quickSave = false);
-	virtual bool showCursor();
+	virtual bool showCursor() override;
 
 	BaseObject *_activeObject;
 
@@ -295,8 +295,8 @@ private:
 
 	int32 _soundBufferSizeSec;
 
-	virtual bool invalidateDeviceObjects();
-	virtual bool restoreDeviceObjects();
+	virtual bool invalidateDeviceObjects() override;
+	virtual bool restoreDeviceObjects() override;
 
 	// TODO: This can probably be removed completely:
 	bool _saveDirChecked;
diff --git a/engines/wintermute/base/base_keyboard_state.h b/engines/wintermute/base/base_keyboard_state.h
index b2f7f78..8a3a8f6 100644
--- a/engines/wintermute/base/base_keyboard_state.h
+++ b/engines/wintermute/base/base_keyboard_state.h
@@ -57,10 +57,10 @@ public:
 	bool isCurrentPrintable() const;
 
 	// scripting interface
-	virtual ScValue *scGetProperty(const Common::String &name);
-	virtual bool scSetProperty(const char *name, ScValue *value);
-	virtual bool scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, const char *name);
-	virtual const char *scToString();
+	virtual ScValue *scGetProperty(const Common::String &name) override;
+	virtual bool scSetProperty(const char *name, ScValue *value) override;
+	virtual bool scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, const char *name) override;
+	virtual const char *scToString() override;
 
 private:
 	void init();
diff --git a/engines/wintermute/base/base_object.h b/engines/wintermute/base/base_object.h
index 8ca8ffc..1f6cc56 100644
--- a/engines/wintermute/base/base_object.h
+++ b/engines/wintermute/base/base_object.h
@@ -105,8 +105,8 @@ public:
 	BaseSprite *_cursor;
 	bool _sharedCursors;
 	BaseSprite *_activeCursor;
-	virtual bool saveAsText(BaseDynamicBuffer *buffer, int indent);
-	virtual bool listen(BaseScriptHolder *param1, uint32 param2);
+	virtual bool saveAsText(BaseDynamicBuffer *buffer, int indent) override;
+	virtual bool listen(BaseScriptHolder *param1, uint32 param2) override;
 
 	bool _movable;
 	bool _zoomable;
diff --git a/engines/wintermute/base/base_region.h b/engines/wintermute/base/base_region.h
index 4cb5dd8..e019bb8 100644
--- a/engines/wintermute/base/base_region.h
+++ b/engines/wintermute/base/base_region.h
@@ -51,7 +51,7 @@ public:
 	bool loadBuffer(char *buffer, bool complete = true);
 	Rect32 _rect;
 	BaseArray<BasePoint *> _points;
-	virtual bool saveAsText(BaseDynamicBuffer *buffer, int indent) { return saveAsText(buffer, indent, nullptr); }
+	virtual bool saveAsText(BaseDynamicBuffer *buffer, int indent) override { return saveAsText(buffer, indent, nullptr); }
 	virtual bool saveAsText(BaseDynamicBuffer *buffer, int indent, const char *nameOverride);
 
 	// scripting interface
diff --git a/engines/wintermute/base/base_script_holder.h b/engines/wintermute/base/base_script_holder.h
index 9b3bf9e..43b8393 100644
--- a/engines/wintermute/base/base_script_holder.h
+++ b/engines/wintermute/base/base_script_holder.h
@@ -41,14 +41,14 @@ public:
 
 	BaseScriptHolder(BaseGame *inGame);
 	virtual ~BaseScriptHolder();
-	virtual ScScript *invokeMethodThread(const char *methodName);
+	virtual ScScript *invokeMethodThread(const char *methodName) override;
 	virtual void makeFreezable(bool freezable);
 	bool canHandleEvent(const char *eventName) const;
-	virtual bool canHandleMethod(const char *eventMethod) const;
+	virtual bool canHandleMethod(const char *eventMethod) const override;
 	bool cleanup();
 	bool removeScript(ScScript *script);
 	bool addScript(const char *filename);
-	virtual bool saveAsText(BaseDynamicBuffer *buffer, int indent);
+	virtual bool saveAsText(BaseDynamicBuffer *buffer, int indent) override;
 	virtual bool listen(BaseScriptHolder *param1, uint32 param2);
 	bool applyEvent(const char *eventName, bool unbreakable = false);
 	void setFilename(const char *filename);
diff --git a/engines/wintermute/base/base_sprite.h b/engines/wintermute/base/base_sprite.h
index 2313b7b..6f95855 100644
--- a/engines/wintermute/base/base_sprite.h
+++ b/engines/wintermute/base/base_sprite.h
@@ -62,7 +62,7 @@ public:
 	BaseSprite(BaseGame *inGame, BaseObject *owner = nullptr);
 	virtual ~BaseSprite();
 	BaseArray<BaseFrame *> _frames;
-	bool saveAsText(BaseDynamicBuffer *buffer, int indent);
+	bool saveAsText(BaseDynamicBuffer *buffer, int indent) override;
 
 	// scripting interface
 	virtual ScValue *scGetProperty(const Common::String &name) override;
diff --git a/engines/wintermute/base/base_sub_frame.h b/engines/wintermute/base/base_sub_frame.h
index 0fd38f9..228b799 100644
--- a/engines/wintermute/base/base_sub_frame.h
+++ b/engines/wintermute/base/base_sub_frame.h
@@ -47,7 +47,7 @@ public:
 	DECLARE_PERSISTENT(BaseSubFrame, BaseScriptable)
 	void setDefaultRect();
 	uint32 _transparent;
-	bool saveAsText(BaseDynamicBuffer *buffer, int indent) { return saveAsText(buffer, indent, true); }
+	bool saveAsText(BaseDynamicBuffer *buffer, int indent) override { return saveAsText(buffer, indent, true); }
 	bool saveAsText(BaseDynamicBuffer *buffer, int indent, bool complete);
 	bool _editorSelected;
 	BaseSubFrame(BaseGame *inGame);
@@ -82,10 +82,10 @@ public:
 	BaseSurface *_surface;
 
 	// scripting interface
-	virtual ScValue *scGetProperty(const Common::String &name);
-	virtual bool scSetProperty(const char *name, ScValue *value);
-	virtual bool scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, const char *name);
-	virtual const char *scToString();
+	virtual ScValue *scGetProperty(const Common::String &name) override;
+	virtual bool scSetProperty(const char *name, ScValue *value) override;
+	virtual bool scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, const char *name) override;
+	virtual const char *scToString() override;
 	Common::String debuggerToString() const override;
 
 };
diff --git a/engines/wintermute/base/font/base_font_truetype.h b/engines/wintermute/base/font/base_font_truetype.h
index d74efa0..74480d2 100644
--- a/engines/wintermute/base/font/base_font_truetype.h
+++ b/engines/wintermute/base/font/base_font_truetype.h
@@ -111,8 +111,8 @@ public:
 		return _lineHeight;
 	}
 
-	void afterLoad();
-	void initLoop();
+	void afterLoad() override;
+	void initLoop() override;
 
 private:
 	bool parseLayer(BaseTTFontLayer *layer, char *buffer);
diff --git a/engines/wintermute/base/gfx/osystem/base_render_osystem.h b/engines/wintermute/base/gfx/osystem/base_render_osystem.h
index 4a69fbe..4a486a6 100644
--- a/engines/wintermute/base/gfx/osystem/base_render_osystem.h
+++ b/engines/wintermute/base/gfx/osystem/base_render_osystem.h
@@ -64,12 +64,12 @@ public:
 
 	typedef Common::List<RenderTicket *>::iterator RenderQueueIterator;
 
-	Common::String getName() const;
+	Common::String getName() const override;
 
 	bool initRenderer(int width, int height, bool windowed) override;
 	bool flip() override;
-	virtual bool indicatorFlip();
-	virtual bool forcedFlip();
+	virtual bool indicatorFlip() override;
+	virtual bool forcedFlip() override;
 	bool fill(byte r, byte g, byte b, Common::Rect *rect = nullptr) override;
 	Graphics::PixelFormat getPixelFormat() const override;
 	void fade(uint16 alpha) override;
@@ -112,7 +112,7 @@ public:
 	}
 	virtual bool startSpriteBatch() override;
 	virtual bool endSpriteBatch() override;
-	void endSaveLoad();
+	void endSaveLoad() override;
 	void drawSurface(BaseSurfaceOSystem *owner, const Graphics::Surface *surf, Common::Rect *srcRect, Common::Rect *dstRect, Graphics::TransformStruct &transform);
 	BaseSurface *createSurface() override;
 private:
diff --git a/engines/wintermute/base/gfx/osystem/base_surface_osystem.h b/engines/wintermute/base/gfx/osystem/base_surface_osystem.h
index 950cabf..0ef341f 100644
--- a/engines/wintermute/base/gfx/osystem/base_surface_osystem.h
+++ b/engines/wintermute/base/gfx/osystem/base_surface_osystem.h
@@ -58,7 +58,7 @@ public:
 	bool display(int x, int y, Rect32 rect, Graphics::TSpriteBlendMode blendMode = Graphics::BLEND_NORMAL, bool mirrorX = false, bool mirrorY = false) override;
 	bool displayZoom(int x, int y, Rect32 rect, float zoomX, float zoomY, uint32 alpha = Graphics::kDefaultRgbaMod, bool transparent = false, Graphics::TSpriteBlendMode blendMode = Graphics::BLEND_NORMAL, bool mirrorX = false, bool mirrorY = false) override;
 	bool displayTransform(int x, int y, Rect32 rect, Rect32 newRect, const Graphics::TransformStruct &transform) override;
-	virtual bool displayTiled(int x, int y, Rect32 rect, int numTimesX, int numTimesY);
+	virtual bool displayTiled(int x, int y, Rect32 rect, 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);
diff --git a/engines/wintermute/base/particles/part_emitter.h b/engines/wintermute/base/particles/part_emitter.h
index 3fe24b5..6b0d376 100644
--- a/engines/wintermute/base/particles/part_emitter.h
+++ b/engines/wintermute/base/particles/part_emitter.h
@@ -47,8 +47,8 @@ public:
 
 	bool start();
 
-	bool update();
-	bool display() { return display(nullptr); } // To avoid shadowing the inherited display-function.
+	bool update() override;
+	bool display() override { return display(nullptr); } // To avoid shadowing the inherited display-function.
 	bool display(BaseRegion *region);
 
 	bool sortParticlesByZ();
@@ -63,10 +63,10 @@ public:
 	BaseArray<PartForce *> _forces;
 
 	// scripting interface
-	virtual ScValue *scGetProperty(const Common::String &name);
-	virtual bool scSetProperty(const char *name, ScValue *value);
-	virtual bool scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, const char *name);
-	virtual const char *scToString();
+	virtual ScValue *scGetProperty(const Common::String &name) override;
+	virtual bool scSetProperty(const char *name, ScValue *value) override;
+	virtual bool scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, const char *name) override;
+	virtual const char *scToString() override;
 
 
 private:
diff --git a/engines/wintermute/base/scriptables/script_ext_array.h b/engines/wintermute/base/scriptables/script_ext_array.h
index 2daa58a..cbd7791 100644
--- a/engines/wintermute/base/scriptables/script_ext_array.h
+++ b/engines/wintermute/base/scriptables/script_ext_array.h
@@ -41,10 +41,10 @@ public:
 	SXArray(BaseGame *inGame, ScStack *stack);
 	SXArray(BaseGame *inGame);
 	virtual ~SXArray();
-	ScValue *scGetProperty(const Common::String &name);
-	bool scSetProperty(const char *name, ScValue *value);
-	bool scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, const char *name);
-	const char *scToString();
+	ScValue *scGetProperty(const Common::String &name) override;
+	bool scSetProperty(const char *name, ScValue *value) override;
+	bool scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, const char *name) override;
+	const char *scToString() override;
 private:
 	int32 _length;
 	ScValue *_values;
diff --git a/engines/wintermute/base/scriptables/script_ext_date.h b/engines/wintermute/base/scriptables/script_ext_date.h
index 46a23a3..bf31b7e 100644
--- a/engines/wintermute/base/scriptables/script_ext_date.h
+++ b/engines/wintermute/base/scriptables/script_ext_date.h
@@ -36,14 +36,14 @@ namespace Wintermute {
 
 class SXDate : public BaseScriptable {
 public:
-	int scCompare(BaseScriptable *Value);
+	int scCompare(BaseScriptable *Value) override;
 	DECLARE_PERSISTENT(SXDate, BaseScriptable)
 	SXDate(BaseGame *inGame, ScStack *Stack);
 	virtual ~SXDate();
-	ScValue *scGetProperty(const Common::String &name);
-	bool scSetProperty(const char *name, ScValue *value);
-	bool scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, const char *name);
-	const char *scToString();
+	ScValue *scGetProperty(const Common::String &name) override;
+	bool scSetProperty(const char *name, ScValue *value) override;
+	bool scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, const char *name) override;
+	const char *scToString() override;
 private:
 	TimeDate _tm;
 	Common::String _strRep;
diff --git a/engines/wintermute/base/scriptables/script_ext_directory.h b/engines/wintermute/base/scriptables/script_ext_directory.h
index e29c3ff..d24e9aa 100644
--- a/engines/wintermute/base/scriptables/script_ext_directory.h
+++ b/engines/wintermute/base/scriptables/script_ext_directory.h
@@ -39,8 +39,8 @@ public:
 	DECLARE_PERSISTENT(SXDirectory, BaseScriptable)
 	SXDirectory(BaseGame *inGame);
 	virtual ~SXDirectory();
-	virtual ScValue *scGetProperty(const Common::String &name);
-	virtual bool scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, const char *name);
+	virtual ScValue *scGetProperty(const Common::String &name) override;
+	virtual bool scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, const char *name) override;
 };
 
 } // End of namespace Wintermute
diff --git a/engines/wintermute/base/scriptables/script_ext_file.h b/engines/wintermute/base/scriptables/script_ext_file.h
index 4994ef9..c0bc6a4 100644
--- a/engines/wintermute/base/scriptables/script_ext_file.h
+++ b/engines/wintermute/base/scriptables/script_ext_file.h
@@ -40,10 +40,10 @@ class BaseFile;
 class SXFile : public BaseScriptable {
 public:
 	DECLARE_PERSISTENT(SXFile, BaseScriptable)
-	ScValue *scGetProperty(const Common::String &name);
-	bool scSetProperty(const char *name, ScValue *value);
-	bool scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, const char *name);
-	const char *scToString();
+	ScValue *scGetProperty(const Common::String &name) override;
+	bool scSetProperty(const char *name, ScValue *value) override;
+	bool scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, const char *name) override;
+	const char *scToString() override;
 	SXFile(BaseGame *inGame, ScStack *Stack);
 	virtual ~SXFile();
 private:
diff --git a/engines/wintermute/base/scriptables/script_ext_math.h b/engines/wintermute/base/scriptables/script_ext_math.h
index 5354e52..165ffdd 100644
--- a/engines/wintermute/base/scriptables/script_ext_math.h
+++ b/engines/wintermute/base/scriptables/script_ext_math.h
@@ -39,8 +39,8 @@ public:
 	DECLARE_PERSISTENT(SXMath, BaseScriptable)
 	SXMath(BaseGame *inGame);
 	virtual ~SXMath();
-	virtual ScValue *scGetProperty(const Common::String &name);
-	virtual bool scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, const char *name);
+	virtual ScValue *scGetProperty(const Common::String &name) override;
+	virtual bool scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, const char *name) override;
 
 private:
 	double degreeToRadian(double value);
diff --git a/engines/wintermute/base/scriptables/script_ext_mem_buffer.h b/engines/wintermute/base/scriptables/script_ext_mem_buffer.h
index 740ff1d..88efea7 100644
--- a/engines/wintermute/base/scriptables/script_ext_mem_buffer.h
+++ b/engines/wintermute/base/scriptables/script_ext_mem_buffer.h
@@ -36,16 +36,16 @@ namespace Wintermute {
 
 class SXMemBuffer : public BaseScriptable {
 public:
-	virtual int scCompare(BaseScriptable *Val);
+	virtual int scCompare(BaseScriptable *Val) override;
 	DECLARE_PERSISTENT(SXMemBuffer, BaseScriptable)
-	ScValue *scGetProperty(const Common::String &name);
-	bool scSetProperty(const char *name, ScValue *value);
-	bool scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, const char *name);
-	const char *scToString();
+	ScValue *scGetProperty(const Common::String &name) override;
+	bool scSetProperty(const char *name, ScValue *value) override;
+	bool scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, const char *name) override;
+	const char *scToString() override;
 	SXMemBuffer(BaseGame *inGame, ScStack *stack);
 	SXMemBuffer(BaseGame *inGame, void *buffer);
 	virtual ~SXMemBuffer();
-	virtual void *scToMemBuffer();
+	virtual void *scToMemBuffer() override;
 private:
 	int32 _size;
 
diff --git a/engines/wintermute/base/scriptables/script_ext_string.h b/engines/wintermute/base/scriptables/script_ext_string.h
index b28f2b2..80159b4 100644
--- a/engines/wintermute/base/scriptables/script_ext_string.h
+++ b/engines/wintermute/base/scriptables/script_ext_string.h
@@ -36,13 +36,13 @@ namespace Wintermute {
 
 class SXString : public BaseScriptable {
 public:
-	virtual int scCompare(BaseScriptable *Val);
+	virtual int scCompare(BaseScriptable *Val) override;
 	DECLARE_PERSISTENT(SXString, BaseScriptable)
-	ScValue *scGetProperty(const Common::String &name);
-	bool scSetProperty(const char *name, ScValue *value);
-	bool scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, const char *name);
-	void scSetString(const char *val);
-	const char *scToString();
+	ScValue *scGetProperty(const Common::String &name) override;
+	bool scSetProperty(const char *name, ScValue *value) override;
+	bool scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, const char *name) override;
+	void scSetString(const char *val) override;
+	const char *scToString() override;
 	void setStringVal(const char *val);
 
 	SXString(BaseGame *inGame, ScStack *Stack);
diff --git a/engines/wintermute/base/scriptables/script_value.h b/engines/wintermute/base/scriptables/script_value.h
index 6130553..0aa6220 100644
--- a/engines/wintermute/base/scriptables/script_value.h
+++ b/engines/wintermute/base/scriptables/script_value.h
@@ -49,7 +49,7 @@ public:
 	DECLARE_PERSISTENT(ScValue, BaseClass)
 
 	bool _isConstVar;
-	bool saveAsText(BaseDynamicBuffer *buffer, int indent);
+	bool saveAsText(BaseDynamicBuffer *buffer, int indent) override;
 	void setValue(ScValue *val);
 	bool _persistent;
 	bool propExists(const char *name);
diff --git a/engines/wintermute/debugger/debugger_controller.h b/engines/wintermute/debugger/debugger_controller.h
index c1a593d..a5441dc 100644
--- a/engines/wintermute/debugger/debugger_controller.h
+++ b/engines/wintermute/debugger/debugger_controller.h
@@ -109,8 +109,8 @@ public:
 	/**
 	 * Inherited from ScriptMonitor
 	 */
-	void onBreakpoint(const Breakpoint *breakpoint, DebuggableScript *script);
-	void onWatch(const Watch *watch, DebuggableScript *script);
+	void onBreakpoint(const Breakpoint *breakpoint, DebuggableScript *script) override;
+	void onWatch(const Watch *watch, DebuggableScript *script) override;
 	void notifyStep(DebuggableScript *script) override;
 };
 }
diff --git a/engines/wintermute/detection.cpp b/engines/wintermute/detection.cpp
index 785741b..e6438d3 100644
--- a/engines/wintermute/detection.cpp
+++ b/engines/wintermute/detection.cpp
@@ -89,22 +89,22 @@ class WintermuteMetaEngine : public AdvancedMetaEngine {
 public:
 	WintermuteMetaEngine() : AdvancedMetaEngine(Wintermute::gameDescriptions, sizeof(WMEGameDescription), Wintermute::wintermuteGames, gameGuiOptions) {
 		// Use kADFlagUseExtraAsHint to distinguish between SD and HD versions
-		// of J.U.L.I.A. when their datafiles sit in the same directory (e.g. in Steam distribution). 
+		// of J.U.L.I.A. when their datafiles sit in the same directory (e.g. in Steam distribution).
 		_flags = kADFlagUseExtraAsHint;
 		_guiOptions = GUIO3(GUIO_NOMIDI, GAMEOPTION_SHOW_FPS, GAMEOPTION_BILINEAR);
 		_maxScanDepth = 2;
 		_directoryGlobs = directoryGlobs;
 	}
 
-	const char *getEngineId() const {
+	const char *getEngineId() const override {
 		return "wintermute";
 	}
 
-	virtual const char *getName() const {
+	virtual const char *getName() const override {
 		return "Wintermute";
 	}
 
-	virtual const char *getOriginalCopyright() const {
+	virtual const char *getOriginalCopyright() const override {
 		return "Copyright (C) 2011 Jan Nedoma";
 	}
 
@@ -154,7 +154,7 @@ public:
 		return game;
 	}
 
-	virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const {
+	virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override {
 		assert(syst);
 		assert(engine);
 		const WMEGameDescription *gd = (const WMEGameDescription *)desc;
@@ -162,7 +162,7 @@ public:
 		return true;
 	}
 
-	bool hasFeature(MetaEngineFeature f) const {
+	bool hasFeature(MetaEngineFeature f) const override {
 		switch (f) {
 		case MetaEngine::kSupportsListSaves:
 			return true;
@@ -181,7 +181,7 @@ public:
 		}
 	}
 
-	SaveStateList listSaves(const char *target) const {
+	SaveStateList listSaves(const char *target) const override {
 		SaveStateList saves;
 		Wintermute::BasePersistenceManager pm(target, true);
 		for (int i = 0; i < getMaximumSaveSlot(); i++) {
@@ -194,16 +194,16 @@ public:
 		return saves;
 	}
 
-	int getMaximumSaveSlot() const {
+	int getMaximumSaveSlot() const override {
 		return 100;
 	}
 
-	void removeSaveState(const char *target, int slot) const {
+	void removeSaveState(const char *target, int slot) const override {
 		Wintermute::BasePersistenceManager pm(target, true);
 		pm.deleteSaveSlot(slot);
 	}
 
-	virtual SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const {
+	virtual SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override {
 		Wintermute::BasePersistenceManager pm(target, true);
 		SaveStateDescriptor retVal;
 		retVal.setDescription("Invalid savegame");
diff --git a/engines/wintermute/persistent.h b/engines/wintermute/persistent.h
index 202a0fc..bcfc8e2 100644
--- a/engines/wintermute/persistent.h
+++ b/engines/wintermute/persistent.h
@@ -46,10 +46,10 @@ namespace Wintermute {
 #define DECLARE_PERSISTENT(className, parentClass)\
 	static const char _className[];\
 	static void *persistBuild(void);\
-	virtual const char *getClassName();\
+	virtual const char *getClassName() override;\
 	static bool persistLoad(void* Instance, BasePersistenceManager* PersistMgr);\
 	className(TDynamicConstructor p1, TDynamicConstructor p2) : parentClass(p1, p2) { /*memset(this, 0, sizeof(class_name));*/ };\
-	virtual bool persist(BasePersistenceManager *persistMgr);\
+	virtual bool persist(BasePersistenceManager *persistMgr) override;\
 	void* operator new (size_t size);\
 	void operator delete(void* p);\
 
diff --git a/engines/wintermute/ui/ui_button.h b/engines/wintermute/ui/ui_button.h
index 2e4fa84..cfe8f4b 100644
--- a/engines/wintermute/ui/ui_button.h
+++ b/engines/wintermute/ui/ui_button.h
@@ -40,10 +40,10 @@ public:
 
 	DECLARE_PERSISTENT(UIButton, UIObject)
 	void press();
-	virtual bool display() { return display(0, 0); }
-	virtual bool display(int offsetX, int offsetY);
+	virtual bool display() override { return display(0, 0); }
+	virtual bool display(int offsetX, int offsetY) override;
 
-	void correctSize();
+	void correctSize() override;
 
 	UIButton(BaseGame *inGame = nullptr);
 	virtual ~UIButton();
diff --git a/engines/wintermute/ui/ui_edit.h b/engines/wintermute/ui/ui_edit.h
index ea110a7..73dbb27 100644
--- a/engines/wintermute/ui/ui_edit.h
+++ b/engines/wintermute/ui/ui_edit.h
@@ -42,8 +42,8 @@ public:
 	int insertChars(int pos, const byte *chars, int num);
 	int deleteChars(int start, int end);
 
-	virtual bool display(int offsetX, int offsetY);
-	virtual bool handleKeypress(Common::Event *event, bool printable = false);
+	virtual bool display(int offsetX, int offsetY) override;
+	virtual bool handleKeypress(Common::Event *event, bool printable = false) override;
 
 	void setCursorChar(const char *character);
 
@@ -52,7 +52,7 @@ public:
 
 	bool loadFile(const char *filename);
 	bool loadBuffer(char *buffer, bool complete = true);
-	virtual bool saveAsText(BaseDynamicBuffer *buffer, int indent);
+	virtual bool saveAsText(BaseDynamicBuffer *buffer, int indent) override;
 
 	// scripting interface
 	virtual ScValue *scGetProperty(const Common::String &name) override;
diff --git a/engines/wintermute/ui/ui_entity.h b/engines/wintermute/ui/ui_entity.h
index b1ea2d5..596b110 100644
--- a/engines/wintermute/ui/ui_entity.h
+++ b/engines/wintermute/ui/ui_entity.h
@@ -49,8 +49,8 @@ public:
 	// scripting interface
 	virtual ScValue *scGetProperty(const Common::String &name) override;
 	virtual bool scSetProperty(const char *name, ScValue *value) override;
-	virtual bool scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, const char *name);
-	virtual const char *scToString();
+	virtual bool scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, const char *name) override;
+	virtual const char *scToString() override;
 
 private:
 	AdEntity *_entity;
diff --git a/engines/wintermute/ui/ui_object.h b/engines/wintermute/ui/ui_object.h
index e7c0d56..5212242 100644
--- a/engines/wintermute/ui/ui_object.h
+++ b/engines/wintermute/ui/ui_object.h
@@ -42,7 +42,7 @@ public:
 
 	bool getTotalOffset(int *offsetX, int *offsetY);
 	bool focus();
-	virtual bool handleMouse(TMouseEvent event, TMouseButton button);
+	virtual bool handleMouse(TMouseEvent event, TMouseButton button) override;
 	bool isFocused();
 
 	DECLARE_PERSISTENT(UIObject, BaseObject)
diff --git a/engines/wintermute/ui/ui_text.h b/engines/wintermute/ui/ui_text.h
index d82ae9a..4e496bd 100644
--- a/engines/wintermute/ui/ui_text.h
+++ b/engines/wintermute/ui/ui_text.h
@@ -40,7 +40,7 @@ private:
 	TTextAlign _textAlign;
 	TVerticalAlign _verticalAlign;
 public:
-	virtual bool display(int offsetX, int offsetY);
+	virtual bool display(int offsetX, int offsetY) override;
 	DECLARE_PERSISTENT(UIText, UIObject)
 	UIText(BaseGame *inGame = nullptr);
 	virtual ~UIText();
diff --git a/engines/wintermute/ui/ui_window.h b/engines/wintermute/ui/ui_window.h
index dad8c89..ecd470b 100644
--- a/engines/wintermute/ui/ui_window.h
+++ b/engines/wintermute/ui/ui_window.h
@@ -42,15 +42,15 @@ public:
 	bool getWindowObjects(BaseArray<UIObject *> &Objects, bool InteractiveOnly);
 
 	void cleanup();
-	virtual void makeFreezable(bool freezable);
+	virtual void makeFreezable(bool freezable) override;
 
-	virtual bool handleMouseWheel(int delta);
+	virtual bool handleMouseWheel(int delta) override;
 
 	bool close();
 	bool goSystemExclusive();
 	bool goExclusive();
 	bool moveFocus(bool forward = true);
-	virtual bool handleMouse(TMouseEvent Event, TMouseButton Button);
+	virtual bool handleMouse(TMouseEvent Event, TMouseButton Button) override;
 	DECLARE_PERSISTENT(UIWindow, UIObject)
 	bool showWidget(const char *name, bool visible = true);
 	bool enableWidget(const char *name, bool enable = true);
@@ -64,14 +64,14 @@ public:
 	bool loadFile(const char *filename);
 	bool loadBuffer(char *buffer, bool complete = true);
 
-	virtual bool listen(BaseScriptHolder *param1, uint32 param2);
+	virtual bool listen(BaseScriptHolder *param1, uint32 param2) override;
 	virtual bool saveAsText(BaseDynamicBuffer *buffer, int indent) override;
 
 	// scripting interface
 	virtual ScValue *scGetProperty(const Common::String &name) override;
 	virtual bool scSetProperty(const char *name, ScValue *value) override;
 	virtual bool scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, const char *name) override;
-	virtual const char *scToString();
+	virtual const char *scToString() override;
 
 	bool getInGame() const;
 	TWindowMode getMode() const;

More information about the Scummvm-git-logs mailing list