[Scummvm-git-logs] scummvm master -> 1d81fadc9eaa179adb112a24992b7f047122813e
sev-
sev at scummvm.org
Mon Feb 3 09:50:11 UTC 2020
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
5ebf4ea0c2 ULTIMA: More override keywords
7eb783b37b ULTIMA: Further work on overrides marking
1d81fadc9e ULTIMA: Final touches on override handing
Commit: 5ebf4ea0c2cc06884b56c03762e295b8483c9266
https://github.com/scummvm/scummvm/commit/5ebf4ea0c2cc06884b56c03762e295b8483c9266
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-03T10:22:18+01:00
Commit Message:
ULTIMA: More override keywords
Changed paths:
engines/ultima/ultima8/filesys/dir_file.h
engines/ultima/ultima8/graphics/fonts/jp_font.h
engines/ultima/ultima8/graphics/fonts/shape_font.h
engines/ultima/ultima8/graphics/fonts/tt_font.h
engines/ultima/ultima8/gumps/bark_gump.h
engines/ultima/ultima8/gumps/console_gump.h
engines/ultima/ultima8/gumps/desktop_gump.h
engines/ultima/ultima8/gumps/fast_area_vis_gump.h
engines/ultima/ultima8/gumps/inverter_gump.h
engines/ultima/ultima8/gumps/item_relative_gump.h
engines/ultima/ultima8/gumps/message_box_gump.h
engines/ultima/ultima8/gumps/minimap_gump.h
engines/ultima/ultima8/gumps/pentagram_menu_gump.h
engines/ultima/ultima8/gumps/quit_gump.h
engines/ultima/ultima8/gumps/scaler_gump.h
engines/ultima/ultima8/gumps/scroll_gump.h
engines/ultima/ultima8/kernel/joystick.h
engines/ultima/ultima8/world/monster_egg.h
diff --git a/engines/ultima/ultima8/filesys/dir_file.h b/engines/ultima/ultima8/filesys/dir_file.h
index c175a88..bfb6e72 100644
--- a/engines/ultima/ultima8/filesys/dir_file.h
+++ b/engines/ultima/ultima8/filesys/dir_file.h
@@ -40,7 +40,7 @@ public:
virtual bool exists(const Std::string &name) override;
- virtual uint8 *getObject(const Std::string &name, uint32 *size = 0);
+ virtual uint8 *getObject(const Std::string &name, uint32 *size = 0) override;
virtual uint32 getSize(const Std::string &name) override;
diff --git a/engines/ultima/ultima8/graphics/fonts/jp_font.h b/engines/ultima/ultima8/graphics/fonts/jp_font.h
index c6d2542..41b87e8 100644
--- a/engines/ultima/ultima8/graphics/fonts/jp_font.h
+++ b/engines/ultima/ultima8/graphics/fonts/jp_font.h
@@ -38,9 +38,9 @@ public:
int getWidth(int c);
- virtual int getHeight();
- virtual int getBaseline();
- virtual int getBaselineSkip();
+ virtual int getHeight() override;
+ virtual int getBaseline() override;
+ virtual int getBaselineSkip() override;
virtual void getStringSize(const Std::string &text,
int32 &width, int32 &height) override;
diff --git a/engines/ultima/ultima8/graphics/fonts/shape_font.h b/engines/ultima/ultima8/graphics/fonts/shape_font.h
index acf1541..b1630f4 100644
--- a/engines/ultima/ultima8/graphics/fonts/shape_font.h
+++ b/engines/ultima/ultima8/graphics/fonts/shape_font.h
@@ -41,9 +41,9 @@ public:
const uint16 flexId, const uint32 shapenum);
virtual ~ShapeFont();
- virtual int getHeight();
- virtual int getBaseline();
- virtual int getBaselineSkip();
+ virtual int getHeight() override;
+ virtual int getBaseline() override;
+ virtual int getBaselineSkip() override;
int getWidth(char c);
int getVlead() const {
diff --git a/engines/ultima/ultima8/graphics/fonts/tt_font.h b/engines/ultima/ultima8/graphics/fonts/tt_font.h
index e167a5a..6961f53 100644
--- a/engines/ultima/ultima8/graphics/fonts/tt_font.h
+++ b/engines/ultima/ultima8/graphics/fonts/tt_font.h
@@ -36,9 +36,9 @@ public:
bool antiAliased, bool SJIS);
virtual ~TTFont();
- virtual int getHeight();
- virtual int getBaseline();
- virtual int getBaselineSkip();
+ virtual int getHeight() override;
+ virtual int getBaseline() override;
+ virtual int getBaselineSkip() override;
bool isAntialiased() {
return antiAliased;
diff --git a/engines/ultima/ultima8/gumps/bark_gump.h b/engines/ultima/ultima8/gumps/bark_gump.h
index f79e79c..bce2602 100644
--- a/engines/ultima/ultima8/gumps/bark_gump.h
+++ b/engines/ultima/ultima8/gumps/bark_gump.h
@@ -64,7 +64,7 @@ protected:
public:
bool loadData(IDataSource *ids, uint32 version);
protected:
- virtual void saveData(ODataSource *ods);
+ virtual void saveData(ODataSource *ods) override;
};
} // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/gumps/console_gump.h b/engines/ultima/ultima8/gumps/console_gump.h
index d736166..df4c497 100644
--- a/engines/ultima/ultima8/gumps/console_gump.h
+++ b/engines/ultima/ultima8/gumps/console_gump.h
@@ -55,26 +55,26 @@ public:
bool ConsoleIsVisible();
// ConsoleGump doesn't have any 'effective' area
- virtual bool PointOnGump(int mx, int my) {
+ virtual bool PointOnGump(int mx, int my) override {
return false;
}
- virtual void run();
+ virtual void run() override;
- virtual void PaintThis(RenderSurface *surf, int32 lerp_factor, bool scaled);
+ virtual void PaintThis(RenderSurface *surf, int32 lerp_factor, bool scaled) override;
- virtual void RenderSurfaceChanged();
+ virtual void RenderSurfaceChanged() override;
- virtual bool OnTextInput(int unicode);
- virtual void OnFocus(bool /*gain*/);
- virtual bool OnKeyDown(int key, int mod);
+ virtual bool OnTextInput(int unicode) override;
+ virtual void OnFocus(bool /*gain*/) override;
+ virtual bool OnKeyDown(int key, int mod) override;
static void ConCmd_toggle(const Console::ArgvType &argv); //!< "ConsoleGump::toggle" console command
bool loadData(IDataSource *ids, uint32 version);
protected:
- virtual void saveData(ODataSource *ods);
+ virtual void saveData(ODataSource *ods) override;
private:
};
diff --git a/engines/ultima/ultima8/gumps/desktop_gump.h b/engines/ultima/ultima8/gumps/desktop_gump.h
index 8f2929b..dbf805e 100644
--- a/engines/ultima/ultima8/gumps/desktop_gump.h
+++ b/engines/ultima/ultima8/gumps/desktop_gump.h
@@ -38,12 +38,12 @@ public:
DesktopGump(int32 x, int32 y, int32 width, int32 height);
virtual ~DesktopGump(void);
- virtual void PaintThis(RenderSurface *surf, int32 lerp_factor, bool scaled);
- virtual void PaintChildren(RenderSurface *surf, int32 lerp_factor, bool scaled);
+ virtual void PaintThis(RenderSurface *surf, int32 lerp_factor, bool scaled) override;
+ virtual void PaintChildren(RenderSurface *surf, int32 lerp_factor, bool scaled) override;
- virtual bool StartDraggingChild(Gump *gump, int32 mx, int32 my);
- virtual void DraggingChild(Gump *gump, int mx, int my);
- virtual void StopDraggingChild(Gump *gump);
+ virtual bool StartDraggingChild(Gump *gump, int32 mx, int32 my) override;
+ virtual void DraggingChild(Gump *gump, int mx, int my) override;
+ virtual void StopDraggingChild(Gump *gump) override;
bool loadData(IDataSource *ids, uint32 version);
@@ -54,8 +54,8 @@ public:
}
protected:
- virtual void saveData(ODataSource *ods);
- virtual void RenderSurfaceChanged();
+ virtual void saveData(ODataSource *ods) override;
+ virtual void RenderSurfaceChanged() override;
};
} // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/gumps/fast_area_vis_gump.h b/engines/ultima/ultima8/gumps/fast_area_vis_gump.h
index 94358eb..e7e4eb5 100644
--- a/engines/ultima/ultima8/gumps/fast_area_vis_gump.h
+++ b/engines/ultima/ultima8/gumps/fast_area_vis_gump.h
@@ -36,8 +36,8 @@ public:
FastAreaVisGump(void);
virtual ~FastAreaVisGump(void);
- virtual void PaintThis(RenderSurface *surf, int32 lerp_factor, bool scaled);
- virtual uint16 TraceObjId(int32 mx, int32 my);
+ virtual void PaintThis(RenderSurface *surf, int32 lerp_factor, bool scaled) override;
+ virtual uint16 TraceObjId(int32 mx, int32 my) override;
static void ConCmd_toggle(const Console::ArgvType &argv); //!< "FastAreaVisGump::toggle" console command
diff --git a/engines/ultima/ultima8/gumps/inverter_gump.h b/engines/ultima/ultima8/gumps/inverter_gump.h
index 42fe561..8ee8c33 100644
--- a/engines/ultima/ultima8/gumps/inverter_gump.h
+++ b/engines/ultima/ultima8/gumps/inverter_gump.h
@@ -39,15 +39,15 @@ public:
InverterGump(int32 x, int32 y, int32 width, int32 height);
virtual ~InverterGump(void);
- virtual void Paint(RenderSurface *surf, int32 lerp_factor, bool scaled);
- virtual void PaintChildren(RenderSurface *surf, int32 lerp_factor, bool scaled);
+ virtual void Paint(RenderSurface *surf, int32 lerp_factor, bool scaled) override;
+ virtual void PaintChildren(RenderSurface *surf, int32 lerp_factor, bool scaled) override;
virtual void ParentToGump(int32 &px, int32 &py,
- PointRoundDir r = ROUND_TOPLEFT);
+ PointRoundDir r = ROUND_TOPLEFT) override;
virtual void GumpToParent(int32 &gx, int32 &gy,
- PointRoundDir r = ROUND_TOPLEFT);
+ PointRoundDir r = ROUND_TOPLEFT) override;
- virtual void RenderSurfaceChanged();
+ virtual void RenderSurfaceChanged() override;
protected:
RenderSurface *buffer;
diff --git a/engines/ultima/ultima8/gumps/item_relative_gump.h b/engines/ultima/ultima8/gumps/item_relative_gump.h
index b74dc18..3d28ce9 100644
--- a/engines/ultima/ultima8/gumps/item_relative_gump.h
+++ b/engines/ultima/ultima8/gumps/item_relative_gump.h
@@ -40,22 +40,22 @@ public:
ItemRelativeGump(int32 x, int32 y, int32 width, int32 height, uint16 owner, uint32 _Flags = 0, int32 layer = LAYER_NORMAL);
virtual ~ItemRelativeGump(void);
- virtual void InitGump(Gump *newparent, bool take_focus = true);
+ virtual void InitGump(Gump *newparent, bool take_focus = true) override;
// Paint the Gump (RenderSurface is relative to parent).
// Calls PaintThis and PaintChildren.
- virtual void Paint(RenderSurface *, int32 lerp_factor, bool scaled);
+ virtual void Paint(RenderSurface *, int32 lerp_factor, bool scaled) override;
virtual void ParentToGump(int32 &px, int32 &py,
- PointRoundDir r = ROUND_TOPLEFT);
+ PointRoundDir r = ROUND_TOPLEFT) override;
virtual void GumpToParent(int32 &gx, int32 &gy,
- PointRoundDir r = ROUND_TOPLEFT);
+ PointRoundDir r = ROUND_TOPLEFT) override;
- virtual void Move(int32 x, int32 y);
+ virtual void Move(int32 x, int32 y) override;
bool loadData(IDataSource *ids, uint32 version);
protected:
- virtual void saveData(ODataSource *ods);
+ virtual void saveData(ODataSource *ods) override;
virtual void GetItemLocation(int32 lerp_factor);
diff --git a/engines/ultima/ultima8/gumps/message_box_gump.h b/engines/ultima/ultima8/gumps/message_box_gump.h
index 12044f2..0264e03 100644
--- a/engines/ultima/ultima8/gumps/message_box_gump.h
+++ b/engines/ultima/ultima8/gumps/message_box_gump.h
@@ -45,12 +45,12 @@ public:
virtual ~MessageBoxGump();
// Init the gump, call after construction
- virtual void InitGump(Gump *newparent, bool take_focus = true);
- virtual void Close(bool no_del = false);
+ virtual void InitGump(Gump *newparent, bool take_focus = true) override;
+ virtual void Close(bool no_del = false) override;
bool loadData(IDataSource *ids, uint32 version);
- virtual void PaintThis(RenderSurface *, int32 lerp_factor, bool scaled);
+ virtual void PaintThis(RenderSurface *, int32 lerp_factor, bool scaled) override;
//! Create a Message Box
//! \param title Title of the message box
@@ -63,10 +63,10 @@ public:
return Show(title, message, 0xFF30308F, buttons);
}
- virtual void ChildNotify(Gump *child, uint32 msg);
+ virtual void ChildNotify(Gump *child, uint32 msg) override;
protected:
- virtual void saveData(ODataSource *ods);
+ virtual void saveData(ODataSource *ods) override;
};
} // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/gumps/minimap_gump.h b/engines/ultima/ultima8/gumps/minimap_gump.h
index 9ae09ca..5edb32f 100644
--- a/engines/ultima/ultima8/gumps/minimap_gump.h
+++ b/engines/ultima/ultima8/gumps/minimap_gump.h
@@ -47,15 +47,15 @@ public:
MiniMapGump(int x, int y);
virtual ~MiniMapGump(void);
- virtual void PaintThis(RenderSurface *surf, int32 lerp_factor, bool scaled);
- virtual uint16 TraceObjId(int32 mx, int32 my);
+ virtual void PaintThis(RenderSurface *surf, int32 lerp_factor, bool scaled) override;
+ virtual uint16 TraceObjId(int32 mx, int32 my) override;
static void ConCmd_toggle(const Console::ArgvType &argv); //!< "MiniMapGump::toggle" console command
static void ConCmd_generateWholeMap(const Console::ArgvType &argv); //!< "MiniMapGump::generateWholeMap" console command
bool loadData(IDataSource *ids, uint32 version);
protected:
- virtual void saveData(ODataSource *ods);
+ virtual void saveData(ODataSource *ods) override;
};
} // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/gumps/pentagram_menu_gump.h b/engines/ultima/ultima8/gumps/pentagram_menu_gump.h
index 3000aba..97f4707 100644
--- a/engines/ultima/ultima8/gumps/pentagram_menu_gump.h
+++ b/engines/ultima/ultima8/gumps/pentagram_menu_gump.h
@@ -55,16 +55,16 @@ public:
PentagramMenuGump(int x, int y, int w, int h);
virtual ~PentagramMenuGump();
- virtual void InitGump(Gump *newparent, bool take_focus = true);
+ virtual void InitGump(Gump *newparent, bool take_focus = true) override;
- virtual void PaintThis(RenderSurface *surf, int32 lerp_factor, bool scaled);
- virtual void PaintChildren(RenderSurface *surf, int32 lerp_factor, bool scaled);
+ virtual void PaintThis(RenderSurface *surf, int32 lerp_factor, bool scaled) override;
+ virtual void PaintChildren(RenderSurface *surf, int32 lerp_factor, bool scaled) override;
- virtual void ChildNotify(Gump *child, uint32 message);
+ virtual void ChildNotify(Gump *child, uint32 message) override;
- virtual bool OnKeyDown(int key, int mod);
+ virtual bool OnKeyDown(int key, int mod) override;
- virtual void run();
+ virtual void run() override;
#if 0
virtual uint16 TraceObjId(int32 mx, int32 my);
diff --git a/engines/ultima/ultima8/gumps/quit_gump.h b/engines/ultima/ultima8/gumps/quit_gump.h
index 5d7c456..32e976d 100644
--- a/engines/ultima/ultima8/gumps/quit_gump.h
+++ b/engines/ultima/ultima8/gumps/quit_gump.h
@@ -36,13 +36,13 @@ public:
QuitGump();
virtual ~QuitGump(void);
- virtual void InitGump(Gump *newparent, bool take_focus = true);
+ virtual void InitGump(Gump *newparent, bool take_focus = true) override;
- virtual void PaintThis(RenderSurface *, int32 lerp_factor, bool scaled);
+ virtual void PaintThis(RenderSurface *, int32 lerp_factor, bool scaled) override;
- virtual bool OnKeyDown(int key, int mod);
- virtual bool OnTextInput(int unicode);
- virtual void ChildNotify(Gump *child, uint32 message);
+ virtual bool OnKeyDown(int key, int mod) override;
+ virtual bool OnTextInput(int unicode) override;
+ virtual void ChildNotify(Gump *child, uint32 message) override;
static void verifyQuit();
//! "QuitGump::verifyQuit" console command
@@ -50,7 +50,7 @@ public:
bool loadData(IDataSource *ids);
protected:
- virtual void saveData(ODataSource *ods);
+ virtual void saveData(ODataSource *ods) override;
ObjId yesWidget, noWidget;
};
diff --git a/engines/ultima/ultima8/gumps/scaler_gump.h b/engines/ultima/ultima8/gumps/scaler_gump.h
index 9585ae8..97ab0a5 100644
--- a/engines/ultima/ultima8/gumps/scaler_gump.h
+++ b/engines/ultima/ultima8/gumps/scaler_gump.h
@@ -52,12 +52,12 @@ public:
ScalerGump(int32 x, int32 y, int32 width, int32 height);
virtual ~ScalerGump(void);
- virtual void Paint(RenderSurface *surf, int32 lerp_factor, bool scaled);
- virtual void RenderSurfaceChanged();
+ virtual void Paint(RenderSurface *surf, int32 lerp_factor, bool scaled) override;
+ virtual void RenderSurfaceChanged() override;
virtual void ParentToGump(int32 &px, int32 &py,
- PointRoundDir r = ROUND_TOPLEFT);
+ PointRoundDir r = ROUND_TOPLEFT) override;
virtual void GumpToParent(int32 &gx, int32 &gy,
- PointRoundDir r = ROUND_TOPLEFT);
+ PointRoundDir r = ROUND_TOPLEFT) override;
void GetScaledSize(int32 &sw, int32 &sh) const {
sw = swidth1;
diff --git a/engines/ultima/ultima8/gumps/scroll_gump.h b/engines/ultima/ultima8/gumps/scroll_gump.h
index ed3d0b7..dbc8cec 100644
--- a/engines/ultima/ultima8/gumps/scroll_gump.h
+++ b/engines/ultima/ultima8/gumps/scroll_gump.h
@@ -41,13 +41,13 @@ public:
virtual ~ScrollGump();
// Go to the next page on mouse click
- virtual void OnMouseClick(int button, int32 mx, int32 my);
+ virtual void OnMouseClick(int button, int32 mx, int32 my) override;
// Close on double click
- virtual void OnMouseDouble(int button, int32 mx, int32 my);
+ virtual void OnMouseDouble(int button, int32 mx, int32 my) override;
// Init the gump, call after construction
- virtual void InitGump(Gump *newparent, bool take_focus = true);
+ virtual void InitGump(Gump *newparent, bool take_focus = true) override;
INTRINSIC(I_readScroll);
@@ -57,7 +57,7 @@ protected:
public:
bool loadData(IDataSource *ids, uint32 version);
protected:
- virtual void saveData(ODataSource *ods);
+ virtual void saveData(ODataSource *ods) override;
};
} // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/kernel/joystick.h b/engines/ultima/ultima8/kernel/joystick.h
index d5dc419..16bbe9b 100644
--- a/engines/ultima/ultima8/kernel/joystick.h
+++ b/engines/ultima/ultima8/kernel/joystick.h
@@ -49,11 +49,11 @@ public:
ENABLE_RUNTIME_CLASSTYPE()
- virtual void run();
+ virtual void run() override;
bool loadData(IDataSource *ids, uint32 version);
protected:
- virtual void saveData(ODataSource *ods);
+ virtual void saveData(ODataSource *ods) override;
Joystick js;
int x_axis, y_axis;
diff --git a/engines/ultima/ultima8/world/monster_egg.h b/engines/ultima/ultima8/world/monster_egg.h
index 870d969..6747e01 100644
--- a/engines/ultima/ultima8/world/monster_egg.h
+++ b/engines/ultima/ultima8/world/monster_egg.h
@@ -55,7 +55,7 @@ public:
INTRINSIC(I_getMonId);
protected:
- virtual void saveData(ODataSource *ods);
+ virtual void saveData(ODataSource *ods) override;
};
} // End of namespace Ultima8
Commit: 7eb783b37bc5990aadae7232a76e0890bcced2f8
https://github.com/scummvm/scummvm/commit/7eb783b37bc5990aadae7232a76e0890bcced2f8
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-03T10:37:55+01:00
Commit Message:
ULTIMA: Further work on overrides marking
Changed paths:
engines/ultima/ultima8/graphics/fonts/jp_rendered_text.h
engines/ultima/ultima8/graphics/fonts/shape_rendered_text.h
engines/ultima/ultima8/graphics/fonts/ttf_rendered_text.h
engines/ultima/ultima8/gumps/bind_gump.h
engines/ultima/ultima8/gumps/container_gump.h
engines/ultima/ultima8/gumps/controls_gump.cpp
engines/ultima/ultima8/gumps/controls_gump.h
engines/ultima/ultima8/gumps/mini_stats_gump.h
engines/ultima/ultima8/gumps/options_gump.h
engines/ultima/ultima8/gumps/paged_gump.h
engines/ultima/ultima8/gumps/paperdoll_gump.h
engines/ultima/ultima8/gumps/slider_gump.h
engines/ultima/ultima8/gumps/u8_save_gump.h
engines/ultima/ultima8/gumps/widgets/button_widget.h
engines/ultima/ultima8/gumps/widgets/edit_widget.h
engines/ultima/ultima8/gumps/widgets/game_widget.h
engines/ultima/ultima8/gumps/widgets/sliding_widget.h
engines/ultima/ultima8/gumps/widgets/text_widget.h
diff --git a/engines/ultima/ultima8/graphics/fonts/jp_rendered_text.h b/engines/ultima/ultima8/graphics/fonts/jp_rendered_text.h
index ff7b636..718d8eb 100644
--- a/engines/ultima/ultima8/graphics/fonts/jp_rendered_text.h
+++ b/engines/ultima/ultima8/graphics/fonts/jp_rendered_text.h
@@ -39,8 +39,8 @@ public:
unsigned int fontnum);
virtual ~JPRenderedText();
- virtual void draw(RenderSurface *surface, int x, int y, bool destmasked = false);
- virtual void drawBlended(RenderSurface *surface, int x, int y, uint32 col, bool destmasked = false);
+ virtual void draw(RenderSurface *surface, int x, int y, bool destmasked = false) override;
+ virtual void drawBlended(RenderSurface *surface, int x, int y, uint32 col, bool destmasked = false) override;
ENABLE_RUNTIME_CLASSTYPE()
diff --git a/engines/ultima/ultima8/graphics/fonts/shape_rendered_text.h b/engines/ultima/ultima8/graphics/fonts/shape_rendered_text.h
index c294dbd..3a76a85 100644
--- a/engines/ultima/ultima8/graphics/fonts/shape_rendered_text.h
+++ b/engines/ultima/ultima8/graphics/fonts/shape_rendered_text.h
@@ -38,8 +38,8 @@ public:
int width, int height, int vlead, ShapeFont *font);
virtual ~ShapeRenderedText();
- virtual void draw(RenderSurface *surface, int x, int y, bool destmasked = false);
- virtual void drawBlended(RenderSurface *surface, int x, int y, uint32 col, bool destmasked = false);
+ virtual void draw(RenderSurface *surface, int x, int y, bool destmasked = false) override;
+ virtual void drawBlended(RenderSurface *surface, int x, int y, uint32 col, bool destmasked = false) override;
ENABLE_RUNTIME_CLASSTYPE()
diff --git a/engines/ultima/ultima8/graphics/fonts/ttf_rendered_text.h b/engines/ultima/ultima8/graphics/fonts/ttf_rendered_text.h
index 67b4841..e94330c 100644
--- a/engines/ultima/ultima8/graphics/fonts/ttf_rendered_text.h
+++ b/engines/ultima/ultima8/graphics/fonts/ttf_rendered_text.h
@@ -40,9 +40,9 @@ public:
virtual ~TTFRenderedText();
virtual void draw(RenderSurface *surface, int x, int y,
- bool destmasked = false);
+ bool destmasked = false) override;
virtual void drawBlended(RenderSurface *surface, int x, int y, uint32 col,
- bool destmasked = false);
+ bool destmasked = false) override;
ENABLE_RUNTIME_CLASSTYPE()
diff --git a/engines/ultima/ultima8/gumps/bind_gump.h b/engines/ultima/ultima8/gumps/bind_gump.h
index 2f28074..d01f47c 100644
--- a/engines/ultima/ultima8/gumps/bind_gump.h
+++ b/engines/ultima/ultima8/gumps/bind_gump.h
@@ -39,13 +39,13 @@ public:
virtual ~BindGump(void);
// Init the gump, call after construction
- virtual void InitGump(Gump *newparent, bool take_focus = true);
+ virtual void InitGump(Gump *newparent, bool take_focus = true) override;
// Paint the Gump
- virtual void PaintThis(RenderSurface *, int32 lerp_factor, bool scaled);
+ virtual void PaintThis(RenderSurface *, int32 lerp_factor, bool scaled) override;
- virtual bool OnKeyDown(int key, int mod);
- virtual Gump *OnMouseDown(int button, int32 mx, int32 my);
+ virtual bool OnKeyDown(int key, int mod) override;
+ virtual Gump *OnMouseDown(int button, int32 mx, int32 my) override;
bool loadData(IDataSource *ids);
@@ -54,7 +54,7 @@ public:
UPDATE = 10
};
protected:
- virtual void saveData(ODataSource *ods);
+ virtual void saveData(ODataSource *ods) override;
Pentagram::istring *binding;
Gump *invoker;
};
diff --git a/engines/ultima/ultima8/gumps/container_gump.h b/engines/ultima/ultima8/gumps/container_gump.h
index 4342545..dad2fda 100644
--- a/engines/ultima/ultima8/gumps/container_gump.h
+++ b/engines/ultima/ultima8/gumps/container_gump.h
@@ -46,38 +46,38 @@ public:
}
// Close the gump
- virtual void Close(bool no_del = false);
+ virtual void Close(bool no_del = false) override;
// Init the gump, call after construction
- virtual void InitGump(Gump *newparent, bool take_focus = true);
+ virtual void InitGump(Gump *newparent, bool take_focus = true) override;
// Paint the Gump
- virtual void PaintThis(RenderSurface *, int32 lerp_factor, bool scaled);
+ virtual void PaintThis(RenderSurface *, int32 lerp_factor, bool scaled) override;
// Trace a click, and return ObjId
- virtual uint16 TraceObjId(int32 mx, int32 my);
+ virtual uint16 TraceObjId(int32 mx, int32 my) override;
// Get the location of an item in the gump (coords relative to this).
// Returns false on failure.
virtual bool GetLocationOfItem(uint16 itemid, int32 &gx, int32 &gy,
- int32 lerp_factor = 256);
+ int32 lerp_factor = 256) override;
- virtual bool StartDraggingItem(Item *item, int mx, int my);
- virtual bool DraggingItem(Item *item, int mx, int my);
- virtual void DraggingItemLeftGump(Item *item);
- virtual void StopDraggingItem(Item *item, bool moved);
- virtual void DropItem(Item *item, int mx, int my);
+ virtual bool StartDraggingItem(Item *item, int mx, int my) override;
+ virtual bool DraggingItem(Item *item, int mx, int my) override;
+ virtual void DraggingItemLeftGump(Item *item) override;
+ virtual void StopDraggingItem(Item *item, bool moved) override;
+ virtual void DropItem(Item *item, int mx, int my) override;
- virtual Gump *OnMouseDown(int button, int32 mx, int32 my);
- virtual void OnMouseClick(int button, int32 mx, int32 my);
- virtual void OnMouseDouble(int button, int32 mx, int32 my);
+ virtual Gump *OnMouseDown(int button, int32 mx, int32 my) override;
+ virtual void OnMouseClick(int button, int32 mx, int32 my) override;
+ virtual void OnMouseDouble(int button, int32 mx, int32 my) override;
bool loadData(IDataSource *ids, uint32 version);
protected:
- virtual void saveData(ODataSource *ods);
+ virtual void saveData(ODataSource *ods) override;
- virtual void GetItemLocation(int32 lerp_factor);
+ virtual void GetItemLocation(int32 lerp_factor) override;
virtual Container *getTargetContainer(Item *item, int mx, int my);
diff --git a/engines/ultima/ultima8/gumps/controls_gump.cpp b/engines/ultima/ultima8/gumps/controls_gump.cpp
index db0428a..e35f666 100644
--- a/engines/ultima/ultima8/gumps/controls_gump.cpp
+++ b/engines/ultima/ultima8/gumps/controls_gump.cpp
@@ -45,8 +45,8 @@ public:
ENABLE_RUNTIME_CLASSTYPE()
ControlEntryGump(int x_, int y_, int width, const char *binding, const char *name);
virtual ~ControlEntryGump(void);
- virtual void InitGump(Gump *newparent, bool take_focus = true);
- virtual void ChildNotify(Gump *child, uint32 message);
+ virtual void InitGump(Gump *newparent, bool take_focus = true) override;
+ virtual void ChildNotify(Gump *child, uint32 message) override;
void init();
protected:
Pentagram::istring bindingName;
diff --git a/engines/ultima/ultima8/gumps/controls_gump.h b/engines/ultima/ultima8/gumps/controls_gump.h
index 2f86a4f..3862ef8 100644
--- a/engines/ultima/ultima8/gumps/controls_gump.h
+++ b/engines/ultima/ultima8/gumps/controls_gump.h
@@ -39,13 +39,13 @@ public:
virtual ~ControlsGump(void);
// Init the gump, call after construction
- virtual void InitGump(Gump *newparent, bool take_focus = true);
+ virtual void InitGump(Gump *newparent, bool take_focus = true) override;
// Paint the Gump
- virtual void PaintThis(RenderSurface *, int32 lerp_factor, bool scaled);
+ virtual void PaintThis(RenderSurface *, int32 lerp_factor, bool scaled) override;
- virtual bool OnKeyDown(int key, int mod);
- virtual void ChildNotify(Gump *child, uint32 message);
+ virtual bool OnKeyDown(int key, int mod) override;
+ virtual void ChildNotify(Gump *child, uint32 message) override;
static void showEngineMenu(PagedGump *pagedgump);
static void showU8Menu(PagedGump *pagedgump);
@@ -53,7 +53,7 @@ public:
bool loadData(IDataSource *ids);
protected:
- virtual void saveData(ODataSource *ods);
+ virtual void saveData(ODataSource *ods) override;
};
} // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/gumps/mini_stats_gump.h b/engines/ultima/ultima8/gumps/mini_stats_gump.h
index 42f0216..f7b3400 100644
--- a/engines/ultima/ultima8/gumps/mini_stats_gump.h
+++ b/engines/ultima/ultima8/gumps/mini_stats_gump.h
@@ -39,20 +39,20 @@ public:
virtual ~MiniStatsGump(void);
// Init the gump, call after construction
- virtual void InitGump(Gump *newparent, bool take_focus = true);
+ virtual void InitGump(Gump *newparent, bool take_focus = true) override;
// Paint this Gump
- virtual void PaintThis(RenderSurface *, int32 lerp_factor, bool scaled);
+ virtual void PaintThis(RenderSurface *, int32 lerp_factor, bool scaled) override;
// Trace a click, and return ObjId
- virtual uint16 TraceObjId(int32 mx, int32 my);
+ virtual uint16 TraceObjId(int32 mx, int32 my) override;
- virtual Gump *OnMouseDown(int button, int32 mx, int32 my);
- virtual void OnMouseDouble(int button, int32 mx, int32 my);
+ virtual Gump *OnMouseDown(int button, int32 mx, int32 my) override;
+ virtual void OnMouseDouble(int button, int32 mx, int32 my) override;
bool loadData(IDataSource *ids, uint32 version);
protected:
- virtual void saveData(ODataSource *ods);
+ virtual void saveData(ODataSource *ods) override;
};
} // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/gumps/options_gump.h b/engines/ultima/ultima8/gumps/options_gump.h
index 3f09032..e20e0d4 100644
--- a/engines/ultima/ultima8/gumps/options_gump.h
+++ b/engines/ultima/ultima8/gumps/options_gump.h
@@ -37,17 +37,17 @@ public:
virtual ~OptionsGump(void);
// Init the gump, call after construction
- virtual void InitGump(Gump *newparent, bool take_focus = true);
+ virtual void InitGump(Gump *newparent, bool take_focus = true) override;
// Paint the Gump
- virtual void PaintThis(RenderSurface *, int32 lerp_factor, bool scaled);
+ virtual void PaintThis(RenderSurface *, int32 lerp_factor, bool scaled) override;
- virtual bool OnKeyDown(int key, int mod);
- virtual void ChildNotify(Gump *child, uint32 message);
+ virtual bool OnKeyDown(int key, int mod) override;
+ virtual void ChildNotify(Gump *child, uint32 message) override;
bool loadData(IDataSource *ids);
protected:
- virtual void saveData(ODataSource *ods);
+ virtual void saveData(ODataSource *ods) override;
virtual void selectEntry(int entry);
};
diff --git a/engines/ultima/ultima8/gumps/paged_gump.h b/engines/ultima/ultima8/gumps/paged_gump.h
index 978a5d3..d75318c 100644
--- a/engines/ultima/ultima8/gumps/paged_gump.h
+++ b/engines/ultima/ultima8/gumps/paged_gump.h
@@ -37,14 +37,14 @@ public:
virtual ~PagedGump(void);
// Init the gump, call after construction
- virtual void InitGump(Gump *newparent, bool take_focus = true);
- virtual void Close(bool no_del = false);
+ virtual void InitGump(Gump *newparent, bool take_focus = true) override;
+ virtual void Close(bool no_del = false) override;
// Paint the Gump
- virtual void PaintThis(RenderSurface *, int32 lerp_factor, bool scaled);
+ virtual void PaintThis(RenderSurface *, int32 lerp_factor, bool scaled) override;
- virtual bool OnKeyDown(int key, int mod);
- virtual void ChildNotify(Gump *child, uint32 message);
+ virtual bool OnKeyDown(int key, int mod) override;
+ virtual void ChildNotify(Gump *child, uint32 message) override;
//! add a page. Note: g already has to be a child gump.
void addPage(Gump *g);
@@ -55,7 +55,7 @@ public:
bool loadData(IDataSource *ids);
protected:
- virtual void saveData(ODataSource *ods);
+ virtual void saveData(ODataSource *ods) override;
int leftOff, rightOff, topOff, gumpShape;
Std::vector<Gump *> gumps;
Gump *nextButton;
diff --git a/engines/ultima/ultima8/gumps/paperdoll_gump.h b/engines/ultima/ultima8/gumps/paperdoll_gump.h
index bae00cc..ee27e96 100644
--- a/engines/ultima/ultima8/gumps/paperdoll_gump.h
+++ b/engines/ultima/ultima8/gumps/paperdoll_gump.h
@@ -41,31 +41,31 @@ public:
virtual ~PaperdollGump(void);
// Init the gump, call after construction
- virtual void InitGump(Gump *newparent, bool take_focus = true);
+ virtual void InitGump(Gump *newparent, bool take_focus = true) override;
// Close the gump
- virtual void Close(bool no_del = false);
+ virtual void Close(bool no_del = false) override;
// Paint this Gump
- virtual void PaintThis(RenderSurface *, int32 lerp_factor, bool scaled);
+ virtual void PaintThis(RenderSurface *, int32 lerp_factor, bool scaled) override;
- virtual void ChildNotify(Gump *child, uint32 message);
+ virtual void ChildNotify(Gump *child, uint32 message) override;
// Trace a click, and return ObjId
- virtual uint16 TraceObjId(int32 mx, int32 my);
+ virtual uint16 TraceObjId(int32 mx, int32 my) override;
// Get the location of an item in the gump (coords relative to this).
// Returns false on failure.
virtual bool GetLocationOfItem(uint16 itemid, int32 &gx, int32 &gy,
- int32 lerp_factor = 256);
+ int32 lerp_factor = 256) override;
- virtual bool StartDraggingItem(Item *item, int mx, int my);
- virtual bool DraggingItem(Item *item, int mx, int my);
- virtual void DropItem(Item *item, int mx, int my);
+ virtual bool StartDraggingItem(Item *item, int mx, int my) override;
+ virtual bool DraggingItem(Item *item, int mx, int my) override;
+ virtual void DropItem(Item *item, int mx, int my) override;
bool loadData(IDataSource *ids, uint32 version);
protected:
- virtual void saveData(ODataSource *ods);
+ virtual void saveData(ODataSource *ods) override;
//! Paint the stats
void PaintStats(RenderSurface *, int32 lerp_factor);
diff --git a/engines/ultima/ultima8/gumps/slider_gump.h b/engines/ultima/ultima8/gumps/slider_gump.h
index b968040..5593f5e 100644
--- a/engines/ultima/ultima8/gumps/slider_gump.h
+++ b/engines/ultima/ultima8/gumps/slider_gump.h
@@ -41,23 +41,23 @@ public:
int16 value, int16 delta = 1);
virtual ~SliderGump(void);
- virtual void InitGump(Gump *newparent, bool take_focus = true);
- virtual void PaintThis(RenderSurface *surf, int32 lerp_factor, bool scaled);
- virtual void Close(bool no_del = false);
- virtual void ChildNotify(Gump *child, uint32 message);
+ virtual void InitGump(Gump *newparent, bool take_focus = true) override;
+ virtual void PaintThis(RenderSurface *surf, int32 lerp_factor, bool scaled) override;
+ virtual void Close(bool no_del = false) override;
+ virtual void ChildNotify(Gump *child, uint32 message) override;
void setUsecodeNotify(UCProcess *ucp);
// Dragging
- virtual bool StartDraggingChild(Gump *gump, int32 mx, int32 my);
- virtual void DraggingChild(Gump *gump, int mx, int my);
- virtual void StopDraggingChild(Gump *gump);
+ virtual bool StartDraggingChild(Gump *gump, int32 mx, int32 my) override;
+ virtual void DraggingChild(Gump *gump, int mx, int my) override;
+ virtual void StopDraggingChild(Gump *gump) override;
- virtual bool OnKeyDown(int key, int mod);
+ virtual bool OnKeyDown(int key, int mod) override;
bool loadData(IDataSource *ids, uint32 version);
protected:
- virtual void saveData(ODataSource *ods);
+ virtual void saveData(ODataSource *ods) override;
int16 min;
int16 max;
diff --git a/engines/ultima/ultima8/gumps/u8_save_gump.h b/engines/ultima/ultima8/gumps/u8_save_gump.h
index f5a514d..dd56cb4 100644
--- a/engines/ultima/ultima8/gumps/u8_save_gump.h
+++ b/engines/ultima/ultima8/gumps/u8_save_gump.h
@@ -40,14 +40,14 @@ public:
U8SaveGump(bool save, int page);
virtual ~U8SaveGump();
- virtual void InitGump(Gump *newparent, bool take_focus = true);
- virtual void Close(bool no_del = false);
-
- virtual Gump *OnMouseDown(int button, int32 mx, int32 my);
- virtual void OnMouseClick(int button, int32 mx, int32 my);
- virtual bool OnKeyDown(int key, int mod);
- virtual void ChildNotify(Gump *child, uint32 message);
- virtual void OnFocus(bool gain);
+ virtual void InitGump(Gump *newparent, bool take_focus = true) override;
+ virtual void Close(bool no_del = false) override;
+
+ virtual Gump *OnMouseDown(int button, int32 mx, int32 my) override;
+ virtual void OnMouseClick(int button, int32 mx, int32 my) override;
+ virtual bool OnKeyDown(int key, int mod) override;
+ virtual void ChildNotify(Gump *child, uint32 message) override;
+ virtual void OnFocus(bool gain) override;
static Std::string getFilename(int index);
diff --git a/engines/ultima/ultima8/gumps/widgets/button_widget.h b/engines/ultima/ultima8/gumps/widgets/button_widget.h
index e5c0a96..8c9e1f5 100644
--- a/engines/ultima/ultima8/gumps/widgets/button_widget.h
+++ b/engines/ultima/ultima8/gumps/widgets/button_widget.h
@@ -43,17 +43,17 @@ public:
bool mouseOver = false, int32 layer = LAYER_NORMAL);
virtual ~ButtonWidget(void);
- virtual void InitGump(Gump *newparent, bool take_focus = true);
- virtual uint16 TraceObjId(int32 mx, int32 my);
- virtual bool PointOnGump(int mx, int my);
+ virtual void InitGump(Gump *newparent, bool take_focus = true) override;
+ virtual uint16 TraceObjId(int32 mx, int32 my) override;
+ virtual bool PointOnGump(int mx, int my) override;
- virtual Gump *OnMouseDown(int button, int32 mx, int32 my);
- virtual void OnMouseUp(int button, int32 mx, int32 my);
- virtual void OnMouseClick(int button, int32 mx, int32 my);
- virtual void OnMouseDouble(int button, int32 mx, int32 my);
+ virtual Gump *OnMouseDown(int button, int32 mx, int32 my) override;
+ virtual void OnMouseUp(int button, int32 mx, int32 my) override;
+ virtual void OnMouseClick(int button, int32 mx, int32 my) override;
+ virtual void OnMouseDouble(int button, int32 mx, int32 my) override;
- virtual void OnMouseOver();
- virtual void OnMouseLeft();
+ virtual void OnMouseOver() override;
+ virtual void OnMouseLeft() override;
//! return the textwidget's vlead, or 0 for an image button
int getVlead();
@@ -80,7 +80,7 @@ protected:
public:
bool loadData(IDataSource *ids, uint32 version);
protected:
- virtual void saveData(ODataSource *ods);
+ virtual void saveData(ODataSource *ods) override;
};
} // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/gumps/widgets/edit_widget.h b/engines/ultima/ultima8/gumps/widgets/edit_widget.h
index f4d2bef..4b8f62f 100644
--- a/engines/ultima/ultima8/gumps/widgets/edit_widget.h
+++ b/engines/ultima/ultima8/gumps/widgets/edit_widget.h
@@ -48,15 +48,15 @@ public:
bool multiline = false);
virtual ~EditWidget(void);
- virtual void InitGump(Gump *newparent, bool take_focus = true);
+ virtual void InitGump(Gump *newparent, bool take_focus = true) override;
- virtual void PaintThis(RenderSurface *, int32 lerp_factor, bool scaled);
- virtual void PaintComposited(RenderSurface *surf, int32 lerp_factor, int32 sx, int32 sy);
+ virtual void PaintThis(RenderSurface *, int32 lerp_factor, bool scaled) override;
+ virtual void PaintComposited(RenderSurface *surf, int32 lerp_factor, int32 sx, int32 sy) override;
- virtual Gump *OnMouseMotion(int32 mx, int32 my);
- virtual bool OnKeyDown(int key, int mod);
- virtual bool OnKeyUp(int key);
- virtual bool OnTextInput(int unicode);
+ virtual Gump *OnMouseMotion(int32 mx, int32 my) override;
+ virtual bool OnKeyDown(int key, int mod) override;
+ virtual bool OnKeyUp(int key) override;
+ virtual bool OnTextInput(int unicode) override;
//! get the current text
Std::string getText() const {
diff --git a/engines/ultima/ultima8/gumps/widgets/game_widget.h b/engines/ultima/ultima8/gumps/widgets/game_widget.h
index 8858815..ef878c8 100644
--- a/engines/ultima/ultima8/gumps/widgets/game_widget.h
+++ b/engines/ultima/ultima8/gumps/widgets/game_widget.h
@@ -41,17 +41,17 @@ public:
Pentagram::istring getGameName();
- virtual void InitGump(Gump *newparent, bool take_focus = true);
+ virtual void InitGump(Gump *newparent, bool take_focus = true) override;
- virtual uint16 TraceObjId(int32 mx, int32 my);
+ virtual uint16 TraceObjId(int32 mx, int32 my) override;
- virtual void PaintThis(RenderSurface *, int32 lerp_factor, bool scaled);
+ virtual void PaintThis(RenderSurface *, int32 lerp_factor, bool scaled) override;
- virtual Gump *OnMouseDown(int button, int32 mx, int32 my);
- virtual void OnMouseOver();
- virtual void OnMouseLeft();
+ virtual Gump *OnMouseDown(int button, int32 mx, int32 my) override;
+ virtual void OnMouseOver() override;
+ virtual void OnMouseLeft() override;
- virtual void ChildNotify(Gump *child, uint32 message);
+ virtual void ChildNotify(Gump *child, uint32 message) override;
enum Message {
GAME_PLAY = 1,
diff --git a/engines/ultima/ultima8/gumps/widgets/sliding_widget.h b/engines/ultima/ultima8/gumps/widgets/sliding_widget.h
index 93b76c0..be12520 100644
--- a/engines/ultima/ultima8/gumps/widgets/sliding_widget.h
+++ b/engines/ultima/ultima8/gumps/widgets/sliding_widget.h
@@ -37,12 +37,12 @@ public:
SlidingWidget(int x, int y, Shape *shape, uint32 framenum);
virtual ~SlidingWidget();
- virtual void InitGump(Gump *newparent, bool take_focus = true);
- virtual uint16 TraceObjId(int32 mx, int32 my);
+ virtual void InitGump(Gump *newparent, bool take_focus = true) override;
+ virtual uint16 TraceObjId(int32 mx, int32 my) override;
bool loadData(IDataSource *ids, uint32 version);
protected:
- virtual void saveData(ODataSource *ods);
+ virtual void saveData(ODataSource *ods) override;
};
} // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/gumps/widgets/text_widget.h b/engines/ultima/ultima8/gumps/widgets/text_widget.h
index fcac256..14c5ab9 100644
--- a/engines/ultima/ultima8/gumps/widgets/text_widget.h
+++ b/engines/ultima/ultima8/gumps/widgets/text_widget.h
@@ -63,14 +63,14 @@ public:
virtual ~TextWidget(void);
// Init the gump, call after construction
- virtual void InitGump(Gump *newparent, bool take_focus = true);
+ virtual void InitGump(Gump *newparent, bool take_focus = true) override;
// Overloadable method to Paint just this Gump (RenderSurface is relative to this)
- virtual void PaintThis(RenderSurface *, int32 lerp_factor, bool scaled);
+ virtual void PaintThis(RenderSurface *, int32 lerp_factor, bool scaled) override;
- virtual void PaintComposited(RenderSurface *surf, int32 lerp_factor, int32 scalex, int32 scaley);
+ virtual void PaintComposited(RenderSurface *surf, int32 lerp_factor, int32 scalex, int32 scaley) override;
- virtual Gump *OnMouseMotion(int32 mx, int32 my);
+ virtual Gump *OnMouseMotion(int32 mx, int32 my) override;
//! display the next part of the text
//! \return false if there is no more text to display
@@ -104,7 +104,7 @@ public:
bool loadData(IDataSource *ids, uint32 version);
protected:
- virtual void saveData(ODataSource *ods);
+ virtual void saveData(ODataSource *ods) override;
};
} // End of namespace Ultima8
Commit: 1d81fadc9eaa179adb112a24992b7f047122813e
https://github.com/scummvm/scummvm/commit/1d81fadc9eaa179adb112a24992b7f047122813e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-03T10:49:46+01:00
Commit Message:
ULTIMA: Final touches on override handing
Changed paths:
engines/ultima/ultima8/kernel/segmented_allocator.h
engines/ultima/ultima8/kernel/segmented_pool.h
engines/ultima/ultima8/world/glob_egg.h
diff --git a/engines/ultima/ultima8/kernel/segmented_allocator.h b/engines/ultima/ultima8/kernel/segmented_allocator.h
index 1aab327..f8ec628 100644
--- a/engines/ultima/ultima8/kernel/segmented_allocator.h
+++ b/engines/ultima/ultima8/kernel/segmented_allocator.h
@@ -38,17 +38,17 @@ public:
ENABLE_RUNTIME_CLASSTYPE()
- virtual void *allocate(size_t size);
+ virtual void *allocate(size_t size) override;
- virtual Pool *findPool(void *ptr);
+ virtual Pool *findPool(void *ptr) override;
- virtual void freeResources();
+ virtual void freeResources() override;
- virtual size_t getCapacity() {
+ virtual size_t getCapacity() override {
return nodeCapacity;
}
- void printInfo();
+ virtual void printInfo() override;
private:
Std::vector<SegmentedPool *> pools;
diff --git a/engines/ultima/ultima8/kernel/segmented_pool.h b/engines/ultima/ultima8/kernel/segmented_pool.h
index e213ca1..ac6068e 100644
--- a/engines/ultima/ultima8/kernel/segmented_pool.h
+++ b/engines/ultima/ultima8/kernel/segmented_pool.h
@@ -48,21 +48,21 @@ public:
ENABLE_RUNTIME_CLASSTYPE()
- virtual void *allocate(size_t size);
- virtual void deallocate(void *ptr);
+ virtual void *allocate(size_t size) override;
+ virtual void deallocate(void *ptr) override;
- virtual bool isFull() {
+ virtual bool isFull() override {
return freeNodeCount == 0;
}
- virtual bool isEmpty() {
+ virtual bool isEmpty() override {
return freeNodeCount == nodes;
}
- virtual bool inPool(void *ptr) {
+ virtual bool inPool(void *ptr) override {
return (ptr > startOfPool && ptr < endOfPool);
}
- void printInfo();
+ virtual void printInfo() override;
size_t getNodeCapacity() {
return nodeCapacity;
diff --git a/engines/ultima/ultima8/world/glob_egg.h b/engines/ultima/ultima8/world/glob_egg.h
index 9a205a7..1abb738 100644
--- a/engines/ultima/ultima8/world/glob_egg.h
+++ b/engines/ultima/ultima8/world/glob_egg.h
@@ -40,11 +40,11 @@ public:
ENABLE_RUNTIME_CLASSTYPE()
//! The item has entered the fast area
- virtual void enterFastArea();
+ virtual void enterFastArea() override;
bool loadData(IDataSource *ids, uint32 version);
protected:
- virtual void saveData(ODataSource *ods);
+ virtual void saveData(ODataSource *ods) override;
};
} // End of namespace Ultima8
More information about the Scummvm-git-logs
mailing list