[Scummvm-git-logs] scummvm master -> 4ff77410ab7d2abefa7fd791b1a8b0532b5e738f
bluegr
noreply at scummvm.org
Sun Nov 14 11:37:14 UTC 2021
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:
4ff77410ab BURIED: Use override
Commit: 4ff77410ab7d2abefa7fd791b1a8b0532b5e738f
https://github.com/scummvm/scummvm/commit/4ff77410ab7d2abefa7fd791b1a8b0532b5e738f
Author: Orgad Shaneh (orgads at gmail.com)
Date: 2021-11-14T13:37:12+02:00
Commit Message:
BURIED: Use override
Using clang-tidy modernize-use-override
Changed paths:
engines/buried/biochip_view.cpp
engines/buried/environ/agent3_lair.cpp
engines/buried/environ/ai_lab.cpp
engines/buried/environ/alien.cpp
engines/buried/environ/castle.cpp
engines/buried/environ/da_vinci.cpp
engines/buried/environ/future_apartment.cpp
engines/buried/environ/mayan.cpp
engines/buried/environ/scene_factory.cpp
diff --git a/engines/buried/biochip_view.cpp b/engines/buried/biochip_view.cpp
index a57dc72264..dcd8cf1b0c 100644
--- a/engines/buried/biochip_view.cpp
+++ b/engines/buried/biochip_view.cpp
@@ -94,10 +94,10 @@ class JumpBiochipViewWindow : public Window {
public:
JumpBiochipViewWindow(BuriedEngine *vm, Window *parent);
- void onPaint();
- void onLButtonDown(const Common::Point &point, uint flags);
- void onLButtonUp(const Common::Point &point, uint flags);
- void onMouseMove(const Common::Point &point, uint flags);
+ void onPaint() override;
+ void onLButtonDown(const Common::Point &point, uint flags) override;
+ void onLButtonUp(const Common::Point &point, uint flags) override;
+ void onMouseMove(const Common::Point &point, uint flags) override;
private:
Common::Rect _missionBriefing;
@@ -366,8 +366,8 @@ public:
EvidenceBioChipViewWindow(BuriedEngine *vm, Window *parent);
~EvidenceBioChipViewWindow();
- void onPaint();
- void onLButtonUp(const Common::Point &point, uint flags);
+ void onPaint() override;
+ void onLButtonUp(const Common::Point &point, uint flags) override;
private:
Common::Rect _evidence[6];
@@ -501,10 +501,10 @@ public:
InterfaceBioChipViewWindow(BuriedEngine *vm, Window *parent);
~InterfaceBioChipViewWindow();
- void onPaint();
- void onLButtonDown(const Common::Point &point, uint flags);
- void onLButtonUp(const Common::Point &point, uint flags);
- void onMouseMove(const Common::Point &point, uint flags);
+ void onPaint() override;
+ void onLButtonDown(const Common::Point &point, uint flags) override;
+ void onLButtonUp(const Common::Point &point, uint flags) override;
+ void onMouseMove(const Common::Point &point, uint flags) override;
private:
Common::Rect _save;
@@ -674,8 +674,8 @@ class FilesBioChipViewWindow : public Window {
public:
FilesBioChipViewWindow(BuriedEngine *vm, Window *parent);
- void onPaint();
- void onLButtonUp(const Common::Point &point, uint flags);
+ void onPaint() override;
+ void onLButtonUp(const Common::Point &point, uint flags) override;
private:
int _curPage;
diff --git a/engines/buried/environ/agent3_lair.cpp b/engines/buried/environ/agent3_lair.cpp
index ffb75b5242..213aed17a6 100644
--- a/engines/buried/environ/agent3_lair.cpp
+++ b/engines/buried/environ/agent3_lair.cpp
@@ -42,10 +42,10 @@ namespace Buried {
class LairEntry : public SceneBase {
public:
LairEntry(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int postEnterRoom(Window *viewWindow, const Location &priorLocation);
- int preExitRoom(Window *viewWindow, const Location &newLocation);
- int timerCallback(Window *viewWindow);
- int onCharacter(Window *viewWindow, const Common::KeyState &character);
+ int postEnterRoom(Window *viewWindow, const Location &priorLocation) override;
+ int preExitRoom(Window *viewWindow, const Location &newLocation) override;
+ int timerCallback(Window *viewWindow) override;
+ int onCharacter(Window *viewWindow, const Common::KeyState &character) override;
private:
int _movieIndex;
@@ -397,9 +397,9 @@ int LairEntry::onCharacter(Window *viewWindow, const Common::KeyState &character
class ReplicatorInterface : public SceneBase {
public:
ReplicatorInterface(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int postExitRoom(Window *viewWindow, const Location &newLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int postExitRoom(Window *viewWindow, const Location &newLocation) override;
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
int _currentItem;
@@ -482,12 +482,12 @@ class TransporterControls : public SceneBase {
public:
TransporterControls(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
~TransporterControls();
- void preDestructor();
- int postExitRoom(Window *viewWindow, const Location &newLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
- int onCharacter(Window *viewWindow, const Common::KeyState &character);
- int gdiPaint(Window *viewWindow);
+ void preDestructor() override;
+ int postExitRoom(Window *viewWindow, const Location &newLocation) override;
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
+ int onCharacter(Window *viewWindow, const Common::KeyState &character) override;
+ int gdiPaint(Window *viewWindow) override;
private:
Common::Rect _monitor, _retract;
@@ -671,8 +671,8 @@ int TransporterControls::gdiPaint(Window *viewWindow) {
class GeneratorCoreZoom : public SceneBase {
public:
GeneratorCoreZoom(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _clickableArea;
@@ -718,11 +718,11 @@ int GeneratorCoreZoom::specifyCursor(Window *viewWindow, const Common::Point &po
class GeneratorCoreAcquire : public SceneBase {
public:
GeneratorCoreAcquire(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int mouseDown(Window *viewWindow, const Common::Point &pointLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int draggingItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags);
- int droppedItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int mouseDown(Window *viewWindow, const Common::Point &pointLocation) override;
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int draggingItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags) override;
+ int droppedItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
int _currentStatus;
@@ -831,8 +831,8 @@ int GeneratorCoreAcquire::specifyCursor(Window *viewWindow, const Common::Point
class ZoomInPostItAndINN : public SceneBase {
public:
ZoomInPostItAndINN(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _postItNote;
@@ -883,7 +883,7 @@ int ZoomInPostItAndINN::specifyCursor(Window *viewWindow, const Common::Point &p
class CompleteTransport : public SceneBase {
public:
CompleteTransport(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int timerCallback(Window *viewWindow);
+ int timerCallback(Window *viewWindow) override;
};
CompleteTransport::CompleteTransport(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation) :
@@ -939,7 +939,7 @@ ClickChangeScenePostIt::ClickChangeScenePostIt(BuriedEngine *vm, Window *viewWin
class PlayTransporterClosing : public SceneBase {
public:
PlayTransporterClosing(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int postExitRoom(Window *viewWindow, const Location &newLocation);
+ int postExitRoom(Window *viewWindow, const Location &newLocation) override;
};
PlayTransporterClosing::PlayTransporterClosing(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation) :
diff --git a/engines/buried/environ/ai_lab.cpp b/engines/buried/environ/ai_lab.cpp
index d47a5bb1c3..1da9f93acf 100644
--- a/engines/buried/environ/ai_lab.cpp
+++ b/engines/buried/environ/ai_lab.cpp
@@ -52,9 +52,9 @@ enum {
class BaseOxygenTimer : public SceneBase {
public:
BaseOxygenTimer(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- virtual int postEnterRoom(Window *viewWindow, const Location &priorLocation);
- virtual int preExitRoom(Window *viewWindow, const Location &priorLocation);
- virtual int timerCallback(Window *viewWindow);
+ int postEnterRoom(Window *viewWindow, const Location &priorLocation) override;
+ int preExitRoom(Window *viewWindow, const Location &priorLocation) override;
+ int timerCallback(Window *viewWindow) override;
protected:
uint32 _entryStartTime;
@@ -183,9 +183,9 @@ public:
int left = -1, int top = -1, int right = -1, int bottom = -1, int openFrame = -1, int closedFrame = -1, int depth = -1,
int transitionType = -1, int transitionData = -1, int transitionStartFrame = -1, int transitionLength = -1,
int doorFlag = -1, int doorFlagValue = 0);
- int mouseDown(Window *viewWindow, const Common::Point &pointLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int mouseDown(Window *viewWindow, const Common::Point &pointLocation) override;
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
bool _clicked;
@@ -431,8 +431,8 @@ int PlayArthurOffsetTimed::postEnterRoom(Window *viewWindow, const Location &pri
class HabitatWingIceteroidDoor : public BaseOxygenTimer {
public:
HabitatWingIceteroidDoor(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _doorHandle;
@@ -496,8 +496,8 @@ public:
IceteroidPodTimed(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation,
int left = -1, int top = -1, int right = -1, int bottom = -1, int animID = -1, int timeZone = -1,
int environment = -1, int node = -1, int facing = -1, int orientation = -1, int depth = -1);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _engageButton;
@@ -535,8 +535,8 @@ public:
IceteroidElevatorExtremeControls(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation,
int upTimeZone = -1, int upEnvironment = -1, int upNode = -1, int upFacing = -1, int upOrientation = -1, int upDepth = -1, int upAnimID = -1,
int downTimeZone = -1, int downEnvironment = -1, int downNode = -1, int downFacing = -1, int downOrientation = -1, int downDepth = -1, int downAnimID = -1);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _up, _down;
@@ -591,8 +591,8 @@ int IceteroidElevatorExtremeControls::specifyCursor(Window *viewWindow, const Co
class IceteroidZoomInMineControls : public BaseOxygenTimer {
public:
IceteroidZoomInMineControls(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _controls;
@@ -629,8 +629,8 @@ int IceteroidZoomInMineControls::specifyCursor(Window *viewWindow, const Common:
class IceteroidMineControls : public BaseOxygenTimer {
public:
IceteroidMineControls(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _mineButton, _makeOxygenButton;
@@ -708,8 +708,8 @@ int IceteroidMineControls::specifyCursor(Window *viewWindow, const Common::Point
class IceteroidZoomInDispenser : public BaseOxygenTimer {
public:
IceteroidZoomInDispenser(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _controls;
@@ -899,7 +899,7 @@ int IceteroidDispenserControls::droppedItem(Window *viewWindow, int itemID, cons
class PlaySoundExitingForward : public BaseOxygenTimer {
public:
PlaySoundExitingForward(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation, int soundFileNameID);
- int postExitRoom(Window *viewWindow, const Location &newLocation);
+ int postExitRoom(Window *viewWindow, const Location &newLocation) override;
private:
int _soundFileNameID;
@@ -920,8 +920,8 @@ int PlaySoundExitingForward::postExitRoom(Window *viewWindow, const Location &ne
class TakeWaterCanister : public BaseOxygenTimer {
public:
TakeWaterCanister(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int mouseDown(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int mouseDown(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _canister;
@@ -968,8 +968,8 @@ int TakeWaterCanister::specifyCursor(Window *viewWindow, const Common::Point &po
class ScienceWingZoomIntoPanel : public BaseOxygenTimer {
public:
ScienceWingZoomIntoPanel(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
int _cursorID;
@@ -1007,10 +1007,10 @@ class ScienceWingPanelInterface : public BaseOxygenTimer {
public:
ScienceWingPanelInterface(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
~ScienceWingPanelInterface();
- void preDestructor();
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
- int gdiPaint(Window *viewWindow);
+ void preDestructor() override;
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
+ int gdiPaint(Window *viewWindow) override;
private:
Common::Rect _stationRegions[15];
@@ -1238,8 +1238,8 @@ int ScienceWingPanelInterface::gdiPaint(Window *viewWindow) {
class ScienceWingMachineRoomDoor : public BaseOxygenTimer {
public:
ScienceWingMachineRoomDoor(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
int _cursorID;
@@ -1357,10 +1357,10 @@ int NexusDoor::specifyCursor(Window *viewWindow, const Common::Point &pointLocat
class NexusPuzzle : public SceneBase {
public:
NexusPuzzle(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int postEnterRoom(Window *viewWindow, const Location &priorLocation);
- int gdiPaint(Window *viewWindow);
- int mouseDown(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int postEnterRoom(Window *viewWindow, const Location &priorLocation) override;
+ int gdiPaint(Window *viewWindow) override;
+ int mouseDown(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _lights[7];
@@ -1577,7 +1577,7 @@ int NexusPuzzle::specifyCursor(Window *viewWindow, const Common::Point &pointLoc
class NexusEnd : public SceneBase {
public:
NexusEnd(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int postEnterRoom(Window *viewWindow, const Location &priorLocation);
+ int postEnterRoom(Window *viewWindow, const Location &priorLocation) override;
};
NexusEnd::NexusEnd(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation) :
@@ -1619,8 +1619,8 @@ class HabitatWingLockedDoor : public BaseOxygenTimer {
public:
HabitatWingLockedDoor(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation,
int newFrameID = -1, int beepSoundID = -1, int voSoundID = -1, int left = 0, int top = 0, int right = 0, int bottom = 0);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
int _newFrameID;
@@ -1679,9 +1679,9 @@ BaseOxygenTimerInSpace::BaseOxygenTimerInSpace(BuriedEngine *vm, Window *viewWin
class BaseOxygenTimerCapacitance : public SceneBase {
public:
BaseOxygenTimerCapacitance(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- virtual int postEnterRoom(Window *viewWindow, const Location &priorLocation);
- virtual int preExitRoom(Window *viewWindow, const Location &priorLocation);
- virtual int timerCallback(Window *viewWindow);
+ int postEnterRoom(Window *viewWindow, const Location &priorLocation) override;
+ int preExitRoom(Window *viewWindow, const Location &priorLocation) override;
+ int timerCallback(Window *viewWindow) override;
protected:
uint32 _entryStartTime;
@@ -1804,11 +1804,11 @@ int BaseOxygenTimerCapacitance::timerCallback(Window *viewWindow) {
class CapacitanceToHabitatDoorClosed : public BaseOxygenTimerCapacitance {
public:
CapacitanceToHabitatDoorClosed(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int mouseDown(Window *viewWindow, const Common::Point &pointLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
- int draggingItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags);
- int droppedItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags);
+ int mouseDown(Window *viewWindow, const Common::Point &pointLocation) override;
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
+ int draggingItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags) override;
+ int droppedItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags) override;
private:
Common::Rect _metalBar;
@@ -1935,11 +1935,11 @@ int CapacitanceToHabitatDoorClosed::droppedItem(Window *viewWindow, int itemID,
class CapacitanceToHabitatDoorOpen : public BaseOxygenTimerCapacitance {
public:
CapacitanceToHabitatDoorOpen(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int postExitRoom(Window *viewWindow, const Location &newLocation);
- int mouseDown(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
- int draggingItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags);
- int droppedItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags);
+ int postExitRoom(Window *viewWindow, const Location &newLocation) override;
+ int mouseDown(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
+ int draggingItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags) override;
+ int droppedItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags) override;
private:
Common::Rect _metalBar;
@@ -2021,10 +2021,10 @@ class CapacitancePanelInterface : public BaseOxygenTimerCapacitance {
public:
CapacitancePanelInterface(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
~CapacitancePanelInterface();
- void preDestructor();
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
- int gdiPaint(Window *viewWindow);
+ void preDestructor() override;
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
+ int gdiPaint(Window *viewWindow) override;
private:
Common::Rect _stationRegions[15];
@@ -2393,8 +2393,8 @@ public:
int left = -1, int top = -1, int right = -1, int bottom = -1, int cursorID = 0,
int timeZone = -1, int environment = -1, int node = -1, int facing = -1, int orientation = -1, int depth = -1,
int transitionType = -1, int transitionData = -1, int transitionStartFrame = -1, int transitionLength = -1);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
int _cursorID;
@@ -2433,8 +2433,8 @@ int ClickChangeSceneCapacitance::specifyCursor(Window *viewWindow, const Common:
class CapacitanceDockingBayDoor : public BaseOxygenTimerCapacitance {
public:
CapacitanceDockingBayDoor(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _door;
@@ -2498,9 +2498,9 @@ int CapacitanceDockingBayDoor::specifyCursor(Window *viewWindow, const Common::P
class ScanningRoomEntryScan : public SceneBase {
public:
ScanningRoomEntryScan(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int postEnterRoom(Window *viewWindow, const Location &priorLocation);
- int postExitRoom(Window *viewWindow, const Location &newLocation);
- int timerCallback(Window *viewWindow);
+ int postEnterRoom(Window *viewWindow, const Location &priorLocation) override;
+ int postExitRoom(Window *viewWindow, const Location &newLocation) override;
+ int timerCallback(Window *viewWindow) override;
private:
DestinationScene _savedForwardData;
@@ -2562,8 +2562,8 @@ int ScanningRoomEntryScan::timerCallback(Window *viewWindow) {
class ScanningRoomWalkWarning : public SceneBase {
public:
ScanningRoomWalkWarning(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int postExitRoom(Window *viewWindow, const Location &newLocation);
- int timerCallback(Window *viewWindow);
+ int postExitRoom(Window *viewWindow, const Location &newLocation) override;
+ int timerCallback(Window *viewWindow) override;
private:
DestinationScene _savedForwardData;
@@ -2605,9 +2605,9 @@ int ScanningRoomWalkWarning::timerCallback(Window *viewWindow) {
class ScanningRoomDockingBayDoor : public SceneBase {
public:
ScanningRoomDockingBayDoor(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int timerCallback(Window *viewWindow);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int timerCallback(Window *viewWindow) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
bool _audioEnded;
@@ -2673,8 +2673,8 @@ int ScanningRoomDockingBayDoor::specifyCursor(Window *viewWindow, const Common::
class ScanningRoomScienceWingDoor : public SceneBase {
public:
ScanningRoomScienceWingDoor(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _doorRegion;
@@ -2714,9 +2714,9 @@ int ScanningRoomScienceWingDoor::specifyCursor(Window *viewWindow, const Common:
class ArthurScanningRoomConversation : public SceneBase {
public:
ArthurScanningRoomConversation(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int postEnterRoom(Window *viewWindow, const Location &priorLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int postEnterRoom(Window *viewWindow, const Location &priorLocation) override;
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _yes;
@@ -2820,9 +2820,9 @@ int ArthurScanningRoomConversation::specifyCursor(Window *viewWindow, const Comm
class ScanningRoomNexusDoorNormalFacing : public SceneBase {
public:
ScanningRoomNexusDoorNormalFacing(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int postEnterRoom(Window *viewWindow, const Location &priorLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int postEnterRoom(Window *viewWindow, const Location &priorLocation) override;
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _clickable;
@@ -2872,8 +2872,8 @@ int ScanningRoomNexusDoorNormalFacing::specifyCursor(Window *viewWindow, const C
class ScanningRoomNexusDoorZoomInCodePad : public SceneBase {
public:
ScanningRoomNexusDoorZoomInCodePad(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _controls;
@@ -2911,12 +2911,12 @@ class ScanningRoomNexusDoorCodePad : public SceneBase {
public:
ScanningRoomNexusDoorCodePad(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
~ScanningRoomNexusDoorCodePad();
- void preDestructor();
- int postEnterRoom(Window *viewWindow, const Location &priorLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int onCharacter(Window *viewWindow, const Common::KeyState &character);
- int gdiPaint(Window *viewWindow);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ void preDestructor() override;
+ int postEnterRoom(Window *viewWindow, const Location &priorLocation) override;
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int onCharacter(Window *viewWindow, const Common::KeyState &character) override;
+ int gdiPaint(Window *viewWindow) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _numbers[10];
@@ -3066,9 +3066,9 @@ int ScanningRoomNexusDoorCodePad::specifyCursor(Window *viewWindow, const Common
class ScanningRoomNexusDoorPullHandle : public SceneBase {
public:
ScanningRoomNexusDoorPullHandle(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int postEnterRoom(Window *viewWindow, const Location &priorLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int postEnterRoom(Window *viewWindow, const Location &priorLocation) override;
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _handle;
@@ -3114,8 +3114,8 @@ int ScanningRoomNexusDoorPullHandle::specifyCursor(Window *viewWindow, const Com
class MachineRoomExitDoor : public SceneBase {
public:
MachineRoomExitDoor(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _clickable;
@@ -3151,10 +3151,10 @@ int MachineRoomExitDoor::specifyCursor(Window *viewWindow, const Common::Point &
class MachineRoomTamperedSculpture : public SceneBase {
public:
MachineRoomTamperedSculpture(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int postEnterRoom(Window *viewWindow, const Location &priorLocation);
- int locateAttempted(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int postEnterRoom(Window *viewWindow, const Location &priorLocation) override;
+ int locateAttempted(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _clickable;
@@ -3233,8 +3233,8 @@ int MachineRoomTamperedSculpture::specifyCursor(Window *viewWindow, const Common
class MachineRoomHarmonicsInterface : public SceneBase {
public:
MachineRoomHarmonicsInterface(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _testButton;
@@ -3455,8 +3455,8 @@ int MachineRoomHarmonicsInterface::specifyCursor(Window *viewWindow, const Commo
class MachineRoomHarmonicsZoomIn : public SceneBase {
public:
MachineRoomHarmonicsZoomIn(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _clickRegion;
@@ -3494,9 +3494,9 @@ public:
int left = -1, int top = -1, int right = -1, int bottom = -1, int openFrame = -1, int closedFrame = -1, int depth = -1,
int transitionType = -1, int transitionData = -1, int transitionStartFrame = -1, int transitionLength = -1,
int doorFlag = -1, int doorFlagValue = 0);
- int mouseDown(Window *viewWindow, const Common::Point &pointLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int mouseDown(Window *viewWindow, const Common::Point &pointLocation) override;
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
bool _clicked;
@@ -3593,8 +3593,8 @@ ScanningRoomNexusDoorToGlobe::ScanningRoomNexusDoorToGlobe(BuriedEngine *vm, Win
class MachineRoomEntry : public SceneBase {
public:
MachineRoomEntry(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation, int soundID = -1);
- int postEnterRoom(Window *viewWindow, const Location &priorLocation);
- int timerCallback(Window *viewWindow);
+ int postEnterRoom(Window *viewWindow, const Location &priorLocation) override;
+ int timerCallback(Window *viewWindow) override;
private:
int _soundID;
@@ -3638,7 +3638,7 @@ class DockingBayPlaySoundEntering : public SceneBase {
public:
DockingBayPlaySoundEntering(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation,
int soundFileNameID = -1, int flagOffset = -1);
- int postEnterRoom(Window *viewWindow, const Location &priorLocation);
+ int postEnterRoom(Window *viewWindow, const Location &priorLocation) override;
private:
int _soundFileNameID;
@@ -3668,8 +3668,8 @@ class MachineRoomPlayAnim : public SceneBase {
public:
MachineRoomPlayAnim(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation,
int left = -1, int top = -1, int right = -1, int bottom = -1, int animID = -1);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _clickable;
diff --git a/engines/buried/environ/alien.cpp b/engines/buried/environ/alien.cpp
index 343da2e092..8155dcca6e 100644
--- a/engines/buried/environ/alien.cpp
+++ b/engines/buried/environ/alien.cpp
@@ -47,11 +47,11 @@ public:
int popAnim = -1, int openPoppedAnim = -1, int openPoppedFrame = -1, int grabLeft = -1, int grabTop = -1, int grabRight = -1,
int grabBottom = -1, int openEmptyAnim = -1, int openEmptyFrame = -1, int itemID = -1, int takenFlagOffset = -1,
int podStatusFlagOffset = -1, int returnDepth = -1, int popSwordAnim = -1);
- virtual int mouseDown(Window *viewWindow, const Common::Point &pointLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int draggingItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags);
- int droppedItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags);
- virtual int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int mouseDown(Window *viewWindow, const Common::Point &pointLocation) override;
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int draggingItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags) override;
+ int droppedItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
protected:
Common::Rect _openDoor;
@@ -220,8 +220,8 @@ class DoubleZoomIn : public SceneBase {
public:
DoubleZoomIn(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation,
int leftA, int topA, int rightA, int bottomA, int depthA, int leftB, int topB, int rightB, int bottomB, int depthB);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _zoomRegion[2];
@@ -279,8 +279,8 @@ class NerveNavigation : public SceneBase {
public:
NerveNavigation(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation,
int left = -1, int top = -1, int right = -1, int bottom = -1);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _nerve;
@@ -315,8 +315,8 @@ int NerveNavigation::specifyCursor(Window *viewWindow, const Common::Point &poin
class ArmControls : public SceneBase {
public:
ArmControls(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _controls[3];
@@ -355,7 +355,7 @@ int ArmControls::specifyCursor(Window *viewWindow, const Common::Point &pointLoc
class OpenAlienDoorA : public SceneBase {
public:
OpenAlienDoorA(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int postEnterRoom(Window *viewWindow, const Location &priorLocation);
+ int postEnterRoom(Window *viewWindow, const Location &priorLocation) override;
};
OpenAlienDoorA::OpenAlienDoorA(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation) :
@@ -384,11 +384,11 @@ int OpenAlienDoorA::postEnterRoom(Window *viewWindow, const Location &priorLocat
class AlienDoorAEncounter : public SceneBase {
public:
AlienDoorAEncounter(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int postEnterRoom(Window *viewWindow, const Location &priorLocation);
- int postExitRoom(Window *viewWindow, const Location &newLocation);
- int draggingItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags);
- int droppedItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags);
- int timerCallback(Window *viewWindow);
+ int postEnterRoom(Window *viewWindow, const Location &priorLocation) override;
+ int postExitRoom(Window *viewWindow, const Location &newLocation) override;
+ int draggingItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags) override;
+ int droppedItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags) override;
+ int timerCallback(Window *viewWindow) override;
private:
uint32 _timerStart;
@@ -478,7 +478,7 @@ int AlienDoorAEncounter::timerCallback(Window *viewWindow) {
class AlienDoorAMoveDeath : public SceneBase {
public:
AlienDoorAMoveDeath(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int timerCallback(Window *viewWindow);
+ int timerCallback(Window *viewWindow) override;
};
AlienDoorAMoveDeath::AlienDoorAMoveDeath(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation) :
@@ -493,7 +493,7 @@ int AlienDoorAMoveDeath::timerCallback(Window *viewWindow) {
class AlienDoorBOpen : public SceneBase {
public:
AlienDoorBOpen(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int postEnterRoom(Window *viewWindow, const Location &priorLocation);
+ int postEnterRoom(Window *viewWindow, const Location &priorLocation) override;
};
AlienDoorBOpen::AlienDoorBOpen(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation) :
@@ -520,11 +520,11 @@ int AlienDoorBOpen::postEnterRoom(Window *viewWindow, const Location &priorLocat
class AlienDoorBEncounter : public SceneBase {
public:
AlienDoorBEncounter(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int postEnterRoom(Window *viewWindow, const Location &priorLocation);
- int postExitRoom(Window *viewWindow, const Location &newLocation);
- int timerCallback(Window *viewWindow);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int postEnterRoom(Window *viewWindow, const Location &priorLocation) override;
+ int postExitRoom(Window *viewWindow, const Location &newLocation) override;
+ int timerCallback(Window *viewWindow) override;
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
uint32 _timerStart;
@@ -606,9 +606,9 @@ int AlienDoorBEncounter::specifyCursor(Window *viewWindow, const Common::Point &
class EncounterAmbassadorFirstZoom : public SceneBase {
public:
EncounterAmbassadorFirstZoom(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int postEnterRoom(Window *viewWindow, const Location &priorLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int postEnterRoom(Window *viewWindow, const Location &priorLocation) override;
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _panel;
@@ -666,10 +666,10 @@ int EncounterAmbassadorFirstZoom::specifyCursor(Window *viewWindow, const Common
class AmbassadorEncounterPodField : public SceneBase {
public:
AmbassadorEncounterPodField(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int postEnterRoom(Window *viewWindow, const Location &priorLocation);
- int draggingItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags);
- int droppedItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags);
- int timerCallback(Window *viewWindow);
+ int postEnterRoom(Window *viewWindow, const Location &priorLocation) override;
+ int draggingItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags) override;
+ int droppedItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags) override;
+ int timerCallback(Window *viewWindow) override;
private:
uint32 _timerStart;
@@ -722,8 +722,8 @@ int AmbassadorEncounterPodField::timerCallback(Window *viewWindow) {
class AmbassadorEncounterPodWalkForward : public SceneBase {
public:
AmbassadorEncounterPodWalkForward(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int postEnterRoom(Window *viewWindow, const Location &priorLocation);
- int timerCallback(Window *viewWindow);
+ int postEnterRoom(Window *viewWindow, const Location &priorLocation) override;
+ int timerCallback(Window *viewWindow) override;
private:
uint32 _timerStart;
@@ -753,10 +753,10 @@ int AmbassadorEncounterPodWalkForward::timerCallback(Window *viewWindow) {
class AmbassadorEncounterTransportArmsOff : public SceneBase {
public:
AmbassadorEncounterTransportArmsOff(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int postEnterRoom(Window *viewWindow, const Location &priorLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int timerCallback(Window *viewWindow);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int postEnterRoom(Window *viewWindow, const Location &priorLocation) override;
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int timerCallback(Window *viewWindow) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
uint32 _timerStart;
@@ -816,8 +816,8 @@ int AmbassadorEncounterTransportArmsOff::specifyCursor(Window *viewWindow, const
class NormalTransporter : public SceneBase {
public:
NormalTransporter(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _clickRegion;
@@ -860,9 +860,9 @@ int NormalTransporter::specifyCursor(Window *viewWindow, const Common::Point &po
class EntryWithoutLensFilter : public SceneBase {
public:
EntryWithoutLensFilter(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int postEnterRoom(Window *viewWindow, const Location &priorLocation);
- int paint(Window *viewWindow, Graphics::Surface *preBuffer);
- int timerCallback(Window *viewWindow);
+ int postEnterRoom(Window *viewWindow, const Location &priorLocation) override;
+ int paint(Window *viewWindow, Graphics::Surface *preBuffer) override;
+ int timerCallback(Window *viewWindow) override;
private:
bool _transPlayed;
@@ -910,7 +910,7 @@ int EntryWithoutLensFilter::timerCallback(Window *viewWindow) {
class PlayPodAudio : public SceneBase {
public:
PlayPodAudio(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation, int untransAudio, int transSoundID);
- int postEnterRoom(Window *viewWindow, const Location &priorLocation);
+ int postEnterRoom(Window *viewWindow, const Location &priorLocation) override;
private:
int _untransSoundID;
@@ -939,8 +939,8 @@ class InorganicPodTransDeath : public SceneBase {
public:
InorganicPodTransDeath(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation,
int left = -1, int top = -1, int right = -1, int bottom = -1, int animID = -1, int deathScene = -1);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _clickRegion;
@@ -1011,10 +1011,10 @@ int CheeseGirlPod::specifyCursor(Window *viewWindow, const Common::Point &pointL
class TransporterStatusRead : public SceneBase {
public:
TransporterStatusRead(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int gdiPaint(Window *viewWindow);
- int mouseMove(Window *viewWindow, const Common::Point &pointLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int gdiPaint(Window *viewWindow) override;
+ int mouseMove(Window *viewWindow, const Common::Point &pointLocation) override;
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
int _currentRegion;
diff --git a/engines/buried/environ/castle.cpp b/engines/buried/environ/castle.cpp
index d0eaf0811f..0c26514d52 100644
--- a/engines/buried/environ/castle.cpp
+++ b/engines/buried/environ/castle.cpp
@@ -43,8 +43,8 @@ namespace Buried {
class TopOfTowerGuardEncounter : public SceneBase {
public:
TopOfTowerGuardEncounter(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int postEnterRoom(Window *viewWindow, const Location &priorLocation);
- int paint(Window *viewWindow, Graphics::Surface *preBuffer);
+ int postEnterRoom(Window *viewWindow, const Location &priorLocation) override;
+ int paint(Window *viewWindow, Graphics::Surface *preBuffer) override;
private:
bool _showGuard;
@@ -83,9 +83,9 @@ int TopOfTowerGuardEncounter::paint(Window *viewWindow, Graphics::Surface *preBu
class TowerStairsGuardEncounter : public SceneBase {
public:
TowerStairsGuardEncounter(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int postEnterRoom(Window *viewWindow, const Location &priorLocation);
- int preExitRoom(Window *viewWindow, const Location &newLocation);
- int timerCallback(Window *viewWindow);
+ int postEnterRoom(Window *viewWindow, const Location &priorLocation) override;
+ int preExitRoom(Window *viewWindow, const Location &newLocation) override;
+ int timerCallback(Window *viewWindow) override;
private:
bool _busy;
@@ -138,7 +138,7 @@ int TowerStairsGuardEncounter::preExitRoom(Window *viewWindow, const Location &n
class WallSlideDeath : public SceneBase {
public:
WallSlideDeath(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int postExitRoom(Window *viewWindow, const Location &newLocation);
+ int postExitRoom(Window *viewWindow, const Location &newLocation) override;
};
WallSlideDeath::WallSlideDeath(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation) :
@@ -167,7 +167,7 @@ enum {
class ExplodingWallSafeDistance : public SceneBase {
public:
ExplodingWallSafeDistance(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int timerCallback(Window *viewWindow);
+ int timerCallback(Window *viewWindow) override;
private:
bool _timerStarted;
@@ -212,7 +212,7 @@ int ExplodingWallSafeDistance::timerCallback(Window *viewWindow) {
class ExplodingWallDeath : public SceneBase {
public:
ExplodingWallDeath(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int timerCallback(Window *viewWindow);
+ int timerCallback(Window *viewWindow) override;
};
ExplodingWallDeath::ExplodingWallDeath(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation) :
@@ -237,8 +237,8 @@ int ExplodingWallDeath::timerCallback(Window *viewWindow) {
class KeepInitialWallClimb : public SceneBase {
public:
KeepInitialWallClimb(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int droppedItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags);
- int draggingItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags);
+ int droppedItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags) override;
+ int draggingItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags) override;
private:
Common::Rect _windowRect;
@@ -281,9 +281,9 @@ int KeepInitialWallClimb::draggingItem(Window *viewWindow, int itemID, const Com
class KeepFinalWallClimb : public SceneBase {
public:
KeepFinalWallClimb(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int postEnterRoom(Window *viewWindow, const Location &priorLocation);
- int preExitRoom(Window *viewWindow, const Location &priorLocation);
- int timerCallback(Window *viewWindow);
+ int postEnterRoom(Window *viewWindow, const Location &priorLocation) override;
+ int preExitRoom(Window *viewWindow, const Location &priorLocation) override;
+ int timerCallback(Window *viewWindow) override;
private:
bool _exitStarted;
@@ -332,10 +332,10 @@ int KeepFinalWallClimb::timerCallback(Window *viewWindow) {
class KingsStudyGuard : public SceneBase {
public:
KingsStudyGuard(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int preExitRoom(Window *viewWindow, const Location &priorLocation);
- int postExitRoom(Window *viewWindow, const Location &priorLocation);
- int postEnterRoom(Window *viewWindow, const Location &priorLocation);
- int timerCallback(Window *viewWindow);
+ int preExitRoom(Window *viewWindow, const Location &priorLocation) override;
+ int postExitRoom(Window *viewWindow, const Location &priorLocation) override;
+ int postEnterRoom(Window *viewWindow, const Location &priorLocation) override;
+ int timerCallback(Window *viewWindow) override;
};
KingsStudyGuard::KingsStudyGuard(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation) :
@@ -388,11 +388,11 @@ int KingsStudyGuard::timerCallback(Window *viewWindow) {
class SmithyBench : public SceneBase {
public:
SmithyBench(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int mouseDown(Window *viewWindow, const Common::Point &pointLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int draggingItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags);
- int droppedItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int mouseDown(Window *viewWindow, const Common::Point &pointLocation) override;
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int draggingItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags) override;
+ int droppedItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
byte _status;
@@ -588,8 +588,8 @@ void SmithyBench::resetBackgroundBitmap() {
class PickupKingsStudyBooksA : public SceneBase {
public:
PickupKingsStudyBooksA(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _diaryA, _diaryB;
@@ -647,7 +647,7 @@ int PickupKingsStudyBooksA::specifyCursor(Window *viewWindow, const Common::Poin
class MainWallCatapultService : public SceneBase {
public:
MainWallCatapultService(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int timerCallback(Window *viewWindow);
+ int timerCallback(Window *viewWindow) override;
};
MainWallCatapultService::MainWallCatapultService(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation) :
@@ -682,8 +682,8 @@ int MainWallCatapultService::timerCallback(Window *viewWindow) {
class MiddleBaileyFootprintCapture : public SceneBase {
public:
MiddleBaileyFootprintCapture(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int locateAttempted(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int locateAttempted(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _footprint;
@@ -729,8 +729,8 @@ int MiddleBaileyFootprintCapture::specifyCursor(Window *viewWindow, const Common
class TreasureRoomSwordCapture : public SceneBase {
public:
TreasureRoomSwordCapture(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int locateAttempted(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int locateAttempted(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _footprint;
@@ -793,9 +793,9 @@ public:
int left = -1, int top = -1, int right = -1, int bottom = -1, int timeZone = -1, int environment = -1, int node = -1,
int facing = -1, int orientation = -1, int depth = -1, int flagOffset = 0, int data = -1, int startFrame = -1,
int length = -1, int animDB = -1);
- int mouseDown(Window *viewWindow, const Common::Point &pointLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int mouseDown(Window *viewWindow, const Common::Point &pointLocation) override;
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
bool _clicked;
@@ -878,10 +878,10 @@ public:
StorageRoomCheckUnlock(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation,
int flagOffset = 0, int itemID = 0, int filledFrameIndex = 0, int animID = 0, int depthA = 0, int depthB = 0,
int left = 0, int top = 0, int right = 0, int bottom = 0);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int draggingItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags);
- int droppedItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int draggingItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags) override;
+ int droppedItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
int _flagOffset;
@@ -959,7 +959,7 @@ int StorageRoomCheckUnlock::specifyCursor(Window *viewWindow, const Common::Poin
class DeliverLightMessage : public SceneBase {
public:
DeliverLightMessage(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int postEnterRoom(Window *viewWindow, const Location &priorLocation);
+ int postEnterRoom(Window *viewWindow, const Location &priorLocation) override;
};
DeliverLightMessage::DeliverLightMessage(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation) :
@@ -976,8 +976,8 @@ int DeliverLightMessage::postEnterRoom(Window *viewWindow, const Location &prior
class KingsChamberGuardEncounter : public SceneBase {
public:
KingsChamberGuardEncounter(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int postEnterRoom(Window *viewWindow, const Location &priorLocation);
- int timerCallback(Window *viewWindow);
+ int postEnterRoom(Window *viewWindow, const Location &priorLocation) override;
+ int timerCallback(Window *viewWindow) override;
private:
uint32 _startingTime;
diff --git a/engines/buried/environ/da_vinci.cpp b/engines/buried/environ/da_vinci.cpp
index 0054055d8c..3c52fbac73 100644
--- a/engines/buried/environ/da_vinci.cpp
+++ b/engines/buried/environ/da_vinci.cpp
@@ -60,8 +60,8 @@ SwapStillOnFlag::SwapStillOnFlag(BuriedEngine *vm, Window *viewWindow, const Loc
class CapturePaintingTowerFootprint : public SceneBase {
public:
CapturePaintingTowerFootprint(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int locateAttempted(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int locateAttempted(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _footprint;
@@ -116,7 +116,7 @@ int CapturePaintingTowerFootprint::specifyCursor(Window *viewWindow, const Commo
class PaintingTowerWalkOntoElevator : public SceneBase {
public:
PaintingTowerWalkOntoElevator(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int postExitRoom(Window *viewWindow, const Location &newLocation);
+ int postExitRoom(Window *viewWindow, const Location &newLocation) override;
};
PaintingTowerWalkOntoElevator::PaintingTowerWalkOntoElevator(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation) :
@@ -163,8 +163,8 @@ int PaintingTowerWalkOntoElevator::postExitRoom(Window *viewWindow, const Locati
class PaintingTowerRetrieveKey : public SceneBase {
public:
PaintingTowerRetrieveKey(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _key;
@@ -211,10 +211,10 @@ int PaintingTowerRetrieveKey::specifyCursor(Window *viewWindow, const Common::Po
class PaintingTowerElevatorControls : public SceneBase {
public:
PaintingTowerElevatorControls(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int gdiPaint(Window *viewWindow);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int mouseMove(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int gdiPaint(Window *viewWindow) override;
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int mouseMove(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _lockHandle[2];
@@ -317,8 +317,8 @@ int PaintingTowerElevatorControls::specifyCursor(Window *viewWindow, const Commo
class PaintingTowerElevatorWheel : public SceneBase {
public:
PaintingTowerElevatorWheel(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _wheel;
@@ -373,8 +373,8 @@ int PaintingTowerElevatorWheel::specifyCursor(Window *viewWindow, const Common::
class PaintingTowerOutsideDoor : public SceneBase {
public:
PaintingTowerOutsideDoor(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _clickableArea;
@@ -429,8 +429,8 @@ int PaintingTowerOutsideDoor::specifyCursor(Window *viewWindow, const Common::Po
class PaintingTowerInsideDoor : public SceneBase {
public:
PaintingTowerInsideDoor(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _clickableArea;
@@ -475,10 +475,10 @@ class WheelAssemblyItemAcquire : public SceneBase {
public:
WheelAssemblyItemAcquire(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation,
int left = 0, int top = 0, int right = 0, int bottom = 0, int itemID = 0, int clearStillFrame = 0, int itemFlagOffset = 0);
- int mouseDown(Window *viewWindow, const Common::Point &pointLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int droppedItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int mouseDown(Window *viewWindow, const Common::Point &pointLocation) override;
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int droppedItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
bool _itemPresent;
@@ -577,10 +577,10 @@ enum {
class AssembleSiegeCycle : public SceneBase {
public:
AssembleSiegeCycle(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int mouseDown(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
- int draggingItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags);
- int droppedItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags);
+ int mouseDown(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
+ int draggingItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags) override;
+ int droppedItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags) override;
private:
Common::Rect _driveDropRegion;
@@ -766,8 +766,8 @@ SiegeCycleTopView::SiegeCycleTopView(BuriedEngine *vm, Window *viewWindow, const
class UnlockCodexTowerDoor : public SceneBase {
public:
UnlockCodexTowerDoor(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int draggingItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags);
- int droppedItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags);
+ int draggingItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags) override;
+ int droppedItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags) override;
private:
Common::Rect _dropRect;
@@ -804,10 +804,10 @@ int UnlockCodexTowerDoor::droppedItem(Window *viewWindow, int itemID, const Comm
class CodexTowerOutsideDoor : public SceneBase {
public:
CodexTowerOutsideDoor(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int draggingItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags);
- int droppedItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int draggingItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags) override;
+ int droppedItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _dropRect;
@@ -903,9 +903,9 @@ int CodexTowerOutsideDoor::specifyCursor(Window *viewWindow, const Common::Point
class CodexTowerLensEvidenceCapture : public SceneBase {
public:
CodexTowerLensEvidenceCapture(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int locateAttempted(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int locateAttempted(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _evidenceRegion;
@@ -982,7 +982,7 @@ int CodexTowerLensEvidenceCapture::specifyCursor(Window *viewWindow, const Commo
class CodexTowerGrabLens : public GenericItemAcquire {
public:
CodexTowerGrabLens(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int droppedItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags);
+ int droppedItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags) override;
};
CodexTowerGrabLens::CodexTowerGrabLens(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation) :
@@ -1014,8 +1014,8 @@ int CodexTowerGrabLens::droppedItem(Window *viewWindow, int itemID, const Common
class CodexCabinetOpenDoor : public SceneBase {
public:
CodexCabinetOpenDoor(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _openDoor;
@@ -1058,11 +1058,11 @@ int CodexCabinetOpenDoor::specifyCursor(Window *viewWindow, const Common::Point
class CodexTowerGrabHeart : public SceneBase {
public:
CodexTowerGrabHeart(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int postExitRoom(Window *viewWindow, const Location &newLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int mouseDown(Window *viewWindow, const Common::Point &pointLocation);
- int droppedItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int postExitRoom(Window *viewWindow, const Location &newLocation) override;
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int mouseDown(Window *viewWindow, const Common::Point &pointLocation) override;
+ int droppedItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
bool _itemPresent;
@@ -1165,10 +1165,10 @@ int CodexTowerGrabHeart::specifyCursor(Window *viewWindow, const Common::Point &
class ZoomInOnCodexes : public SceneBase {
public:
ZoomInOnCodexes(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int postEnterRoom(Window *viewWindow, const Location &priorLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int locateAttempted(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int postEnterRoom(Window *viewWindow, const Location &priorLocation) override;
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int locateAttempted(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _leftCodex;
@@ -1258,12 +1258,12 @@ public:
int timeZone = -1, int environment = -1, int node = -1, int facing = -1, int orientation = -1,
int depth = -1, int transitionType = -1, int transitionData = -1, int transitionStartFrame = -1, int transitionLength = -1,
int startFrame = -1, int frameCount = -1, int lensStartFrame = -1);
- int gdiPaint(Window *viewWindow);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int mouseMove(Window *viewWindow, const Common::Point &pointLocation);
- int timerCallback(Window *viewWindow);
- int locateAttempted(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int gdiPaint(Window *viewWindow) override;
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int mouseMove(Window *viewWindow, const Common::Point &pointLocation) override;
+ int timerCallback(Window *viewWindow) override;
+ int locateAttempted(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
int _curPage;
@@ -1480,8 +1480,8 @@ int BrowseCodex::specifyCursor(Window *viewWindow, const Common::Point &pointLoc
class ClickBirdDevice : public SceneBase {
public:
ClickBirdDevice(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _birdToy;
@@ -1521,8 +1521,8 @@ int ClickBirdDevice::specifyCursor(Window *viewWindow, const Common::Point &poin
class CourtyardCannon : public SceneBase {
public:
CourtyardCannon(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _cannon;
@@ -1550,8 +1550,8 @@ int CourtyardCannon::specifyCursor(Window *viewWindow, const Common::Point &poin
class CourtyardGunDeath : public SceneBase {
public:
CourtyardGunDeath(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _gun;
@@ -1599,8 +1599,8 @@ ChangeBallistaDepth::ChangeBallistaDepth(BuriedEngine *vm, Window *viewWindow, c
class SpinBallista : public SceneBase {
public:
SpinBallista(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _handle;
@@ -1645,8 +1645,8 @@ int SpinBallista::specifyCursor(Window *viewWindow, const Common::Point &pointLo
class PlaceSiegeCycleOnTrack : public SceneBase {
public:
PlaceSiegeCycleOnTrack(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int draggingItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags);
- int droppedItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags);
+ int draggingItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags) override;
+ int droppedItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags) override;
private:
Common::Rect _cycleRect;
@@ -1725,10 +1725,10 @@ class AimBallistaAwayFromTower : public SceneBase {
public:
AimBallistaAwayFromTower(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
~AimBallistaAwayFromTower();
- void preDestructor();
- int paint(Window *viewWindow, Graphics::Surface *preBuffer);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ void preDestructor() override;
+ int paint(Window *viewWindow, Graphics::Surface *preBuffer) override;
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _raiseBallista;
@@ -1899,7 +1899,7 @@ int AimBallistaAwayFromTower::specifyCursor(Window *viewWindow, const Common::Po
class PaintingTowerCapAgent : public SceneBase {
public:
PaintingTowerCapAgent(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int postEnterRoom(Window *viewWindow, const Location &priorLocation);
+ int postEnterRoom(Window *viewWindow, const Location &priorLocation) override;
};
PaintingTowerCapAgent::PaintingTowerCapAgent(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation) :
@@ -1934,10 +1934,10 @@ int PaintingTowerCapAgent::postEnterRoom(Window *viewWindow, const Location &pri
class CodexTowerElevatorControls : public SceneBase {
public:
CodexTowerElevatorControls(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int gdiPaint(Window *viewWindow);
- int mouseMove(Window *viewWindow, const Common::Point &pointLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int gdiPaint(Window *viewWindow) override;
+ int mouseMove(Window *viewWindow, const Common::Point &pointLocation) override;
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _transText[4];
@@ -2014,10 +2014,10 @@ public:
int node = -1, int facing = -1, int orientation = -1, int depth = -1, int transitionType = -1, int transitionData = -1,
int transitionStartFrame = -1, int transitionLength = -1, int transLeft = -1, int transTop = -1, int transRight = -1,
int transBottom = -1, int transTextID = -1);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int gdiPaint(Window *viewWindow);
- int mouseMove(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int gdiPaint(Window *viewWindow) override;
+ int mouseMove(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
int _cursorID;
@@ -2102,10 +2102,10 @@ class AimBallistaToTower : public SceneBase {
public:
AimBallistaToTower(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
~AimBallistaToTower();
- void preDestructor();
- int paint(Window *viewWindow, Graphics::Surface *preBuffer);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ void preDestructor() override;
+ int paint(Window *viewWindow, Graphics::Surface *preBuffer) override;
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _raiseBallista;
@@ -2296,8 +2296,8 @@ int AimBallistaToTower::specifyCursor(Window *viewWindow, const Common::Point &p
class WalkDownPaintingTowerElevator : public SceneBase {
public:
WalkDownPaintingTowerElevator(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
int _cursorID;
@@ -2339,7 +2339,7 @@ int WalkDownPaintingTowerElevator::specifyCursor(Window *viewWindow, const Commo
class LensFilterNotify : public SceneBase {
public:
LensFilterNotify(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int postEnterRoom(Window *viewWindow, const Location &newLocation);
+ int postEnterRoom(Window *viewWindow, const Location &newLocation) override;
};
LensFilterNotify::LensFilterNotify(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation) :
@@ -2356,7 +2356,7 @@ int LensFilterNotify::postEnterRoom(Window *viewWindow, const Location &newLocat
class CodexFormulaeNotify : public SceneBase {
public:
CodexFormulaeNotify(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int postEnterRoom(Window *viewWindow, const Location &newLocation);
+ int postEnterRoom(Window *viewWindow, const Location &newLocation) override;
};
CodexFormulaeNotify::CodexFormulaeNotify(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation) :
@@ -2373,10 +2373,10 @@ int CodexFormulaeNotify::postEnterRoom(Window *viewWindow, const Location &newLo
class ViewSiegeCyclePlans : public SceneBase {
public:
ViewSiegeCyclePlans(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int gdiPaint(Window *viewWindow);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int mouseMove(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int gdiPaint(Window *viewWindow) override;
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int mouseMove(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _transText[3];
diff --git a/engines/buried/environ/future_apartment.cpp b/engines/buried/environ/future_apartment.cpp
index 1735c84368..c6f145e598 100644
--- a/engines/buried/environ/future_apartment.cpp
+++ b/engines/buried/environ/future_apartment.cpp
@@ -43,9 +43,9 @@ public:
OvenDoor(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation,
int openAnimID = 0, int closeAnimID = 0, int openFrame = 0, int closedFrame = 0, int flagOffset = 0,
int left = 0, int top = 0, int right = 0, int bottom = 0);
- int postExitRoom(Window *viewWindow, const Location &newLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int postExitRoom(Window *viewWindow, const Location &newLocation) override;
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
int _openAnimationID;
@@ -119,8 +119,8 @@ int OvenDoor::specifyCursor(Window *viewWindow, const Common::Point &pointLocati
class KitchenUnitTurnOn : public SceneBase {
public:
KitchenUnitTurnOn(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _powerButton;
@@ -154,8 +154,8 @@ int KitchenUnitTurnOn::specifyCursor(Window *viewWindow, const Common::Point &po
class KitchenUnitTitleScreen : public SceneBase {
public:
KitchenUnitTitleScreen(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _menuButton;
@@ -198,8 +198,8 @@ int KitchenUnitTitleScreen::specifyCursor(Window *viewWindow, const Common::Poin
class KitchenUnitMainMenu : public SceneBase {
public:
KitchenUnitMainMenu(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _menuButton;
@@ -264,10 +264,10 @@ class KitchenUnitAutoChef : public SceneBase {
public:
KitchenUnitAutoChef(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
~KitchenUnitAutoChef();
- void preDestructor();
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int gdiPaint(Window *viewWindow);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ void preDestructor() override;
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int gdiPaint(Window *viewWindow) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _menuButton;
@@ -347,12 +347,12 @@ class KitchenUnitShopNet : public SceneBase {
public:
KitchenUnitShopNet(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
~KitchenUnitShopNet();
- void preDestructor();
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int onCharacter(Window *viewWindow, const Common::KeyState &character);
- int gdiPaint(Window *viewWindow);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
- int preExitRoom(Window *viewWindow, const Location &priorLocation);
+ void preDestructor() override;
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int onCharacter(Window *viewWindow, const Common::KeyState &character) override;
+ int gdiPaint(Window *viewWindow) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
+ int preExitRoom(Window *viewWindow, const Location &priorLocation) override;
private:
int _status;
@@ -617,10 +617,10 @@ class KitchenUnitPostBox : public SceneBase {
public:
KitchenUnitPostBox(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
~KitchenUnitPostBox();
- void preDestructor();
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int gdiPaint(Window *viewWindow);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ void preDestructor() override;
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int gdiPaint(Window *viewWindow) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
int _packageCount;
@@ -831,13 +831,13 @@ void KitchenUnitPostBox::changeBackgroundBitmap() {
class EnvironSystemControls : public SceneBase {
public:
EnvironSystemControls(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int postEnterRoom(Window *viewWindow, const Location &priorLocation);
- int preExitRoom(Window *viewWindow, const Location &newLocation);
- int mouseDown(Window *viewWindow, const Common::Point &pointLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int draggingItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags);
- int droppedItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int postEnterRoom(Window *viewWindow, const Location &priorLocation) override;
+ int preExitRoom(Window *viewWindow, const Location &newLocation) override;
+ int mouseDown(Window *viewWindow, const Common::Point &pointLocation) override;
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int draggingItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags) override;
+ int droppedItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _environCart;
@@ -1022,10 +1022,10 @@ int EnvironSystemControls::specifyCursor(Window *viewWindow, const Common::Point
class EnvironGenoVideo : public SceneBase {
public:
EnvironGenoVideo(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int postEnterRoom(Window *viewWindow, const Location &priorLocation);
- int preExitRoom(Window *viewWindow, const Location &newLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int postEnterRoom(Window *viewWindow, const Location &priorLocation) override;
+ int preExitRoom(Window *viewWindow, const Location &newLocation) override;
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _returnRegion;
@@ -1087,8 +1087,8 @@ FlagChangeBackground::FlagChangeBackground(BuriedEngine *vm, Window *viewWindow,
class ClickZoomInTopOfBookshelf : public SceneBase {
public:
ClickZoomInTopOfBookshelf(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _awardZoom, _bookZoom;
@@ -1139,8 +1139,8 @@ class ClickZoomToyShelf : public SceneBase {
public:
ClickZoomToyShelf(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _toyZooms[4];
@@ -1188,8 +1188,8 @@ public:
ToyClick(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation,
int left = -1, int top = -1, int right = -1, int bottom = -1, int returnDepth = -1, int clickAnimation = -1, int returnAnimation = -1);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _clickRect;
@@ -1243,8 +1243,8 @@ int ToyClick::specifyCursor(Window *viewWindow, const Common::Point &pointLocati
class ClickOnCoffeeTable : public SceneBase {
public:
ClickOnCoffeeTable(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _toyClickRect;
@@ -1295,8 +1295,8 @@ int ClickOnCoffeeTable::specifyCursor(Window *viewWindow, const Common::Point &p
class ClickZoomInBottomOfBookshelf : public SceneBase {
public:
ClickZoomInBottomOfBookshelf(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _leftClocks;
@@ -1347,8 +1347,8 @@ int ClickZoomInBottomOfBookshelf::specifyCursor(Window *viewWindow, const Common
class RightClockShelf : public SceneBase {
public:
RightClockShelf(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _alienClock;
@@ -1406,8 +1406,8 @@ int RightClockShelf::specifyCursor(Window *viewWindow, const Common::Point &poin
class MainDeskView : public SceneBase {
public:
MainDeskView(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _papers;
@@ -1489,11 +1489,11 @@ int MainDeskView::specifyCursor(Window *viewWindow, const Common::Point &pointLo
class ViewVidPhone : public SceneBase {
public:
ViewVidPhone(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int postEnterRoom(Window *viewWindow, const Location &priorLocation);
- int preExitRoom(Window *viewWindow, const Location &newLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
- int movieCallback(Window *viewWindow, VideoWindow *movie, int animationID, int status);
+ int postEnterRoom(Window *viewWindow, const Location &priorLocation) override;
+ int preExitRoom(Window *viewWindow, const Location &newLocation) override;
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
+ int movieCallback(Window *viewWindow, VideoWindow *movie, int animationID, int status) override;
private:
Common::Rect _playButton;
@@ -1620,9 +1620,9 @@ int ViewVidPhone::movieCallback(Window *viewWindow, VideoWindow *movie, int anim
class MainEnvironDoorDown : public SceneBase {
public:
MainEnvironDoorDown(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int postEnterRoom(Window *viewWindow, const Location &priorLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int postEnterRoom(Window *viewWindow, const Location &priorLocation) override;
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
bool _doorOpen;
@@ -1694,7 +1694,7 @@ int MainEnvironDoorDown::specifyCursor(Window *viewWindow, const Common::Point &
class MainEnvironDoorExit : public SceneBase {
public:
MainEnvironDoorExit(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int postEnterRoom(Window *viewWindow, const Location &priorLocation);
+ int postEnterRoom(Window *viewWindow, const Location &priorLocation) override;
};
MainEnvironDoorExit::MainEnvironDoorExit(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation) :
@@ -1721,8 +1721,8 @@ public:
int timeZone = -1, int environment = -1, int node = -1, int facing = -1, int orientation = -1, int depth = -1,
int transitionType = -1, int transitionData = -1, int transitionStartFrame = -1, int transitionLength = -1,
int soundFileNameID = -1, int soundLeft = -1, int soundTop = -1, int soundRight = -1, int soundBottom = -1);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
int _cursorID;
@@ -1781,8 +1781,8 @@ int ClickOnBooks::specifyCursor(Window *viewWindow, const Common::Point &pointLo
class ClickEnvironNatureScenes : public SceneBase {
public:
ClickEnvironNatureScenes(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _controls;
@@ -1825,9 +1825,9 @@ int ClickEnvironNatureScenes::specifyCursor(Window *viewWindow, const Common::Po
class ViewEnvironCart : public SceneBase {
public:
ViewEnvironCart(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int timerCallback(Window *viewWindow);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int timerCallback(Window *viewWindow) override;
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
};
ViewEnvironCart::ViewEnvironCart(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation) :
@@ -1891,8 +1891,8 @@ int ViewEnvironCart::specifyCursor(Window *viewWindow, const Common::Point &poin
class MainEnvironSitDownClick : public SceneBase {
public:
MainEnvironSitDownClick(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _environRect;
@@ -1930,7 +1930,7 @@ int MainEnvironSitDownClick::specifyCursor(Window *viewWindow, const Common::Poi
class EnvironDoorExitSound : public SceneBase {
public:
EnvironDoorExitSound(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int postExitRoom(Window *viewWindow, const Location &newLocation);
+ int postExitRoom(Window *viewWindow, const Location &newLocation) override;
};
EnvironDoorExitSound::EnvironDoorExitSound(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation) :
diff --git a/engines/buried/environ/mayan.cpp b/engines/buried/environ/mayan.cpp
index 4016c618a2..8a163f4282 100644
--- a/engines/buried/environ/mayan.cpp
+++ b/engines/buried/environ/mayan.cpp
@@ -49,8 +49,8 @@ enum {
class PlaceCeramicBowl : public SceneBase {
public:
PlaceCeramicBowl(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int droppedItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags);
- int timerCallback(Window *viewWindow);
+ int droppedItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags) override;
+ int timerCallback(Window *viewWindow) override;
private:
bool _dropped;
@@ -109,12 +109,12 @@ int PlaceCeramicBowl::timerCallback(Window *viewWindow) {
class AdjustWheels : public SceneBase {
public:
AdjustWheels(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- void preDestructor();
- int paint(Window *viewWindow, Graphics::Surface *preBuffer);
- int gdiPaint(Window *viewWindow);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int mouseMove(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ void preDestructor() override;
+ int paint(Window *viewWindow, Graphics::Surface *preBuffer) override;
+ int gdiPaint(Window *viewWindow) override;
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int mouseMove(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
AVIFrames _leftWheelFrames;
@@ -335,8 +335,8 @@ int AdjustWheels::specifyCursor(Window *viewWindow, const Common::Point &pointLo
class DateCombinationRead : public SceneBase {
public:
DateCombinationRead(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int gdiPaint(Window *viewWindow);
- int mouseMove(Window *viewWindow, const Common::Point &pointLocation);
+ int gdiPaint(Window *viewWindow) override;
+ int mouseMove(Window *viewWindow, const Common::Point &pointLocation) override;
private:
int _currentRegion;
@@ -395,10 +395,10 @@ public:
ViewSingleTranslation(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation,
int translatedTextID = -1, int left = -1, int top = -1, int right = -1, int bottom = -1,
int flagAOffset = -1, int flagBOffset = -1, int visitedFlagOffset = -1);
- int gdiPaint(Window *viewWindow);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int mouseMove(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int gdiPaint(Window *viewWindow) override;
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int mouseMove(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
bool _textTranslated;
@@ -489,9 +489,9 @@ public:
int topZoomDepth = 0, int topLeft = -1, int topTop = -1, int topRight = -1, int topBottom = -1,
int rightZoomDepth = 0, int rightLeft = -1, int rightTop = -1, int rightRight = -1, int rightBottom = -1,
int offeringHeadZoomDepth = 0, int offeringHeadLeft = -1, int offeringHeadTop = -1, int offeringHeadRight = -1, int offeringHeadBottom = -1);
- int postEnterRoom(Window *viewWindow, const Location &priorLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int postEnterRoom(Window *viewWindow, const Location &priorLocation) override;
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
int _topZoomDepth;
@@ -568,10 +568,10 @@ class GenericCavernDoorOfferingHead : public SceneBase {
public:
GenericCavernDoorOfferingHead(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation,
int correctOfferingID = -1, int correctOfferingDestDepth = 0, int transitionType = -1, int transitionData = -1, int transitionStartFrame = -1, int transitionLength = -1);
- int draggingItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags);
- int droppedItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int draggingItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags) override;
+ int droppedItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags) override;
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
DestinationScene _correctDestination;
@@ -740,11 +740,11 @@ class DeathGodCavernDoorOfferingHead : public SceneBase {
public:
DeathGodCavernDoorOfferingHead(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation,
int correctOfferingDestDepth = 0, int transitionType = -1, int transitionData = -1, int transitionStartFrame = -1, int transitionLength = -1);
- int preExitRoom(Window *viewWindow, const Location &newLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int draggingItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags);
- int droppedItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int preExitRoom(Window *viewWindow, const Location &newLocation) override;
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int draggingItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags) override;
+ int droppedItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
DestinationScene _correctDestination;
@@ -896,9 +896,9 @@ int DeathGodCavernDoorOfferingHead::specifyCursor(Window *viewWindow, const Comm
class WealthGodRopeDrop : public SceneBase {
public:
WealthGodRopeDrop(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int postEnterRoom(Window *viewWindow, const Location &priorLocation);
- int draggingItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags);
- int droppedItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags);
+ int postEnterRoom(Window *viewWindow, const Location &priorLocation) override;
+ int draggingItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags) override;
+ int droppedItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags) override;
private:
Common::Rect _dropRope;
@@ -961,11 +961,11 @@ public:
WaterGodBridgeJump(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation,
int movieFileNameID = 0, int playingStartingFrame = 0, int sequenceStartingFrame = 0, int framesPerCycle = 0,
int jumpFudgeFrames = 0, int sequenceLength = 0, bool jumpMidCycle = false, int frameOffsetToEndOfSwing = 0);
- int postEnterRoom(Window *viewWindow, const Location &priorLocation);
- int preExitRoom(Window *viewWindow, const Location &newLocation);
- int postExitRoom(Window *viewWindow, const Location &newLocation);
- int timerCallback(Window *viewWindow);
- int movieCallback(Window *viewWindow, VideoWindow *movie, int animationID, int status);
+ int postEnterRoom(Window *viewWindow, const Location &priorLocation) override;
+ int preExitRoom(Window *viewWindow, const Location &newLocation) override;
+ int postExitRoom(Window *viewWindow, const Location &newLocation) override;
+ int timerCallback(Window *viewWindow) override;
+ int movieCallback(Window *viewWindow, VideoWindow *movie, int animationID, int status) override;
private:
int _movieID;
@@ -1088,13 +1088,13 @@ public:
int headID = 0, int clickLeft = -1, int clickTop = -1, int clickRight = -1, int clickBottom = -1,
int emptyClosedStill = -1, int emptyOpenStill = -1, int fullClosedStill = -1, int fullOpenStill = -1,
int emptyClosedAnim = -1, int emptyOpenAnim = -1, int fullClosedAnim = -1, int fullOpenAnim = -1);
- int postEnterRoom(Window *viewWindow, const Location &priorLocation);
- int mouseDown(Window *viewWindow, const Common::Point &pointLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int draggingItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags);
- int droppedItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
- int timerCallback(Window *viewWindow);
+ int postEnterRoom(Window *viewWindow, const Location &priorLocation) override;
+ int mouseDown(Window *viewWindow, const Common::Point &pointLocation) override;
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int draggingItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags) override;
+ int droppedItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
+ int timerCallback(Window *viewWindow) override;
private:
int _headID;
@@ -1413,9 +1413,9 @@ int ArrowGodHead::timerCallback(Window *viewWindow) {
class ArrowGodDepthChange : public SceneBase {
public:
ArrowGodDepthChange(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int postEnterRoom(Window *viewWindow, const Location &priorLocation);
- int postExitRoom(Window *viewWindow, const Location &newLocation);
- int timerCallback(Window *viewWindow);
+ int postEnterRoom(Window *viewWindow, const Location &priorLocation) override;
+ int postExitRoom(Window *viewWindow, const Location &newLocation) override;
+ int timerCallback(Window *viewWindow) override;
private:
bool _scheduledDepthChange;
@@ -1631,12 +1631,12 @@ bool ArrowGodDepthChange::adjustSpearVolume(Window *viewWindow) {
class DeathGodAltar : public SceneBase {
public:
DeathGodAltar(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int postEnterRoom(Window *viewWindow, const Location &priorLocation);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int draggingItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags);
- int droppedItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
- int locateAttempted(Window *viewWindow, const Common::Point &pointLocation);
+ int postEnterRoom(Window *viewWindow, const Location &priorLocation) override;
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int draggingItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags) override;
+ int droppedItem(Window *viewWindow, int itemID, const Common::Point &pointLocation, int itemFlags) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
+ int locateAttempted(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _heartPool;
@@ -1762,12 +1762,12 @@ class DeathGodPuzzleBox : public SceneBase {
public:
DeathGodPuzzleBox(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
~DeathGodPuzzleBox();
- void preDestructor();
- int paint(Window *viewWindow, Graphics::Surface *preBuffer);
- int gdiPaint(Window *viewWindow);
- int mouseUp(Window *viewWindow, const Common::Point &pointLocation);
- int mouseMove(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ void preDestructor() override;
+ int paint(Window *viewWindow, Graphics::Surface *preBuffer) override;
+ int gdiPaint(Window *viewWindow) override;
+ int mouseUp(Window *viewWindow, const Common::Point &pointLocation) override;
+ int mouseMove(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
int _puzzleIndexes[4];
@@ -1993,8 +1993,8 @@ bool DeathGodPuzzleBox::isPuzzleSolved() const {
class MainCavernGlassCapture : public SceneBase {
public:
MainCavernGlassCapture(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int locateAttempted(Window *viewWindow, const Common::Point &pointLocation);
- int specifyCursor(Window *viewWindow, const Common::Point &pointLocation);
+ int locateAttempted(Window *viewWindow, const Common::Point &pointLocation) override;
+ int specifyCursor(Window *viewWindow, const Common::Point &pointLocation) override;
private:
Common::Rect _glass;
@@ -2042,8 +2042,8 @@ class WalkVolumeChange : public SceneBase {
public:
WalkVolumeChange(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation,
byte newVolume = 0, uint32 volumeChangeTime = 0, int stepCount = -1, int entryEffectFileNameID = -1);
- int postEnterRoom(Window *viewWindow, const Location &priorLocation);
- int preExitRoom(Window *viewWindow, const Location &newLocation);
+ int postEnterRoom(Window *viewWindow, const Location &priorLocation) override;
+ int preExitRoom(Window *viewWindow, const Location &newLocation) override;
private:
byte _newVolume;
@@ -2078,8 +2078,8 @@ int WalkVolumeChange::preExitRoom(Window *viewWindow, const Location &newLocatio
class AdjustSecondaryAmbientOnEntry : public SceneBase {
public:
AdjustSecondaryAmbientOnEntry(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation);
- int postEnterRoom(Window *viewWindow, const Location &priorLocation);
- int preExitRoom(Window *viewWindow, const Location &newLocation);
+ int postEnterRoom(Window *viewWindow, const Location &priorLocation) override;
+ int preExitRoom(Window *viewWindow, const Location &newLocation) override;
};
AdjustSecondaryAmbientOnEntry::AdjustSecondaryAmbientOnEntry(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation) :
@@ -2103,7 +2103,7 @@ class WalkDualAmbientVolumeChange : public SceneBase {
public:
WalkDualAmbientVolumeChange(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation,
byte newVolume = 0, byte secondVolume = 0, uint32 volumeChangeTime = 0, int stepCount = -1);
- int preExitRoom(Window *viewWindow, const Location &newLocation);
+ int preExitRoom(Window *viewWindow, const Location &newLocation) override;
private:
byte _newVolume;
diff --git a/engines/buried/environ/scene_factory.cpp b/engines/buried/environ/scene_factory.cpp
index c62ba32086..f42347837c 100644
--- a/engines/buried/environ/scene_factory.cpp
+++ b/engines/buried/environ/scene_factory.cpp
@@ -41,7 +41,7 @@ class OldApartmentSuitCap : public SceneBase {
public:
OldApartmentSuitCap(BuriedEngine *vm, Window *viewWindow, const LocationStaticData &sceneStaticData, const Location &priorLocation)
: SceneBase(vm, viewWindow, sceneStaticData, priorLocation) {}
- int postEnterRoom(Window *viewWindow, const Location &priorLocation);
+ int postEnterRoom(Window *viewWindow, const Location &priorLocation) override;
};
int OldApartmentSuitCap::postEnterRoom(Window *viewWindow, const Location &priorLocation) {
More information about the Scummvm-git-logs
mailing list