thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MADS: Add override keywords

Browse source
This commit is contained in:
Bastien Bouclet 2020-02-09 12:05:30 +01:00
parent 53fdcfbf0e
commit 5aef420e17
33 changed files with 988 additions and 988 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/mads/debugger.h
View file

@ -56,7 +56,7 @@ public:
bool _showMousePos; bool _showMousePos;
public: public:
Debugger(MADSEngine *vm); Debugger(MADSEngine *vm);
virtual ~Debugger() {} ~Debugger() override {}
}; };
} // End of namespace MADS } // End of namespace MADS

16
engines/mads/detection.cpp
View file

@ -159,23 +159,23 @@ public:
_maxScanDepth = 3; _maxScanDepth = 3;
} }
virtual const char *getEngineId() const override { const char *getEngineId() const override {
return "mads"; return "mads";
} }
virtual const char *getName() const override { const char *getName() const override {
return "MADS"; return "MADS";
} }
virtual const char *getOriginalCopyright() const override { const char *getOriginalCopyright() const override {
return "MADS (C) Microprose"; return "MADS (C) Microprose";
} }
virtual bool hasFeature(MetaEngineFeature f) const override; bool hasFeature(MetaEngineFeature f) const override;
virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override; bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override;
virtual SaveStateList listSaves(const char *target) const override; SaveStateList listSaves(const char *target) const override;
virtual int getMaximumSaveSlot() const override; int getMaximumSaveSlot() const override;
virtual void removeSaveState(const char *target, int slot) const override; void removeSaveState(const char *target, int slot) const override;
SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override; SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override;
}; };

10
engines/mads/dialogs.h
View file

@ -134,7 +134,7 @@ protected:
/** /**
* Calculate the bounds for the dialog * Calculate the bounds for the dialog
*/ */
virtual void calculateBounds(); void calculateBounds() override;
public: public:
/** /**
* Constructor * Constructor
@ -160,12 +160,12 @@ public:
/** /**
* Destructor * Destructor
*/ */
virtual ~TextDialog(); ~TextDialog() override;
/** /**
* Draw the dialog * Draw the dialog
*/ */
virtual void draw(); void draw() override;
/** /**
* Draw the dialog along with any input box * Draw the dialog along with any input box
@ -224,7 +224,7 @@ class MessageDialog : public TextDialog {
public: public:
MessageDialog(MADSEngine *vm, int lines, ...); MessageDialog(MADSEngine *vm, int lines, ...);
virtual ~MessageDialog() {} ~MessageDialog() override {}
}; };
enum DialogId { enum DialogId {
@ -286,7 +286,7 @@ public:
*/ */
FullScreenDialog(MADSEngine *vm); FullScreenDialog(MADSEngine *vm);
virtual ~FullScreenDialog(); ~FullScreenDialog() override;
}; };
} // End of namespace MADS } // End of namespace MADS

10
engines/mads/dragonsphere/dragonsphere_scenes.h
View file

@ -647,9 +647,9 @@ public:
class SceneInfoDragonsphere : public SceneInfo { class SceneInfoDragonsphere : public SceneInfo {
friend class SceneInfo; friend class SceneInfo;
protected: protected:
virtual void loadCodes(BaseSurface &depthSurface, int variant); void loadCodes(BaseSurface &depthSurface, int variant) override;
virtual void loadCodes(BaseSurface &depthSurface, Common::SeekableReadStream *stream); void loadCodes(BaseSurface &depthSurface, Common::SeekableReadStream *stream) override;
/** /**
* Constructor * Constructor
@ -664,9 +664,9 @@ public:
warning("Unimplemented scene"); warning("Unimplemented scene");
} }
virtual void setup() {} void setup() override {}
virtual void enter() {} void enter() override {}
virtual void actions() {} void actions() override {}
}; };
} // End of namespace Dragonsphere } // End of namespace Dragonsphere

60
engines/mads/dragonsphere/dragonsphere_scenes1.h
View file

@ -56,13 +56,13 @@ public:
class Scene101 : public Scene1xx { class Scene101 : public Scene1xx {
public: public:
Scene101(MADSEngine *vm); Scene101(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene102 : public Scene1xx { class Scene102 : public Scene1xx {
@ -74,25 +74,25 @@ private:
public: public:
Scene102(MADSEngine *vm); Scene102(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene103 : public Scene1xx { class Scene103 : public Scene1xx {
public: public:
Scene103(MADSEngine *vm); Scene103(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene104 : public Scene1xx { class Scene104 : public Scene1xx {
@ -143,13 +143,13 @@ private:
public: public:
Scene104(MADSEngine *vm); Scene104(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene105 : public Scene1xx { class Scene105 : public Scene1xx {
@ -173,13 +173,13 @@ private:
public: public:
Scene105(MADSEngine *vm); Scene105(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
} // End of namespace Dragonsphere } // End of namespace Dragonsphere

24
engines/mads/dragonsphere/game_dragonsphere.h
View file

@ -93,26 +93,26 @@ class GameDragonsphere : public Game {
protected: protected:
GameDragonsphere(MADSEngine *vm); GameDragonsphere(MADSEngine *vm);
virtual void startGame(); void startGame() override;
virtual void initializeGlobals(); void initializeGlobals() override;
virtual void setSectionHandler(); void setSectionHandler() override;
virtual void checkShowDialog(); void checkShowDialog() override;
public: public:
DragonsphereGlobals _globals; DragonsphereGlobals _globals;
StoryMode _storyMode; StoryMode _storyMode;
virtual Globals &globals() { return _globals; } Globals &globals() override { return _globals; }
virtual void doObjectAction(); void doObjectAction() override;
virtual void unhandledAction(); void unhandledAction() override;
virtual void step(); void step() override;
virtual void synchronize(Common::Serializer &s, bool phase1); void synchronize(Common::Serializer &s, bool phase1) override;
}; };
@ -121,9 +121,9 @@ public:
Section1Handler(MADSEngine *vm) : SectionHandler(vm) {} Section1Handler(MADSEngine *vm) : SectionHandler(vm) {}
// TODO: Properly implement handler methods // TODO: Properly implement handler methods
virtual void preLoadSection() {} void preLoadSection() override {}
virtual void sectionPtr2() {} void sectionPtr2() override {}
virtual void postLoadSection() {} void postLoadSection() override {}
}; };
// TODO: Properly implement handler classes // TODO: Properly implement handler classes

12
engines/mads/mads.h
View file

@ -89,8 +89,8 @@ private:
void loadOptions(); void loadOptions();
protected: protected:
// Engine APIs // Engine APIs
virtual Common::Error run() override; Common::Error run() override;
virtual bool hasFeature(EngineFeature f) const override; bool hasFeature(EngineFeature f) const override;
public: public:
Debugger *_debugger; Debugger *_debugger;
Dialogs *_dialogs; Dialogs *_dialogs;
@ -113,7 +113,7 @@ public:
bool _disableFastwalk; bool _disableFastwalk;
public: public:
MADSEngine(OSystem *syst, const MADSGameDescription *gameDesc); MADSEngine(OSystem *syst, const MADSGameDescription *gameDesc);
virtual ~MADSEngine(); ~MADSEngine() override;
uint32 getFeatures() const; uint32 getFeatures() const;
Common::Language getLanguage() const; Common::Language getLanguage() const;
@ -145,17 +145,17 @@ public:
/** /**
* Handles loading a game via the GMM * Handles loading a game via the GMM
*/ */
virtual Common::Error loadGameState(int slot) override; Common::Error loadGameState(int slot) override;
/** /**
* Handles saving the game via the GMM * Handles saving the game via the GMM
*/ */
virtual Common::Error saveGameState(int slot, const Common::String &desc) override; Common::Error saveGameState(int slot, const Common::String &desc) override;
/** /**
* Handles updating sound settings after they're changed in the GMM dialog * Handles updating sound settings after they're changed in the GMM dialog
*/ */
virtual void syncSoundSettings() override; void syncSoundSettings() override;
void saveOptions(); void saveOptions();
}; };

20
engines/mads/menu_views.h
View file

@ -40,16 +40,16 @@ protected:
virtual void doFrame() = 0; virtual void doFrame() = 0;
virtual void display(); void display() override;
/** /**
* Event handler * Event handler
*/ */
virtual bool onEvent(Common::Event &event); bool onEvent(Common::Event &event) override;
public: public:
MenuView(MADSEngine *vm); MenuView(MADSEngine *vm);
virtual ~MenuView() {} ~MenuView() override {}
virtual void show(); virtual void show();
@ -114,9 +114,9 @@ private:
*/ */
void resetPalette(); void resetPalette();
protected: protected:
virtual void display(); void display() override;
virtual void doFrame(); void doFrame() override;
/** /**
* Called when the script is finished * Called when the script is finished
@ -130,7 +130,7 @@ public:
TextView(MADSEngine *vm); TextView(MADSEngine *vm);
virtual ~TextView(); ~TextView() override;
}; };
enum ResyncMode { NEVER, ALWAYS, BEGINNING }; enum ResyncMode { NEVER, ALWAYS, BEGINNING };
@ -210,11 +210,11 @@ private:
void scroll(); void scroll();
protected: protected:
virtual void display(); void display() override;
virtual void doFrame(); void doFrame() override;
virtual bool onEvent(Common::Event &event); bool onEvent(Common::Event &event) override;
virtual void scriptDone(); virtual void scriptDone();
public: public:
@ -225,7 +225,7 @@ public:
AnimationView(MADSEngine *vm); AnimationView(MADSEngine *vm);
virtual ~AnimationView(); ~AnimationView() override;
}; };
} // End of namespace MADS } // End of namespace MADS

4
engines/mads/msurface.h
View file

@ -86,7 +86,7 @@ public:
/** /**
* Destructor * Destructor
*/ */
virtual ~BaseSurface() {} ~BaseSurface() override {}
/** /**
* Return a rect containing the bounds of the surface * Return a rect containing the bounds of the surface
@ -175,7 +175,7 @@ protected:
* Override the addDirtyRect from Graphics::Screen, since for standard * Override the addDirtyRect from Graphics::Screen, since for standard
* surfaces we don't need dirty rects to be tracked * surfaces we don't need dirty rects to be tracked
*/ */
virtual void addDirtyRect(const Common::Rect &r) {} void addDirtyRect(const Common::Rect &r) override {}
public: public:
MSurface() : BaseSurface() {} MSurface() : BaseSurface() {}
MSurface(int width, int height) : BaseSurface(width, height) {} MSurface(int width, int height) : BaseSurface(width, height) {}

32
engines/mads/nebular/dialogs_nebular.h
View file

@ -41,7 +41,7 @@ private:
DialogsNebular(MADSEngine *vm): Dialogs(vm), _capitalizationMode(kUppercase), _dialogWidth(0) {} DialogsNebular(MADSEngine *vm): Dialogs(vm), _capitalizationMode(kUppercase), _dialogWidth(0) {}
virtual Common::String getVocab(int vocabId); Common::String getVocab(int vocabId) override;
bool textNoun(Common::String &dest, int nounId, const Common::String &source); bool textNoun(Common::String &dest, int nounId, const Common::String &source);
@ -51,11 +51,11 @@ private:
void showScummVMRestoreDialog(); void showScummVMRestoreDialog();
public: public:
virtual void showDialog(); void showDialog() override;
virtual void showItem(int objectId, int messageId, int speech = -1); void showItem(int objectId, int messageId, int speech = -1) override;
virtual bool show(int messageId, int objectId = -1); bool show(int messageId, int objectId = -1) override;
}; };
struct HOGANUS { struct HOGANUS {
@ -84,7 +84,7 @@ public:
/** /**
* Show the dialog * Show the dialog
*/ */
virtual void show(); void show() override;
bool isCorrectAnswer(); bool isCorrectAnswer();
}; };
@ -97,13 +97,13 @@ private:
uint32 _palFlags[PALETTE_COUNT]; uint32 _palFlags[PALETTE_COUNT];
RGBList _rgbList; RGBList _rgbList;
protected: protected:
virtual void save(); void save() override;
virtual void restore(); void restore() override;
public: public:
PictureDialog(MADSEngine *vm, const Common::Point &pos, int maxChars, int objectId); PictureDialog(MADSEngine *vm, const Common::Point &pos, int maxChars, int objectId);
virtual ~PictureDialog(); ~PictureDialog() override;
}; };
enum DialogTextAlign { ALIGN_NONE = 0, ALIGN_CENTER = -1, ALIGN_AT_CENTER = -2, ALIGN_RIGHT = -3 }; enum DialogTextAlign { ALIGN_NONE = 0, ALIGN_CENTER = -1, ALIGN_AT_CENTER = -2, ALIGN_RIGHT = -3 };
@ -137,7 +137,7 @@ protected:
/** /**
* Display the dialog * Display the dialog
*/ */
virtual void display(); void display() override;
/** /**
* Reset the lines list for the dialog * Reset the lines list for the dialog
@ -192,7 +192,7 @@ public:
/** /**
* Destructor * Destructor
*/ */
virtual ~GameDialog(); ~GameDialog() override;
/** /**
* Show the dialog * Show the dialog
@ -212,12 +212,12 @@ public:
/** /**
* Display the dialog * Display the dialog
*/ */
virtual void display(); void display() override;
/** /**
* Show the dialog * Show the dialog
*/ */
virtual void show(); void show() override;
}; };
class GameMenuDialog : public GameDialog { class GameMenuDialog : public GameDialog {
@ -232,12 +232,12 @@ public:
/** /**
* Display the dialog * Display the dialog
*/ */
virtual void display(); void display() override;
/** /**
* Show the dialog * Show the dialog
*/ */
virtual void show(); void show() override;
}; };
class OptionsDialog : public GameDialog { class OptionsDialog : public GameDialog {
@ -257,12 +257,12 @@ public:
/** /**
* Display the dialog * Display the dialog
*/ */
virtual void display(); void display() override;
/** /**
* Show the dialog * Show the dialog
*/ */
virtual void show(); void show() override;
}; };
} // End of namespace Nebular } // End of namespace Nebular

28
engines/mads/nebular/game_nebular.h
View file

@ -108,32 +108,32 @@ private:
protected: protected:
GameNebular(MADSEngine *vm); GameNebular(MADSEngine *vm);
virtual void startGame(); void startGame() override;
virtual void initializeGlobals(); void initializeGlobals() override;
virtual void setSectionHandler(); void setSectionHandler() override;
virtual void checkShowDialog(); void checkShowDialog() override;
public: public:
NebularGlobals _globals; NebularGlobals _globals;
StoryMode _storyMode; StoryMode _storyMode;
Difficulty _difficulty; Difficulty _difficulty;
virtual Globals &globals() { return _globals; } Globals &globals() override { return _globals; }
virtual void doObjectAction(); void doObjectAction() override;
void showRecipe(); void showRecipe();
virtual void unhandledAction(); void unhandledAction() override;
virtual void step(); void step() override;
virtual void synchronize(Common::Serializer &s, bool phase1); void synchronize(Common::Serializer &s, bool phase1) override;
virtual void setNaughtyMode(bool naughtyMode) { _storyMode = naughtyMode ? STORYMODE_NAUGHTY : STORYMODE_NICE; } void setNaughtyMode(bool naughtyMode) override { _storyMode = naughtyMode ? STORYMODE_NAUGHTY : STORYMODE_NICE; }
virtual bool getNaughtyMode() const { return _storyMode == STORYMODE_NAUGHTY; } bool getNaughtyMode() const override { return _storyMode == STORYMODE_NAUGHTY; }
}; };
// Section handlers aren't needed in ScummVM implementation // Section handlers aren't needed in ScummVM implementation
@ -141,9 +141,9 @@ class Section1Handler : public SectionHandler {
public: public:
Section1Handler(MADSEngine *vm) : SectionHandler(vm) {} Section1Handler(MADSEngine *vm) : SectionHandler(vm) {}
virtual void preLoadSection() {} void preLoadSection() override {}
virtual void sectionPtr2() {} void sectionPtr2() override {}
virtual void postLoadSection() {} void postLoadSection() override {}
}; };
typedef Section1Handler Section2Handler; typedef Section1Handler Section2Handler;

14
engines/mads/nebular/menu_nebular.h
View file

@ -99,21 +99,21 @@ protected:
/** /**
* Display the menu * Display the menu
*/ */
virtual void display(); void display() override;
/** /**
* Handle the menu item animations * Handle the menu item animations
*/ */
virtual void doFrame(); void doFrame() override;
/** /**
* Event handler * Event handler
*/ */
virtual bool onEvent(Common::Event &event); bool onEvent(Common::Event &event) override;
public: public:
MainMenu(MADSEngine *vm); MainMenu(MADSEngine *vm);
virtual ~MainMenu(); ~MainMenu() override;
}; };
class AdvertView : public EventTarget { class AdvertView : public EventTarget {
@ -131,11 +131,11 @@ protected:
/** /**
* Event handler * Event handler
*/ */
virtual bool onEvent(Common::Event &event); bool onEvent(Common::Event &event) override;
public: public:
AdvertView(MADSEngine *vm); AdvertView(MADSEngine *vm);
virtual ~AdvertView() {} ~AdvertView() override {}
/** /**
* Show the dialog * Show the dialog
@ -145,7 +145,7 @@ public:
class RexAnimationView : public AnimationView { class RexAnimationView : public AnimationView {
protected: protected:
virtual void scriptDone(); void scriptDone() override;
public: public:
RexAnimationView(MADSEngine *vm) : AnimationView(vm) {} RexAnimationView(MADSEngine *vm) : AnimationView(vm) {}
}; };

4
engines/mads/nebular/nebular_scenes.h
View file

@ -1373,9 +1373,9 @@ public:
class SceneInfoNebular : public SceneInfo { class SceneInfoNebular : public SceneInfo {
friend class SceneInfo; friend class SceneInfo;
protected: protected:
virtual void loadCodes(BaseSurface &depthSurface, int variant); void loadCodes(BaseSurface &depthSurface, int variant) override;
virtual void loadCodes(BaseSurface &depthSurface, Common::SeekableReadStream *stream); void loadCodes(BaseSurface &depthSurface, Common::SeekableReadStream *stream) override;
/** /**
* Constructor * Constructor

138
engines/mads/nebular/nebular_scenes1.h
View file

@ -68,13 +68,13 @@ private:
public: public:
Scene101(MADSEngine *vm); Scene101(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene102 : public Scene1xx { class Scene102 : public Scene1xx {
@ -92,14 +92,14 @@ private:
public: public:
Scene102(MADSEngine *vm); Scene102(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
virtual void postActions(); void postActions() override;
}; };
class Scene103 : public Scene1xx { class Scene103 : public Scene1xx {
@ -108,13 +108,13 @@ private:
public: public:
Scene103(MADSEngine *vm); Scene103(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void actions(); void actions() override;
virtual void postActions(); void postActions() override;
}; };
class Scene104 : public Scene1xx { class Scene104 : public Scene1xx {
@ -124,13 +124,13 @@ private:
public: public:
Scene104(MADSEngine *vm); Scene104(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene105 : public Scene1xx { class Scene105 : public Scene1xx {
@ -139,13 +139,13 @@ private:
public: public:
Scene105(MADSEngine *vm); Scene105(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene106 : public Scene1xx { class Scene106 : public Scene1xx {
@ -158,13 +158,13 @@ private:
public: public:
Scene106(MADSEngine *vm); Scene106(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene107 : public Scene1xx { class Scene107 : public Scene1xx {
@ -173,23 +173,23 @@ private:
public: public:
Scene107(MADSEngine *vm); Scene107(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene108 : public Scene1xx { class Scene108 : public Scene1xx {
public: public:
Scene108(MADSEngine *vm) : Scene1xx(vm) {} Scene108(MADSEngine *vm) : Scene1xx(vm) {}
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene109 : public Scene1xx { class Scene109 : public Scene1xx {
@ -206,13 +206,13 @@ private:
public: public:
Scene109(MADSEngine *vm); Scene109(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene110 : public Scene1xx { class Scene110 : public Scene1xx {
@ -221,13 +221,13 @@ private:
public: public:
Scene110(MADSEngine *vm); Scene110(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene111 : public Scene1xx { class Scene111 : public Scene1xx {
@ -239,23 +239,23 @@ private:
public: public:
Scene111(MADSEngine *vm); Scene111(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene112 : public Scene1xx { class Scene112 : public Scene1xx {
public: public:
Scene112(MADSEngine *vm) : Scene1xx(vm) {} Scene112(MADSEngine *vm) : Scene1xx(vm) {}
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void actions() {}; void actions() override {};
}; };
} // End of namespace Nebular } // End of namespace Nebular

148
engines/mads/nebular/nebular_scenes2.h
View file

@ -55,12 +55,12 @@ private:
public: public:
Scene201(MADSEngine *vm); Scene201(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void actions(); void actions() override;
}; };
class Scene202 : public Scene2xx { class Scene202 : public Scene2xx {
@ -77,13 +77,13 @@ private:
public: public:
Scene202(MADSEngine *vm); Scene202(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
void setRandomKernelMessage(); void setRandomKernelMessage();
}; };
@ -94,13 +94,13 @@ private:
public: public:
Scene203(MADSEngine *vm); Scene203(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene205 : public Scene2xx { class Scene205 : public Scene2xx {
@ -114,12 +114,12 @@ private:
public: public:
Scene205(MADSEngine *vm); Scene205(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void actions(); void actions() override;
}; };
class Scene207 : public Scene2xx { class Scene207 : public Scene2xx {
@ -133,13 +133,13 @@ private:
public: public:
Scene207(MADSEngine *vm); Scene207(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene208 : public Scene2xx { class Scene208 : public Scene2xx {
@ -152,13 +152,13 @@ private:
public: public:
Scene208(MADSEngine *vm); Scene208(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene209 : public Scene2xx { class Scene209 : public Scene2xx {
@ -198,13 +198,13 @@ private:
public: public:
Scene209(MADSEngine *vm); Scene209(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene210 : public Scene2xx { class Scene210 : public Scene2xx {
@ -237,13 +237,13 @@ private:
public: public:
Scene210(MADSEngine *vm); Scene210(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene211 : public Scene2xx { class Scene211 : public Scene2xx {
@ -254,33 +254,33 @@ private:
public: public:
Scene211(MADSEngine *vm); Scene211(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene212 : public Scene2xx { class Scene212 : public Scene2xx {
public: public:
Scene212(MADSEngine *vm) : Scene2xx(vm) {} Scene212(MADSEngine *vm) : Scene2xx(vm) {}
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene213 : public SceneTeleporter { class Scene213 : public SceneTeleporter {
public: public:
Scene213(MADSEngine *vm) : SceneTeleporter(vm) {} Scene213(MADSEngine *vm) : SceneTeleporter(vm) {}
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void actions(); void actions() override;
}; };
class Scene214 : public Scene2xx { class Scene214 : public Scene2xx {
@ -290,32 +290,32 @@ private:
public: public:
Scene214(MADSEngine *vm); Scene214(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void actions(); void actions() override;
}; };
class Scene215 : public Scene2xx { class Scene215 : public Scene2xx {
public: public:
Scene215(MADSEngine *vm) : Scene2xx(vm) {} Scene215(MADSEngine *vm) : Scene2xx(vm) {}
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void actions(); void actions() override;
}; };
class Scene216 : public Scene2xx { class Scene216 : public Scene2xx {
public: public:
Scene216(MADSEngine *vm) : Scene2xx(vm) {} Scene216(MADSEngine *vm) : Scene2xx(vm) {}
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void actions() {}; void actions() override {};
}; };
} // End of namespace Nebular } // End of namespace Nebular

260
engines/mads/nebular/nebular_scenes3.h
View file

@ -78,23 +78,23 @@ protected:
public: public:
Scene3xx(MADSEngine *vm) : NebularScene(vm) {} Scene3xx(MADSEngine *vm) : NebularScene(vm) {}
virtual void actions() {} void actions() override {}
}; };
class Scene300s : public Scene3xx { class Scene300s : public Scene3xx {
public: public:
Scene300s(MADSEngine *vm) : Scene3xx(vm) {} Scene300s(MADSEngine *vm) : Scene3xx(vm) {}
virtual void preActions(); void preActions() override;
}; };
class Scene301 : public Scene3xx { class Scene301 : public Scene3xx {
public: public:
Scene301(MADSEngine *vm) : Scene3xx(vm) {} Scene301(MADSEngine *vm) : Scene3xx(vm) {}
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
}; };
class Scene302 : public Scene3xx { class Scene302 : public Scene3xx {
@ -103,20 +103,20 @@ private:
public: public:
Scene302(MADSEngine *vm); Scene302(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
}; };
class Scene303 : public Scene3xx { class Scene303 : public Scene3xx {
public: public:
Scene303(MADSEngine *vm) : Scene3xx(vm) {} Scene303(MADSEngine *vm) : Scene3xx(vm) {}
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
}; };
class Scene304 : public Scene3xx { class Scene304 : public Scene3xx {
@ -125,11 +125,11 @@ private:
public: public:
Scene304(MADSEngine *vm); Scene304(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
}; };
class Scene307 : public Scene3xx { class Scene307 : public Scene3xx {
@ -162,12 +162,12 @@ private:
public: public:
Scene307(MADSEngine *vm); Scene307(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void actions(); void actions() override;
}; };
class Scene308 : public Scene3xx { class Scene308 : public Scene3xx {
@ -176,11 +176,11 @@ private:
public: public:
Scene308(MADSEngine *vm); Scene308(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
}; };
class Scene309 : public Scene3xx { class Scene309 : public Scene3xx {
@ -192,11 +192,11 @@ private:
public: public:
Scene309(MADSEngine *vm); Scene309(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
}; };
class Scene310 : public Scene3xx { class Scene310 : public Scene3xx {
@ -205,11 +205,11 @@ private:
public: public:
Scene310(MADSEngine *vm); Scene310(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
}; };
class Scene311 : public Scene3xx { class Scene311 : public Scene3xx {
@ -218,21 +218,21 @@ private:
public: public:
Scene311(MADSEngine *vm); Scene311(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void actions(); void actions() override;
}; };
class Scene313 : public Scene3xx { class Scene313 : public Scene3xx {
public: public:
Scene313(MADSEngine *vm) : Scene3xx(vm) {} Scene313(MADSEngine *vm) : Scene3xx(vm) {}
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void actions(); void actions() override;
}; };
class Scene316 : public Scene3xx { class Scene316 : public Scene3xx {
@ -243,11 +243,11 @@ private:
public: public:
Scene316(MADSEngine *vm) : Scene3xx(vm) {} Scene316(MADSEngine *vm) : Scene3xx(vm) {}
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene318 : public Scene3xx { class Scene318 : public Scene3xx {
@ -277,13 +277,13 @@ private:
public: public:
Scene318(MADSEngine *vm); Scene318(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene319 : public Scene3xx { class Scene319 : public Scene3xx {
@ -306,12 +306,12 @@ private:
void handleSlacheDialogs(int quoteId, int counter, uint32 timer); void handleSlacheDialogs(int quoteId, int counter, uint32 timer);
public: public:
Scene319(MADSEngine *vm); Scene319(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void actions(); void actions() override;
}; };
class Scene320 : public Scene300s { class Scene320 : public Scene300s {
@ -331,41 +331,41 @@ private:
public: public:
Scene320(MADSEngine *vm); Scene320(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void actions(); void actions() override;
}; };
class Scene321 : public Scene3xx { class Scene321 : public Scene3xx {
public: public:
Scene321(MADSEngine *vm) : Scene3xx(vm) {} Scene321(MADSEngine *vm) : Scene3xx(vm) {}
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
}; };
class Scene322 : public SceneTeleporter { class Scene322 : public SceneTeleporter {
public: public:
Scene322(MADSEngine *vm) : SceneTeleporter(vm) {} Scene322(MADSEngine *vm) : SceneTeleporter(vm) {}
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void actions(); void actions() override;
}; };
class Scene351 : public Scene3xx { class Scene351 : public Scene3xx {
public: public:
Scene351(MADSEngine *vm) : Scene3xx(vm) {} Scene351(MADSEngine *vm) : Scene3xx(vm) {}
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void actions(); void actions() override;
}; };
class Scene352 : public Scene3xx { class Scene352 : public Scene3xx {
@ -385,51 +385,51 @@ private:
public: public:
Scene352(MADSEngine *vm); Scene352(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene353 : public Scene3xx { class Scene353 : public Scene3xx {
public: public:
Scene353(MADSEngine *vm) : Scene3xx(vm) {} Scene353(MADSEngine *vm) : Scene3xx(vm) {}
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void actions(); void actions() override;
}; };
class Scene354 : public Scene3xx { class Scene354 : public Scene3xx {
public: public:
Scene354(MADSEngine *vm) : Scene3xx(vm) {} Scene354(MADSEngine *vm) : Scene3xx(vm) {}
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene357 : public Scene3xx { class Scene357 : public Scene3xx {
public: public:
Scene357(MADSEngine *vm) : Scene3xx(vm) {} Scene357(MADSEngine *vm) : Scene3xx(vm) {}
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene358 : public Scene3xx { class Scene358 : public Scene3xx {
public: public:
Scene358(MADSEngine *vm) : Scene3xx(vm) {} Scene358(MADSEngine *vm) : Scene3xx(vm) {}
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene359 : public Scene3xx { class Scene359 : public Scene3xx {
@ -438,22 +438,22 @@ private:
public: public:
Scene359(MADSEngine *vm); Scene359(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene360 : public Scene3xx { class Scene360 : public Scene3xx {
public: public:
Scene360(MADSEngine *vm) : Scene3xx(vm) {} Scene360(MADSEngine *vm) : Scene3xx(vm) {}
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene361 : public Scene3xx { class Scene361 : public Scene3xx {
@ -464,38 +464,38 @@ private:
public: public:
Scene361(MADSEngine *vm) : Scene3xx(vm) {} Scene361(MADSEngine *vm) : Scene3xx(vm) {}
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene366 : public Scene300s { class Scene366 : public Scene300s {
public: public:
Scene366(MADSEngine *vm) : Scene300s(vm) {} Scene366(MADSEngine *vm) : Scene300s(vm) {}
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void actions(); void actions() override;
}; };
class Scene387 : public Scene300s { class Scene387 : public Scene300s {
public: public:
Scene387(MADSEngine *vm) : Scene300s(vm) {} Scene387(MADSEngine *vm) : Scene300s(vm) {}
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void actions(); void actions() override;
}; };
class Scene388 : public Scene300s { class Scene388 : public Scene300s {
public: public:
Scene388(MADSEngine *vm) : Scene300s(vm) {} Scene388(MADSEngine *vm) : Scene300s(vm) {}
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void actions(); void actions() override;
}; };
class Scene389 : public Scene300s { class Scene389 : public Scene300s {
@ -506,39 +506,39 @@ private:
public: public:
Scene389(MADSEngine *vm); Scene389(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void actions(); void actions() override;
}; };
class Scene390 : public Scene300s { class Scene390 : public Scene300s {
public: public:
Scene390(MADSEngine *vm) : Scene300s(vm) {} Scene390(MADSEngine *vm) : Scene300s(vm) {}
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void actions(); void actions() override;
}; };
class Scene391 : public Scene300s { class Scene391 : public Scene300s {
public: public:
Scene391(MADSEngine *vm) : Scene300s(vm) {} Scene391(MADSEngine *vm) : Scene300s(vm) {}
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void actions(); void actions() override;
}; };
class Scene399 : public Scene300s { class Scene399 : public Scene300s {
public: public:
Scene399(MADSEngine *vm) : Scene300s(vm) {} Scene399(MADSEngine *vm) : Scene300s(vm) {}
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void actions(); void actions() override;
}; };
} // End of namespace Nebular } // End of namespace Nebular

108
engines/mads/nebular/nebular_scenes4.h
View file

@ -58,13 +58,13 @@ private:
public: public:
Scene401(MADSEngine *vm); Scene401(MADSEngine *vm);
void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene402 : public Scene4xx { class Scene402 : public Scene4xx {
@ -119,24 +119,24 @@ private:
public: public:
Scene402(MADSEngine *vm); Scene402(MADSEngine *vm);
void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene405 : public Scene4xx { class Scene405 : public Scene4xx {
public: public:
Scene405(MADSEngine *vm) : Scene4xx(vm) {} Scene405(MADSEngine *vm) : Scene4xx(vm) {}
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene406 : public Scene4xx { class Scene406 : public Scene4xx {
@ -145,13 +145,13 @@ private:
public: public:
Scene406(MADSEngine *vm); Scene406(MADSEngine *vm);
void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene407 : public Scene4xx { class Scene407 : public Scene4xx {
@ -161,44 +161,44 @@ private:
public: public:
Scene407(MADSEngine *vm); Scene407(MADSEngine *vm);
void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene408 : public Scene4xx { class Scene408 : public Scene4xx {
public: public:
Scene408(MADSEngine *vm) : Scene4xx(vm) {} Scene408(MADSEngine *vm) : Scene4xx(vm) {}
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene409 : public SceneTeleporter { class Scene409 : public SceneTeleporter {
public: public:
Scene409(MADSEngine *vm) : SceneTeleporter(vm) {} Scene409(MADSEngine *vm) : SceneTeleporter(vm) {}
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void actions(); void actions() override;
}; };
class Scene410 : public Scene4xx { class Scene410 : public Scene4xx {
public: public:
Scene410(MADSEngine *vm) : Scene4xx(vm) {} Scene410(MADSEngine *vm) : Scene4xx(vm) {}
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene411 : public Scene4xx { class Scene411 : public Scene4xx {
@ -228,13 +228,13 @@ private:
public: public:
Scene411(MADSEngine *vm); Scene411(MADSEngine *vm);
void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene413 : public Scene4xx { class Scene413 : public Scene4xx {
@ -244,13 +244,13 @@ private:
public: public:
Scene413(MADSEngine *vm); Scene413(MADSEngine *vm);
void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
} // End of namespace Nebular } // End of namespace Nebular
} // End of namespace MADS } // End of namespace MADS

124
engines/mads/nebular/nebular_scenes5.h
View file

@ -61,23 +61,23 @@ private:
public: public:
Scene501(MADSEngine *vm); Scene501(MADSEngine *vm);
void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene502 : public SceneTeleporter { class Scene502 : public SceneTeleporter {
public: public:
Scene502(MADSEngine *vm) : SceneTeleporter(vm) {} Scene502(MADSEngine *vm) : SceneTeleporter(vm) {}
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void actions(); void actions() override;
}; };
class Scene503 : public Scene5xx{ class Scene503 : public Scene5xx{
@ -86,11 +86,11 @@ private:
public: public:
Scene503(MADSEngine *vm); Scene503(MADSEngine *vm);
void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void actions(); void actions() override;
}; };
class Scene504 : public Scene5xx{ class Scene504 : public Scene5xx{
@ -100,13 +100,13 @@ private:
public: public:
Scene504(MADSEngine *vm); Scene504(MADSEngine *vm);
void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene505 : public Scene5xx{ class Scene505 : public Scene5xx{
@ -121,12 +121,12 @@ private:
public: public:
Scene505(MADSEngine *vm); Scene505(MADSEngine *vm);
void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void actions(); void actions() override;
}; };
class Scene506 : public Scene5xx{ class Scene506 : public Scene5xx{
@ -147,12 +147,12 @@ private:
public: public:
Scene506(MADSEngine *vm); Scene506(MADSEngine *vm);
void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void actions(); void actions() override;
}; };
class Scene507 : public Scene5xx{ class Scene507 : public Scene5xx{
@ -161,11 +161,11 @@ private:
public: public:
Scene507(MADSEngine *vm); Scene507(MADSEngine *vm);
void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void actions(); void actions() override;
}; };
class Scene508 : public Scene5xx{ class Scene508 : public Scene5xx{
@ -176,12 +176,12 @@ private:
public: public:
Scene508(MADSEngine *vm); Scene508(MADSEngine *vm);
void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene511 : public Scene5xx{ class Scene511 : public Scene5xx{
@ -195,13 +195,13 @@ private:
public: public:
Scene511(MADSEngine *vm); Scene511(MADSEngine *vm);
void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene512 : public Scene5xx{ class Scene512 : public Scene5xx{
@ -211,42 +211,42 @@ private:
public: public:
Scene512(MADSEngine *vm); Scene512(MADSEngine *vm);
void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void actions(); void actions() override;
}; };
class Scene513 : public Scene5xx{ class Scene513 : public Scene5xx{
public: public:
Scene513(MADSEngine *vm) : Scene5xx(vm) {} Scene513(MADSEngine *vm) : Scene5xx(vm) {}
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void actions(); void actions() override;
}; };
class Scene515 : public Scene5xx{ class Scene515 : public Scene5xx{
public: public:
Scene515(MADSEngine *vm) : Scene5xx(vm) {} Scene515(MADSEngine *vm) : Scene5xx(vm) {}
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void actions() {}; void actions() override {};
}; };
class Scene551 : public Scene5xx{ class Scene551 : public Scene5xx{
public: public:
Scene551(MADSEngine *vm) : Scene5xx(vm) {} Scene551(MADSEngine *vm) : Scene5xx(vm) {}
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
} // End of namespace Nebular } // End of namespace Nebular
} // End of namespace MADS } // End of namespace MADS

118
engines/mads/nebular/nebular_scenes6.h
View file

@ -54,10 +54,10 @@ class Scene601 : public Scene6xx{
public: public:
Scene601(MADSEngine *vm) : Scene6xx(vm) {} Scene601(MADSEngine *vm) : Scene6xx(vm) {}
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void actions(); void actions() override;
}; };
class Scene602 : public Scene6xx{ class Scene602 : public Scene6xx{
@ -71,11 +71,11 @@ private:
public: public:
Scene602(MADSEngine *vm); Scene602(MADSEngine *vm);
void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void actions(); void actions() override;
}; };
class Scene603 : public Scene6xx{ class Scene603 : public Scene6xx{
@ -85,11 +85,11 @@ private:
public: public:
Scene603(MADSEngine *vm); Scene603(MADSEngine *vm);
void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void actions(); void actions() override;
}; };
class Scene604 : public Scene6xx{ class Scene604 : public Scene6xx{
@ -107,22 +107,22 @@ private:
public: public:
Scene604(MADSEngine *vm); Scene604(MADSEngine *vm);
void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void actions(); void actions() override;
}; };
class Scene605 : public Scene6xx{ class Scene605 : public Scene6xx{
public: public:
Scene605(MADSEngine *vm) : Scene6xx(vm) {} Scene605(MADSEngine *vm) : Scene6xx(vm) {}
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void actions(); void actions() override;
}; };
class Scene607 : public Scene6xx{ class Scene607 : public Scene6xx{
@ -143,13 +143,13 @@ private:
public: public:
Scene607(MADSEngine *vm); Scene607(MADSEngine *vm);
void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene608 : public Scene6xx{ class Scene608 : public Scene6xx{
@ -191,13 +191,13 @@ private:
public: public:
Scene608(MADSEngine *vm); Scene608(MADSEngine *vm);
void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene609 : public Scene6xx{ class Scene609 : public Scene6xx{
@ -208,13 +208,13 @@ private:
public: public:
Scene609(MADSEngine *vm); Scene609(MADSEngine *vm);
void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene610 : public Scene6xx{ class Scene610 : public Scene6xx{
@ -229,12 +229,12 @@ private:
public: public:
Scene610(MADSEngine *vm); Scene610(MADSEngine *vm);
void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void actions(); void actions() override;
}; };
class Scene611 : public Scene6xx{ class Scene611 : public Scene6xx{
@ -281,13 +281,13 @@ private:
public: public:
Scene611(MADSEngine *vm); Scene611(MADSEngine *vm);
void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene612 : public Scene6xx{ class Scene612 : public Scene6xx{
@ -299,22 +299,22 @@ private:
public: public:
Scene612(MADSEngine *vm); Scene612(MADSEngine *vm);
void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void actions(); void actions() override;
}; };
class Scene620 : public Scene6xx{ class Scene620 : public Scene6xx{
public: public:
Scene620(MADSEngine *vm) : Scene6xx(vm) {} Scene620(MADSEngine *vm) : Scene6xx(vm) {}
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void actions() {}; void actions() override {};
}; };
} // End of namespace Nebular } // End of namespace Nebular
} // End of namespace MADS } // End of namespace MADS

110
engines/mads/nebular/nebular_scenes7.h
View file

@ -56,23 +56,23 @@ private:
public: public:
Scene701(MADSEngine *vm); Scene701(MADSEngine *vm);
void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
virtual void step(); void step() override;
}; };
class Scene702 : public Scene7xx { class Scene702 : public Scene7xx {
public: public:
Scene702(MADSEngine *vm) : Scene7xx(vm) {} Scene702(MADSEngine *vm) : Scene7xx(vm) {}
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene703 : public Scene7xx{ class Scene703 : public Scene7xx{
@ -98,12 +98,12 @@ private:
public: public:
Scene703(MADSEngine *vm); Scene703(MADSEngine *vm);
void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void actions(); void actions() override;
}; };
class Scene704 : public Scene7xx{ class Scene704 : public Scene7xx{
@ -123,12 +123,12 @@ private:
public: public:
Scene704(MADSEngine *vm); Scene704(MADSEngine *vm);
void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void actions(); void actions() override;
}; };
class Scene705 : public Scene7xx{ class Scene705 : public Scene7xx{
@ -141,12 +141,12 @@ private:
public: public:
Scene705(MADSEngine *vm) : Scene7xx(vm) {} Scene705(MADSEngine *vm) : Scene7xx(vm) {}
void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void actions(); void actions() override;
}; };
class Scene706 : public Scene7xx{ class Scene706 : public Scene7xx{
@ -163,43 +163,43 @@ private:
public: public:
Scene706(MADSEngine *vm); Scene706(MADSEngine *vm);
void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene707 : public SceneTeleporter { class Scene707 : public SceneTeleporter {
public: public:
Scene707(MADSEngine *vm) : SceneTeleporter(vm) {} Scene707(MADSEngine *vm) : SceneTeleporter(vm) {}
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void actions(); void actions() override;
}; };
class Scene710 : public Scene7xx { class Scene710 : public Scene7xx {
public: public:
Scene710(MADSEngine *vm) : Scene7xx(vm) {} Scene710(MADSEngine *vm) : Scene7xx(vm) {}
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void actions(); void actions() override;
}; };
class Scene711 : public SceneTeleporter { class Scene711 : public SceneTeleporter {
public: public:
Scene711(MADSEngine *vm) : SceneTeleporter(vm) {} Scene711(MADSEngine *vm) : SceneTeleporter(vm) {}
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void actions(); void actions() override;
}; };
class Scene751 : public Scene7xx{ class Scene751 : public Scene7xx{
@ -208,13 +208,13 @@ private:
public: public:
Scene751(MADSEngine *vm); Scene751(MADSEngine *vm);
void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene752 : public Scene7xx { class Scene752 : public Scene7xx {
@ -223,13 +223,13 @@ private:
public: public:
Scene752(MADSEngine *vm); Scene752(MADSEngine *vm);
void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
} // End of namespace Nebular } // End of namespace Nebular

78
engines/mads/nebular/nebular_scenes8.h
View file

@ -58,35 +58,35 @@ private:
public: public:
Scene801(MADSEngine *vm); Scene801(MADSEngine *vm);
void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene802 : public Scene8xx{ class Scene802 : public Scene8xx{
public: public:
Scene802(MADSEngine *vm) : Scene8xx(vm) {} Scene802(MADSEngine *vm) : Scene8xx(vm) {}
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene803 : public Scene8xx{ class Scene803 : public Scene8xx{
public: public:
Scene803(MADSEngine *vm) : Scene8xx(vm) {} Scene803(MADSEngine *vm) : Scene8xx(vm) {}
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene804 : public Scene8xx { class Scene804 : public Scene8xx {
@ -103,33 +103,33 @@ private:
public: public:
Scene804(MADSEngine *vm); Scene804(MADSEngine *vm);
void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void actions(); void actions() override;
}; };
class Scene805 : public Scene8xx{ class Scene805 : public Scene8xx{
public: public:
Scene805(MADSEngine *vm) : Scene8xx(vm) {} Scene805(MADSEngine *vm) : Scene8xx(vm) {}
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene807 : public SceneTeleporter { class Scene807 : public SceneTeleporter {
public: public:
Scene807(MADSEngine *vm) : SceneTeleporter(vm) {} Scene807(MADSEngine *vm) : SceneTeleporter(vm) {}
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void actions(); void actions() override;
}; };
class Scene808 : public Scene8xx{ class Scene808 : public Scene8xx{
@ -138,11 +138,11 @@ private:
public: public:
Scene808(MADSEngine *vm); Scene808(MADSEngine *vm);
void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void actions(); void actions() override;
}; };
class Scene810 : public Scene8xx{ class Scene810 : public Scene8xx{
@ -151,12 +151,12 @@ private:
public: public:
Scene810(MADSEngine *vm); Scene810(MADSEngine *vm);
void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void actions() {}; void actions() override {};
}; };
} // End of namespace Nebular } // End of namespace Nebular

20
engines/mads/nebular/sound_nebular.h
View file

@ -421,7 +421,7 @@ private:
public: public:
ASound1(Audio::Mixer *mixer, OPL::OPL *opl); ASound1(Audio::Mixer *mixer, OPL::OPL *opl);
virtual int command(int commandId, int param); int command(int commandId, int param) override;
}; };
class ASound2 : public ASound { class ASound2 : public ASound {
@ -431,7 +431,7 @@ private:
typedef int (ASound2::*CommandPtr)(); typedef int (ASound2::*CommandPtr)();
static const CommandPtr _commandList[44]; static const CommandPtr _commandList[44];
virtual int command0(); int command0() override;
int command9(); int command9();
int command10(); int command10();
int command11(); int command11();
@ -473,7 +473,7 @@ private:
public: public:
ASound2(Audio::Mixer *mixer, OPL::OPL *opl); ASound2(Audio::Mixer *mixer, OPL::OPL *opl);
virtual int command(int commandId, int param); int command(int commandId, int param) override;
}; };
class ASound3 : public ASound { class ASound3 : public ASound {
@ -533,7 +533,7 @@ private:
public: public:
ASound3(Audio::Mixer *mixer, OPL::OPL *opl); ASound3(Audio::Mixer *mixer, OPL::OPL *opl);
virtual int command(int commandId, int param); int command(int commandId, int param) override;
}; };
class ASound4 : public ASound { class ASound4 : public ASound {
@ -571,7 +571,7 @@ private:
public: public:
ASound4(Audio::Mixer *mixer, OPL::OPL *opl); ASound4(Audio::Mixer *mixer, OPL::OPL *opl);
virtual int command(int commandId, int param); int command(int commandId, int param) override;
}; };
class ASound5 : public ASound { class ASound5 : public ASound {
@ -617,7 +617,7 @@ private:
public: public:
ASound5(Audio::Mixer *mixer, OPL::OPL *opl); ASound5(Audio::Mixer *mixer, OPL::OPL *opl);
virtual int command(int commandId, int param); int command(int commandId, int param) override;
}; };
class ASound6 : public ASound { class ASound6 : public ASound {
@ -646,7 +646,7 @@ private:
public: public:
ASound6(Audio::Mixer *mixer, OPL::OPL *opl); ASound6(Audio::Mixer *mixer, OPL::OPL *opl);
virtual int command(int commandId, int param); int command(int commandId, int param) override;
}; };
class ASound7 : public ASound { class ASound7 : public ASound {
@ -678,7 +678,7 @@ private:
public: public:
ASound7(Audio::Mixer *mixer, OPL::OPL *opl); ASound7(Audio::Mixer *mixer, OPL::OPL *opl);
virtual int command(int commandId, int param); int command(int commandId, int param) override;
}; };
class ASound8 : public ASound { class ASound8 : public ASound {
@ -721,7 +721,7 @@ private:
public: public:
ASound8(Audio::Mixer *mixer, OPL::OPL *opl); ASound8(Audio::Mixer *mixer, OPL::OPL *opl);
virtual int command(int commandId, int param); int command(int commandId, int param) override;
}; };
class ASound9 : public ASound { class ASound9 : public ASound {
@ -780,7 +780,7 @@ private:
public: public:
ASound9(Audio::Mixer *mixer, OPL::OPL *opl); ASound9(Audio::Mixer *mixer, OPL::OPL *opl);
virtual int command(int commandId, int param); int command(int commandId, int param) override;
}; };
} // End of namespace Nebular } // End of namespace Nebular

24
engines/mads/phantom/game_phantom.h
View file

@ -102,27 +102,27 @@ private:
protected: protected:
GamePhantom(MADSEngine *vm); GamePhantom(MADSEngine *vm);
virtual void startGame(); void startGame() override;
virtual void initializeGlobals(); void initializeGlobals() override;
virtual void setSectionHandler(); void setSectionHandler() override;
virtual void checkShowDialog(); void checkShowDialog() override;
public: public:
PhantomGlobals _globals; PhantomGlobals _globals;
Difficulty _difficulty; Difficulty _difficulty;
virtual Globals &globals() { return _globals; } Globals &globals() override { return _globals; }
virtual void doObjectAction(); void doObjectAction() override;
virtual void unhandledAction(); void unhandledAction() override;
virtual void step(); void step() override;
virtual void synchronize(Common::Serializer &s, bool phase1); void synchronize(Common::Serializer &s, bool phase1) override;
void setupCatacombs(); void setupCatacombs();
void enterCatacombs(bool val); void enterCatacombs(bool val);
@ -137,9 +137,9 @@ class Section1Handler : public SectionHandler {
public: public:
Section1Handler(MADSEngine *vm) : SectionHandler(vm) {} Section1Handler(MADSEngine *vm) : SectionHandler(vm) {}
virtual void preLoadSection() {} void preLoadSection() override {}
virtual void sectionPtr2() {} void sectionPtr2() override {}
virtual void postLoadSection() {} void postLoadSection() override {}
}; };
typedef Section1Handler Section2Handler; typedef Section1Handler Section2Handler;

4
engines/mads/phantom/phantom_scenes.h
View file

@ -474,9 +474,9 @@ public:
class SceneInfoPhantom : public SceneInfo { class SceneInfoPhantom : public SceneInfo {
friend class SceneInfo; friend class SceneInfo;
protected: protected:
virtual void loadCodes(BaseSurface &depthSurface, int variant); void loadCodes(BaseSurface &depthSurface, int variant) override;
virtual void loadCodes(BaseSurface &depthSurface, Common::SeekableReadStream *stream); void loadCodes(BaseSurface &depthSurface, Common::SeekableReadStream *stream) override;
/** /**
* Constructor * Constructor

180
engines/mads/phantom/phantom_scenes1.h
View file

@ -71,13 +71,13 @@ private:
bool _startSittingFl; bool _startSittingFl;
public: public:
Scene101(MADSEngine *vm); Scene101(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
void handleConversation0(); void handleConversation0();
void handleConversation1(); void handleConversation1();
@ -91,13 +91,13 @@ private:
public: public:
Scene102(MADSEngine *vm); Scene102(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene103 : public Scene1xx { class Scene103 : public Scene1xx {
@ -141,13 +141,13 @@ private:
public: public:
Scene103(MADSEngine *vm); Scene103(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene104 : public Scene1xx { class Scene104 : public Scene1xx {
@ -183,25 +183,25 @@ private:
public: public:
Scene104(MADSEngine *vm); Scene104(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene105 : public Scene1xx { class Scene105 : public Scene1xx {
public: public:
Scene105(MADSEngine *vm); Scene105(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene106 : public Scene1xx { class Scene106 : public Scene1xx {
@ -209,25 +209,25 @@ private:
int _sandbagHostpotId; int _sandbagHostpotId;
public: public:
Scene106(MADSEngine *vm); Scene106(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene107 : public Scene1xx { class Scene107 : public Scene1xx {
public: public:
Scene107(MADSEngine *vm); Scene107(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene108 : public Scene1xx { class Scene108 : public Scene1xx {
@ -248,13 +248,13 @@ private:
public: public:
Scene108(MADSEngine *vm); Scene108(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene109 : public Scene1xx { class Scene109 : public Scene1xx {
@ -267,25 +267,25 @@ private:
public: public:
Scene109(MADSEngine *vm); Scene109(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene110 : public Scene1xx { class Scene110 : public Scene1xx {
public: public:
Scene110(MADSEngine *vm); Scene110(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene111 : public Scene1xx { class Scene111 : public Scene1xx {
@ -302,13 +302,13 @@ private:
public: public:
Scene111(MADSEngine *vm); Scene111(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene112 : public Scene1xx { class Scene112 : public Scene1xx {
@ -330,13 +330,13 @@ private:
public: public:
Scene112(MADSEngine *vm); Scene112(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene113 : public Scene1xx { class Scene113 : public Scene1xx {
@ -383,37 +383,37 @@ private:
public: public:
Scene113(MADSEngine *vm); Scene113(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene114 : public Scene1xx { class Scene114 : public Scene1xx {
public: public:
Scene114(MADSEngine *vm); Scene114(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene150 : public Scene1xx { class Scene150 : public Scene1xx {
public: public:
Scene150(MADSEngine *vm); Scene150(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
} // End of namespace Phantom } // End of namespace Phantom
} // End of namespace MADS } // End of namespace MADS

108
engines/mads/phantom/phantom_scenes2.h
View file

@ -70,13 +70,13 @@ private:
public: public:
Scene201(MADSEngine *vm); Scene201(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene202 : public Scene2xx { class Scene202 : public Scene2xx {
@ -102,13 +102,13 @@ private:
public: public:
Scene202(MADSEngine *vm); Scene202(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene203 : public Scene2xx { class Scene203 : public Scene2xx {
@ -141,13 +141,13 @@ private:
public: public:
Scene203(MADSEngine *vm); Scene203(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene204 : public Scene2xx { class Scene204 : public Scene2xx {
@ -179,13 +179,13 @@ private:
public: public:
Scene204(MADSEngine *vm); Scene204(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene205 : public Scene2xx { class Scene205 : public Scene2xx {
@ -212,13 +212,13 @@ private:
public: public:
Scene205(MADSEngine *vm); Scene205(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene206 : public Scene2xx { class Scene206 : public Scene2xx {
@ -229,13 +229,13 @@ private:
public: public:
Scene206(MADSEngine *vm); Scene206(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene207 : public Scene2xx { class Scene207 : public Scene2xx {
@ -245,13 +245,13 @@ private:
public: public:
Scene207(MADSEngine *vm); Scene207(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene208 : public Scene2xx { class Scene208 : public Scene2xx {
@ -280,25 +280,25 @@ private:
public: public:
Scene208(MADSEngine *vm); Scene208(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene250 : public Scene2xx { class Scene250 : public Scene2xx {
public: public:
Scene250(MADSEngine *vm); Scene250(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
} // End of namespace Phantom } // End of namespace Phantom

120
engines/mads/phantom/phantom_scenes3.h
View file

@ -64,25 +64,25 @@ private:
public: public:
Scene301(MADSEngine *vm); Scene301(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene302 : public Scene3xx { class Scene302 : public Scene3xx {
public: public:
Scene302(MADSEngine *vm); Scene302(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene303 : public Scene3xx { class Scene303 : public Scene3xx {
@ -92,13 +92,13 @@ private:
int _skipFrameCheckFl; int _skipFrameCheckFl;
public: public:
Scene303(MADSEngine *vm); Scene303(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene304 : public Scene3xx { class Scene304 : public Scene3xx {
@ -122,13 +122,13 @@ private:
public: public:
Scene304(MADSEngine *vm); Scene304(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene305 : public Scene3xx { class Scene305 : public Scene3xx {
@ -144,13 +144,13 @@ private:
public: public:
Scene305(MADSEngine *vm); Scene305(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene306 : public Scene3xx { class Scene306 : public Scene3xx {
@ -159,25 +159,25 @@ private:
public: public:
Scene306(MADSEngine *vm); Scene306(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene307 : public Scene3xx { class Scene307 : public Scene3xx {
public: public:
Scene307(MADSEngine *vm); Scene307(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene308 : public Scene3xx { class Scene308 : public Scene3xx {
@ -192,13 +192,13 @@ private:
public: public:
Scene308(MADSEngine *vm); Scene308(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene309 : public Scene3xx { class Scene309 : public Scene3xx {
@ -213,13 +213,13 @@ private:
public: public:
Scene309(MADSEngine *vm); Scene309(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene310 : public Scene3xx { class Scene310 : public Scene3xx {
@ -234,13 +234,13 @@ private:
public: public:
Scene310(MADSEngine *vm); Scene310(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
} // End of namespace Phantom } // End of namespace Phantom
} // End of namespace MADS } // End of namespace MADS

120
engines/mads/phantom/phantom_scenes4.h
View file

@ -66,13 +66,13 @@ private:
public: public:
Scene401(MADSEngine *vm); Scene401(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene403 : public Scene4xx { class Scene403 : public Scene4xx {
@ -87,13 +87,13 @@ private:
public: public:
Scene403(MADSEngine *vm); Scene403(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene404 : public Scene4xx { class Scene404 : public Scene4xx {
@ -109,13 +109,13 @@ private:
public: public:
Scene404(MADSEngine *vm); Scene404(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene406 : public Scene4xx { class Scene406 : public Scene4xx {
@ -130,13 +130,13 @@ private:
public: public:
Scene406(MADSEngine *vm); Scene406(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene407 : public Scene4xx { class Scene407 : public Scene4xx {
@ -151,13 +151,13 @@ private:
public: public:
Scene407(MADSEngine *vm); Scene407(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene408 : public Scene4xx { class Scene408 : public Scene4xx {
@ -172,13 +172,13 @@ private:
public: public:
Scene408(MADSEngine *vm); Scene408(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene409 : public Scene4xx { class Scene409 : public Scene4xx {
@ -193,13 +193,13 @@ private:
public: public:
Scene409(MADSEngine *vm); Scene409(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene410 : public Scene4xx { class Scene410 : public Scene4xx {
@ -209,13 +209,13 @@ private:
public: public:
Scene410(MADSEngine *vm); Scene410(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene453 : public Scene4xx { class Scene453 : public Scene4xx {
@ -230,13 +230,13 @@ private:
public: public:
Scene453(MADSEngine *vm); Scene453(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene456 : public Scene4xx { class Scene456 : public Scene4xx {
@ -251,13 +251,13 @@ private:
public: public:
Scene456(MADSEngine *vm); Scene456(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
} // End of namespace Phantom } // End of namespace Phantom
} // End of namespace MADS } // End of namespace MADS

62
engines/mads/phantom/phantom_scenes5.h
View file

@ -60,13 +60,13 @@ private:
public: public:
Scene501(MADSEngine *vm); Scene501(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene502 : public Scene5xx { class Scene502 : public Scene5xx {
@ -103,15 +103,15 @@ private:
public: public:
Scene502(MADSEngine *vm); Scene502(MADSEngine *vm);
~Scene502(); ~Scene502() override;
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene504 : public Scene5xx { class Scene504 : public Scene5xx {
@ -152,13 +152,13 @@ private:
public: public:
Scene504(MADSEngine *vm); Scene504(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene505 : public Scene5xx { class Scene505 : public Scene5xx {
@ -187,13 +187,13 @@ private:
public: public:
Scene505(MADSEngine *vm); Scene505(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
class Scene506 : public Scene5xx { class Scene506 : public Scene5xx {
@ -204,13 +204,13 @@ private:
public: public:
Scene506(MADSEngine *vm); Scene506(MADSEngine *vm);
virtual void synchronize(Common::Serializer &s); void synchronize(Common::Serializer &s) override;
virtual void setup(); void setup() override;
virtual void enter(); void enter() override;
virtual void step(); void step() override;
virtual void preActions(); void preActions() override;
virtual void actions(); void actions() override;
}; };
} // End of namespace Phantom } // End of namespace Phantom

10
engines/mads/resources.cpp
View file

@ -80,13 +80,13 @@ private:
ResourceType getResourceType(const Common::String &resourceName) const; ResourceType getResourceType(const Common::String &resourceName) const;
public: public:
explicit HagArchive(MADSEngine *vm); explicit HagArchive(MADSEngine *vm);
virtual ~HagArchive(); ~HagArchive() override;
// Archive implementation // Archive implementation
virtual bool hasFile(const Common::String &name) const; bool hasFile(const Common::String &name) const override;
virtual int listMembers(Common::ArchiveMemberList &list) const; int listMembers(Common::ArchiveMemberList &list) const override;
virtual const Common::ArchiveMemberPtr getMember(const Common::String &name) const; const Common::ArchiveMemberPtr getMember(const Common::String &name) const override;
virtual Common::SeekableReadStream *createReadStreamForMember(const Common::String &name) const; Common::SeekableReadStream *createReadStreamForMember(const Common::String &name) const override;
}; };
const char *const MADSCONCAT_STRING = "MADSCONCAT"; const char *const MADSCONCAT_STRING = "MADSCONCAT";

4
engines/mads/screen.h
View file

@ -229,12 +229,12 @@ public:
/** /**
* Destructor * Destructor
*/ */
virtual ~Screen() {} ~Screen() override {}
/** /**
* Updates the physical screen with contents of the internal surface * Updates the physical screen with contents of the internal surface
*/ */
virtual void update(); void update() override;
/** /**
* Transition to a new screen with a given effect * Transition to a new screen with a given effect

2
engines/mads/sprites.h
View file

@ -114,7 +114,7 @@ public:
MSprite(); MSprite();
MSprite(Common::SeekableReadStream *source, const Common::Array<RGB6> &palette, MSprite(Common::SeekableReadStream *source, const Common::Array<RGB6> &palette,
const Common::Rect &bounds); const Common::Rect &bounds);
virtual ~MSprite(); ~MSprite() override;
Common::Point _offset; Common::Point _offset;
int _transparencyIndex; int _transparencyIndex;

2
engines/mads/user_interface.h
View file

@ -221,7 +221,7 @@ public:
/** /**
* Loads an interface from a specified resource * Loads an interface from a specified resource
*/ */
virtual void load(const Common::String &resName); void load(const Common::String &resName) override;
/** /**
* Set up the interface * Set up the interface