libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-02 17:03:13 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

GLK: Add override keywords

Browse Source
This commit is contained in:
Bastien Bouclet 2020-02-09 12:05:28 +01:00
parent 6e67356777
commit 1e30923737
38 changed files with 249 additions and 249 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engines/glk/adrift/adrift.h
View File

@ -55,20 +55,20 @@ public:
/**
* Returns the running interpreter type
*/
virtual InterpreterType getInterpreterType() const override {
InterpreterType getInterpreterType() const override {
return INTERPRETER_ADRIFT;
}
/**
* Load a savegame from the passed Quetzal file chunk stream
*/
virtual Common::Error readSaveData(Common::SeekableReadStream *rs) override;
Common::Error readSaveData(Common::SeekableReadStream *rs) override;
/**
* Save the game. The passed write stream represents access to the UMem chunk
* in the Quetzal save file that will be created
*/
virtual Common::Error writeGameData(Common::WriteStream *ws) override;
Common::Error writeGameData(Common::WriteStream *ws) override;
};
extern Adrift *g_vm;

8
engines/glk/advsys/advsys.h
View File

@ -59,25 +59,25 @@ public:
/**
* Run the game
*/
virtual void runGame() override;
void runGame() override;
/**
* Returns the running interpreter type
*/
virtual InterpreterType getInterpreterType() const override {
InterpreterType getInterpreterType() const override {
return INTERPRETER_ADVSYS;
}
/**
* Load a savegame from the passed Quetzal file chunk stream
*/
virtual Common::Error readSaveData(Common::SeekableReadStream *rs) override;
Common::Error readSaveData(Common::SeekableReadStream *rs) override;
/**
* Save the game. The passed write stream represents access to the UMem chunk
* in the Quetzal save file that will be created
*/
virtual Common::Error writeGameData(Common::WriteStream *ws) override;
Common::Error writeGameData(Common::WriteStream *ws) override;
};
} // End of namespace AdvSys

8
engines/glk/agt/agt.h
View File

@ -97,25 +97,25 @@ public:
/**
* Returns the running interpreter type
*/
virtual InterpreterType getInterpreterType() const override {
InterpreterType getInterpreterType() const override {
return INTERPRETER_AGT;
}
/**
* Execute the game
*/
virtual void runGame() override;
void runGame() override;
/**
* Load a savegame from the passed Quetzal file chunk stream
*/
virtual Common::Error readSaveData(Common::SeekableReadStream *rs) override;
Common::Error readSaveData(Common::SeekableReadStream *rs) override;
/**
* Save the game. The passed write stream represents access to the UMem chunk
* in the Quetzal save file that will be created
*/
virtual Common::Error writeGameData(Common::WriteStream *ws) override;
Common::Error writeGameData(Common::WriteStream *ws) override;
};
extern AGT *g_vm;

6
engines/glk/alan2/alan2.h
View File

@ -83,20 +83,20 @@ public:
/**
* Returns the running interpreter type
*/
virtual InterpreterType getInterpreterType() const override {
InterpreterType getInterpreterType() const override {
return INTERPRETER_ALAN2;
}
/**
* Load a savegame from the passed Quetzal file chunk stream
*/
virtual Common::Error readSaveData(Common::SeekableReadStream *rs) override;
Common::Error readSaveData(Common::SeekableReadStream *rs) override;
/**
* Save the game. The passed write stream represents access to the UMem chunk
* in the Quetzal save file that will be created
*/
virtual Common::Error writeGameData(Common::WriteStream *ws) override;
Common::Error writeGameData(Common::WriteStream *ws) override;
};

6
engines/glk/alan3/alan3.h
View File

@ -60,20 +60,20 @@ public:
/**
* Returns the running interpreter type
*/
virtual InterpreterType getInterpreterType() const override {
InterpreterType getInterpreterType() const override {
return INTERPRETER_ALAN3;
}
/**
* Load a savegame from the passed Quetzal file chunk stream
*/
virtual Common::Error readSaveData(Common::SeekableReadStream *rs) override;
Common::Error readSaveData(Common::SeekableReadStream *rs) override;
/**
* Save the game. The passed write stream represents access to the UMem chunk
* in the Quetzal save file that will be created
*/
virtual Common::Error writeGameData(Common::WriteStream *ws) override;
Common::Error writeGameData(Common::WriteStream *ws) override;
};
extern Alan3 *g_vm;

8
engines/glk/archetype/archetype.h
View File

@ -138,24 +138,24 @@ public:
/**
* Run the game
*/
virtual void runGame() override;
void runGame() override;
/**
* Returns the running interpreter type
*/
virtual InterpreterType getInterpreterType() const override {
InterpreterType getInterpreterType() const override {
return INTERPRETER_ARCHETYPE;
}
/**
* Savegames aren't supported for Archetype games
*/
virtual Common::Error readSaveData(Common::SeekableReadStream *rs) override;
Common::Error readSaveData(Common::SeekableReadStream *rs) override;
/**
* Savegames aren't supported for Archetype games
*/
virtual Common::Error writeGameData(Common::WriteStream *ws) override;
Common::Error writeGameData(Common::WriteStream *ws) override;
/**
* Returns true if a savegame is being loaded directly from the ScummVM launcher

8
engines/glk/blorb.h
View File

@ -112,7 +112,7 @@ public:
* Patterns are not allowed, as this is meant to be a quick File::exists()
* replacement.
*/
virtual bool hasFile(const Common::String &name) const override;
bool hasFile(const Common::String &name) const override;
/**
* Add all members of the Archive to list.
@ -120,19 +120,19 @@ public:
*
* @return the number of names added to list
*/
virtual int listMembers(Common::ArchiveMemberList &list) const override;
int listMembers(Common::ArchiveMemberList &list) const override;
/**
* Returns a ArchiveMember representation of the given file.
*/
virtual const Common::ArchiveMemberPtr getMember(const Common::String &name) const override;
const Common::ArchiveMemberPtr getMember(const Common::String &name) const override;
/**
* Create a stream bound to a member with the specified name in the
* archive. If no member with this name exists, 0 is returned.
* @return the newly created input stream
*/
virtual Common::SeekableReadStream *createReadStreamForMember(const Common::String &name) const override;
Common::SeekableReadStream *createReadStreamForMember(const Common::String &name) const override;
/**
* Read the RIdx section from the stream.

20
engines/glk/detection.h
View File

@ -37,7 +37,7 @@ private:
public:
GlkMetaEngine() : MetaEngine() {}
virtual const char *getName() const override {
const char *getName() const override {
return "Glk";
}
@ -45,33 +45,33 @@ public:
return "glk";
}
virtual const char *getOriginalCopyright() const override {
const char *getOriginalCopyright() const override {
return "Infocom games (C) Infocom\nScott Adams games (C) Scott Adams";
}
virtual bool hasFeature(MetaEngineFeature f) const override;
virtual Common::Error createInstance(OSystem *syst, Engine **engine) const override;
virtual SaveStateList listSaves(const char *target) const override;
virtual int getMaximumSaveSlot() const override;
virtual void removeSaveState(const char *target, int slot) const override;
bool hasFeature(MetaEngineFeature f) const override;
Common::Error createInstance(OSystem *syst, Engine **engine) const override;
SaveStateList listSaves(const char *target) const override;
int getMaximumSaveSlot() const override;
void removeSaveState(const char *target, int slot) const override;
SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override;
/**
* Returns a list of games supported by this engine.
*/
virtual PlainGameList getSupportedGames() const override;
PlainGameList getSupportedGames() const override;
/**
* Runs the engine's game detector on the given list of files, and returns a
* (possibly empty) list of games supported by the engine which it was able
* to detect amongst the given files.
*/
virtual DetectedGames detectGames(const Common::FSList &fslist) const override;
DetectedGames detectGames(const Common::FSList &fslist) const override;
/**
* Query the engine for a PlainGameDescriptor for the specified gameid, if any.
*/
virtual PlainGameDescriptor findGame(const char *gameId) const override;
PlainGameDescriptor findGame(const char *gameId) const override;
/**
* Calls each sub-engine in turn to ensure no game Id accidentally shares the same Id

8
engines/glk/frotz/bitmap_font.h
View File

@ -56,22 +56,22 @@ public:
/**
* Get the font height
*/
virtual int getFontHeight() const override { return _size.y; }
int getFontHeight() const override { return _size.y; }
/**
* Get the maximum character width
*/
virtual int getMaxCharWidth() const override { return _size.x; }
int getMaxCharWidth() const override { return _size.x; }
/**
* Get the width of the given character
*/
virtual int getCharWidth(uint32 chr) const override { return _chars[chr - _startingChar].w; }
int getCharWidth(uint32 chr) const override { return _chars[chr - _startingChar].w; }
/**
* Draw a character
*/
virtual void drawChar(Graphics::Surface *dst, uint32 chr, int x, int y, uint32 color) const override;
void drawChar(Graphics::Surface *dst, uint32 chr, int x, int y, uint32 color) const override;
};
/**

18
engines/glk/frotz/frotz.h
View File

@ -39,12 +39,12 @@ protected:
/**
* Setup the video mode
*/
virtual void initGraphicsMode() override;
void initGraphicsMode() override;
/**
* Create the screen class
*/
virtual Screen *createScreen() override;
Screen *createScreen() override;
public:
/**
* Constructor
@ -54,7 +54,7 @@ public:
/**
* Destructor
*/
virtual ~Frotz();
~Frotz() override;
/**
* Initialization
@ -64,32 +64,32 @@ public:
/**
* Returns the running interpreter type
*/
virtual InterpreterType getInterpreterType() const override { return INTERPRETER_FROTZ; }
InterpreterType getInterpreterType() const override { return INTERPRETER_FROTZ; }
/**
* Execute the game
*/
virtual void runGame() override;
void runGame() override;
/**
* Load a savegame from a given slot
*/
virtual Common::Error loadGameState(int slot) override;
Common::Error loadGameState(int slot) override;
/**
* Save the game to a given slot
*/
virtual Common::Error saveGameState(int slot, const Common::String &desc) override;
Common::Error saveGameState(int slot, const Common::String &desc) override;
/**
* Loading method not used for Frotz sub-engine
*/
virtual Common::Error readSaveData(Common::SeekableReadStream *rs) override { return Common::kReadingFailed; }
Common::Error readSaveData(Common::SeekableReadStream *rs) override { return Common::kReadingFailed; }
/**
* Saving method not used for Frotz sub-engine
*/
virtual Common::Error writeGameData(Common::WriteStream *ws) override { return Common::kWritingFailed; }
Common::Error writeGameData(Common::WriteStream *ws) override { return Common::kWritingFailed; }
};

2
engines/glk/frotz/glk_interface.h
View File

@ -246,7 +246,7 @@ public:
/**
* Destructor
*/
virtual ~GlkInterface();
~GlkInterface() override;
/**
* Initialization

10
engines/glk/frotz/pics.h
View File

@ -91,7 +91,7 @@ public:
/**
* Destructor
*/
~Pics();
~Pics() override;
/**
* Return the number of entries in the file
@ -108,7 +108,7 @@ public:
* Patterns are not allowed, as this is meant to be a quick File::exists()
* replacement.
*/
virtual bool hasFile(const Common::String &name) const override;
bool hasFile(const Common::String &name) const override;
/**
* Add all members of the Archive to list.
@ -116,19 +116,19 @@ public:
*
* @return the number of names added to list
*/
virtual int listMembers(Common::ArchiveMemberList &list) const override;
int listMembers(Common::ArchiveMemberList &list) const override;
/**
* Returns a ArchiveMember representation of the given file.
*/
virtual const Common::ArchiveMemberPtr getMember(const Common::String &name) const override;
const Common::ArchiveMemberPtr getMember(const Common::String &name) const override;
/**
* Create a stream bound to a member with the specified name in the
* archive. If no member with this name exists, 0 is returned.
* @return the newly created input stream
*/
virtual Common::SeekableReadStream *createReadStreamForMember(const Common::String &name) const override;
Common::SeekableReadStream *createReadStreamForMember(const Common::String &name) const override;
};
} // End of namespace Frotz

4
engines/glk/frotz/processor.h
View File

@ -243,7 +243,7 @@ protected:
/**
* Called when the H_FLAGS field of the header has changed
*/
virtual void flagsChanged(zbyte value) override;
void flagsChanged(zbyte value) override;
/**
* This function does the dirty work for z_save_undo.
@ -1698,7 +1698,7 @@ public:
* Constructor
*/
Processor(OSystem *syst, const GlkGameDescription &gameDesc);
virtual ~Processor() {}
~Processor() override {}
/**
* Initialization

2
engines/glk/frotz/screen.h
View File

@ -46,7 +46,7 @@ protected:
/**
* Load the fonts
*/
virtual void loadFonts(Common::Archive *archive) override;
void loadFonts(Common::Archive *archive) override;
public:
/**
* Constructor

18
engines/glk/frotz/sound_folder.h
View File

@ -56,7 +56,7 @@ public:
* Patterns are not allowed, as this is meant to be a quick File::exists()
* replacement.
*/
virtual bool hasFile(const Common::String &name) const override;
bool hasFile(const Common::String &name) const override;
/**
* Add all members of the Archive to list.
@ -64,19 +64,19 @@ public:
*
* @return the number of names added to list
*/
virtual int listMembers(Common::ArchiveMemberList &list) const override;
int listMembers(Common::ArchiveMemberList &list) const override;
/**
* Returns a ArchiveMember representation of the given file.
*/
virtual const Common::ArchiveMemberPtr getMember(const Common::String &name) const override;
const Common::ArchiveMemberPtr getMember(const Common::String &name) const override;
/**
* Create a stream bound to a member with the specified name in the
* archive. If no member with this name exists, 0 is returned.
* @return the newly created input stream
*/
virtual Common::SeekableReadStream *createReadStreamForMember(const Common::String &name) const override;
Common::SeekableReadStream *createReadStreamForMember(const Common::String &name) const override;
};
/**
@ -102,14 +102,14 @@ public:
/**
* Destructor
*/
~SoundZip();
~SoundZip() override;
/**
* Check if a member with the given name is present in the Archive.
* Patterns are not allowed, as this is meant to be a quick File::exists()
* replacement.
*/
virtual bool hasFile(const Common::String &name) const override;
bool hasFile(const Common::String &name) const override;
/**
* Add all members of the Archive to list.
@ -117,19 +117,19 @@ public:
*
* @return the number of names added to list
*/
virtual int listMembers(Common::ArchiveMemberList &list) const override;
int listMembers(Common::ArchiveMemberList &list) const override;
/**
* Returns a ArchiveMember representation of the given file.
*/
virtual const Common::ArchiveMemberPtr getMember(const Common::String &name) const override;
const Common::ArchiveMemberPtr getMember(const Common::String &name) const override;
/**
* Create a stream bound to a member with the specified name in the
* archive. If no member with this name exists, 0 is returned.
* @return the newly created input stream
*/
virtual Common::SeekableReadStream *createReadStreamForMember(const Common::String &name) const override;
Common::SeekableReadStream *createReadStreamForMember(const Common::String &name) const override;
};
} // End of namespace Frotz

16
engines/glk/glk.h
View File

@ -83,12 +83,12 @@ protected:
bool _quitFlag;
// Engine APIs
virtual Common::Error run() override;
Common::Error run() override;
/**
* Returns true whether a given feature is supported by the engine
*/
virtual bool hasFeature(EngineFeature f) const override;
bool hasFeature(EngineFeature f) const override;
/**
* Setup the video mode
@ -132,19 +132,19 @@ public:
void(*gli_unregister_arr)(void *array, uint len, const char *typecode, gidispatch_rock_t objrock);
public:
GlkEngine(OSystem *syst, const GlkGameDescription &gameDesc);
virtual ~GlkEngine();
~GlkEngine() override;
/**
* Returns true if a savegame can be loaded
*/
virtual bool canLoadGameStateCurrently() override {
bool canLoadGameStateCurrently() override {
return true;
}
/**
* Returns true if the game can be saved
*/
virtual bool canSaveGameStateCurrently() override {
bool canSaveGameStateCurrently() override {
return true;
}
@ -205,12 +205,12 @@ public:
/**
* Load a savegame from a given slot
*/
virtual Common::Error loadGameState(int slot) override;
Common::Error loadGameState(int slot) override;
/**
* Save the game to a given slot
*/
virtual Common::Error saveGameState(int slot, const Common::String &desc) override;
Common::Error saveGameState(int slot, const Common::String &desc) override;
/**
* Load a savegame from the passed Quetzal file chunk stream
@ -226,7 +226,7 @@ public:
/**
* Updates sound settings
*/
virtual void syncSoundSettings() override;
void syncSoundSettings() override;
/**
* Generate a beep

2
engines/glk/glk_api.h
View File

@ -57,7 +57,7 @@ public:
* Constructor
*/
GlkAPI(OSystem *syst, const GlkGameDescription &gameDesc);
virtual ~GlkAPI() {}
~GlkAPI() override {}
void glk_exit(void);
void glk_set_interrupt_handler(void(*func)(void));

6
engines/glk/glulxe/glulxe.h
View File

@ -406,20 +406,20 @@ public:
/**
* Returns the running interpreter type
*/
virtual InterpreterType getInterpreterType() const override {
InterpreterType getInterpreterType() const override {
return INTERPRETER_GLULXE;
}
/**
* Load a savegame from the passed Quetzal file chunk stream
*/
virtual Common::Error readSaveData(Common::SeekableReadStream *rs) override;
Common::Error readSaveData(Common::SeekableReadStream *rs) override;
/**
* Save the game. The passed write stream represents access to the UMem chunk
* in the Quetzal save file that will be created
*/
virtual Common::Error writeGameData(Common::WriteStream *ws) override;
Common::Error writeGameData(Common::WriteStream *ws) override;
/**
* \defgroup Main access methods

6
engines/glk/hugo/hugo.h
View File

@ -1190,18 +1190,18 @@ public:
/**
* Returns the running interpreter type
*/
virtual InterpreterType getInterpreterType() const override { return INTERPRETER_HUGO; }
InterpreterType getInterpreterType() const override { return INTERPRETER_HUGO; }
/**
* Load a savegame from the passed Quetzal file chunk stream
*/
virtual Common::Error readSaveData(Common::SeekableReadStream *rs) override;
Common::Error readSaveData(Common::SeekableReadStream *rs) override;
/**
* Save the game. The passed write stream represents access to the UMem chunk
* in the Quetzal save file that will be created
*/
virtual Common::Error writeGameData(Common::WriteStream *ws) override;
Common::Error writeGameData(Common::WriteStream *ws) override;
};
} // End of namespace Hugo

8
engines/glk/jacl/jacl.h
View File

@ -57,24 +57,24 @@ public:
/**
* Run the game
*/
virtual void runGame() override;
void runGame() override;
/**
* Returns the running interpreter type
*/
virtual InterpreterType getInterpreterType() const override {
InterpreterType getInterpreterType() const override {
return INTERPRETER_JACL;
}
/**
* Savegames aren't supported for JACL games
*/
virtual Common::Error readSaveData(Common::SeekableReadStream *rs) override;
Common::Error readSaveData(Common::SeekableReadStream *rs) override;
/**
* Savegames aren't supported for JACL games
*/
virtual Common::Error writeGameData(Common::WriteStream *ws) override;
Common::Error writeGameData(Common::WriteStream *ws) override;
/**
* Returns true if a savegame is being loaded directly from the ScummVM launcher

6
engines/glk/level9/level9.h
View File

@ -64,20 +64,20 @@ public:
/**
* Returns the running interpreter type
*/
virtual InterpreterType getInterpreterType() const override {
InterpreterType getInterpreterType() const override {
return INTERPRETER_LEVEL9;
}
/**
* Load a savegame from the passed Quetzal file chunk stream
*/
virtual Common::Error readSaveData(Common::SeekableReadStream *rs) override;
Common::Error readSaveData(Common::SeekableReadStream *rs) override;
/**
* Save the game. The passed write stream represents access to the UMem chunk
* in the Quetzal save file that will be created
*/
virtual Common::Error writeGameData(Common::WriteStream *ws) override;
Common::Error writeGameData(Common::WriteStream *ws) override;
};

10
engines/glk/magnetic/magnetic.h
View File

@ -1379,34 +1379,34 @@ public:
/**
* Returns the running interpreter type
*/
virtual InterpreterType getInterpreterType() const override {
InterpreterType getInterpreterType() const override {
return INTERPRETER_MAGNETIC;
}
/**
* The Magnetic engine currently doesn't support loading savegames from the GMM
*/
virtual bool canLoadGameStateCurrently() override {
bool canLoadGameStateCurrently() override {
return false;
}
/**
* The Magnetic engine currently doesn't support saving games from the GMM
*/
virtual bool canSaveGameStateCurrently() override {
bool canSaveGameStateCurrently() override {
return false;
}
/**
* Load a savegame from the passed Quetzal file chunk stream
*/
virtual Common::Error readSaveData(Common::SeekableReadStream *rs) override;
Common::Error readSaveData(Common::SeekableReadStream *rs) override;
/**
* Save the game. The passed write stream represents access to the UMem chunk
* in the Quetzal save file that will be created
*/
virtual Common::Error writeGameData(Common::WriteStream *ws) override;
Common::Error writeGameData(Common::WriteStream *ws) override;
};
extern Magnetic *g_vm;

18
engines/glk/quest/geas_glk.h
View File

@ -58,18 +58,18 @@ namespace Quest {
class GeasGlkInterface : public GeasInterface {
protected:
virtual String get_file(const String &fname) const;
virtual GeasResult print_normal(const String &s);
virtual GeasResult print_newline();
String get_file(const String &fname) const override;
GeasResult print_normal(const String &s) override;
GeasResult print_newline() override;
virtual void set_foreground(String);
virtual void set_background(String);
virtual GeasResult set_style(const GeasFontStyle &);
void set_foreground(String) override;
void set_background(String) override;
GeasResult set_style(const GeasFontStyle &) override;
virtual String get_string();
virtual uint make_choice(String, Common::Array<String>);
String get_string() override;
uint make_choice(String, Common::Array<String>) override;
virtual String absolute_name(String, String) const;
String absolute_name(String, String) const override;
public:
GeasGlkInterface() {
;

20
engines/glk/quest/geas_impl.h
View File

@ -87,12 +87,12 @@ class geas_implementation : public GeasRunner {
public:
geas_implementation(GeasInterface *in_gi)
: GeasRunner(in_gi), undo_buffer(20), is_running_(true) {}
void set_game(const String &fname);
void set_game(const String &fname) override;
bool is_running() const;
GeasState *getState() { return &state; }
String get_banner();
void run_command(String);
bool is_running() const override;
GeasState *getState() override { return &state; }
String get_banner() override;
void run_command(String) override;
bool try_match(String s, bool, bool);
match_rv match_command(String input, String action) const;
match_rv match_command(String input, uint ichar,
@ -168,12 +168,12 @@ public:
bool eval_cond(String);
GeasState state;
virtual void tick_timers();
virtual v2string get_inventory();
virtual v2string get_room_contents();
void tick_timers() override;
v2string get_inventory() override;
v2string get_room_contents() override;
v2string get_room_contents(String);
virtual vstring get_status_vars();
virtual Common::Array<bool> get_valid_exits();
vstring get_status_vars() override;
Common::Array<bool> get_valid_exits() override;
inline void print_formatted(String s) const {

4
engines/glk/quest/geas_util.h
View File

@ -82,8 +82,8 @@ public:
private:
class Nullstreambuf : public Common::WriteStream {
virtual uint32 write(const void *dataPtr, uint32 dataSize) { return dataSize; }
virtual int32 pos() const { return 0; }
uint32 write(const void *dataPtr, uint32 dataSize) override { return dataSize; }
int32 pos() const override { return 0; }
};
Common::WriteStream *logfilestr_;

12
engines/glk/quest/quest.h
View File

@ -65,38 +65,38 @@ public:
/**
* Run the game
*/
virtual void runGame() override;
void runGame() override;
/**
* Returns the running interpreter type
*/
virtual InterpreterType getInterpreterType() const override {
InterpreterType getInterpreterType() const override {
return INTERPRETER_QUEST;
}
/**
* Returns true if a savegame can be loaded
*/
virtual bool canLoadGameStateCurrently() override {
bool canLoadGameStateCurrently() override {
return _runner != nullptr;
}
/**
* Returns true if the game can be saved
*/
virtual bool canSaveGameStateCurrently() override {
bool canSaveGameStateCurrently() override {
return _runner != nullptr;
}
/**
* Savegames aren't supported for Quest games
*/
virtual Common::Error readSaveData(Common::SeekableReadStream *rs) override;
Common::Error readSaveData(Common::SeekableReadStream *rs) override;
/**
* Savegames aren't supported for Quest games
*/
virtual Common::Error writeGameData(Common::WriteStream *ws) override;
Common::Error writeGameData(Common::WriteStream *ws) override;
/**
* Returns true if a savegame is being loaded directly from the ScummVM launcher

4
engines/glk/quest/streams.h
View File

@ -35,8 +35,8 @@ namespace Quest {
*/
class ConsoleStream : public Common::WriteStream {
public:
virtual uint32 write(const void *dataPtr, uint32 dataSize) override;
virtual int32 pos() const override { return 0; }
uint32 write(const void *dataPtr, uint32 dataSize) override;
int32 pos() const override { return 0; }
};
class ostringstream : public Common::MemoryWriteStreamDynamic {

12
engines/glk/raw_decoder.h
View File

@ -48,13 +48,13 @@ private:
int _transColor;
public:
RawDecoder();
~RawDecoder();
~RawDecoder() override;
virtual bool loadStream(Common::SeekableReadStream &stream) override;
virtual void destroy() override;
virtual const Graphics::Surface *getSurface() const override { return &_surface; }
virtual const byte *getPalette() const override { return _palette; }
virtual uint16 getPaletteColorCount() const override { return _paletteColorCount; }
bool loadStream(Common::SeekableReadStream &stream) override;
void destroy() override;
const Graphics::Surface *getSurface() const override { return &_surface; }
const byte *getPalette() const override { return _palette; }
uint16 getPaletteColorCount() const override { return _paletteColorCount; }
int getTransparentColor() const { return _transColor; }
};

8
engines/glk/scott/scott.h
View File

@ -169,23 +169,23 @@ public:
/**
* Returns the running interpreter type
*/
virtual InterpreterType getInterpreterType() const override { return INTERPRETER_SCOTT; }
InterpreterType getInterpreterType() const override { return INTERPRETER_SCOTT; }
/**
* Execute the game
*/
virtual void runGame() override;
void runGame() override;
/**
* Load a savegame from the passed Quetzal file chunk stream
*/
virtual Common::Error readSaveData(Common::SeekableReadStream *rs) override;
Common::Error readSaveData(Common::SeekableReadStream *rs) override;
/**
* Save the game. The passed write stream represents access to the UMem chunk
* in the Quetzal save file that will be created
*/
virtual Common::Error writeGameData(Common::WriteStream *ws) override;
Common::Error writeGameData(Common::WriteStream *ws) override;
};
} // End of namespace Scott

2
engines/glk/screen.h
View File

@ -74,7 +74,7 @@ public:
/**
* Destructor
*/
virtual ~Screen();
~Screen() override;
/**
* Initialize the screen

78
engines/glk/streams.h
View File

@ -299,7 +299,7 @@ public:
/**
* Destructor
*/
virtual ~WindowStream();
~WindowStream() override;
/**
* Close the stream
@ -309,49 +309,49 @@ public:
/**
* Write a character
*/
virtual void putChar(unsigned char ch) override;
void putChar(unsigned char ch) override;
/**
* Write a unicode character
*/
virtual void putCharUni(uint32 ch) override;
void putCharUni(uint32 ch) override;
/**
* Write a buffer
*/
virtual void putBuffer(const char *buf, size_t len) override;
void putBuffer(const char *buf, size_t len) override;
/**
* Write a unicode character
*/
virtual void putBufferUni(const uint32 *buf, size_t len) override;
void putBufferUni(const uint32 *buf, size_t len) override;
/**
* Remove a string from the end of the stream, if indeed it is at the end
*/
virtual void unputBuffer(const char *buf, size_t len) override;
void unputBuffer(const char *buf, size_t len) override;
/**
* Remove a string from the end of the stream, if indeed it is at the end
*/
virtual void unputBufferUni(const uint32 *buf, size_t len) override;
void unputBufferUni(const uint32 *buf, size_t len) override;
virtual void setStyle(uint val) override;
void setStyle(uint val) override;
/**
* Set a hyperlink
*/
virtual void setHyperlink(uint linkVal) override;
void setHyperlink(uint linkVal) override;
/**
* Set the style colors
*/
virtual void setZColors(uint fg, uint bg) override;
void setZColors(uint fg, uint bg) override;
/**
* Set the reverse video style
*/
virtual void setReverseVideo(bool reverse) override;
void setReverseVideo(bool reverse) override;
};
/**
@ -374,61 +374,61 @@ public:
/**
* Destructor
*/
virtual ~MemoryStream();
~MemoryStream() override;
/**
* Write a character
*/
virtual void putChar(unsigned char ch) override;
void putChar(unsigned char ch) override;
/**
* Write a unicode character
*/
virtual void putCharUni(uint32 ch) override;
void putCharUni(uint32 ch) override;
/**
* Write a buffer
*/
virtual void putBuffer(const char *buf, size_t len) override;
void putBuffer(const char *buf, size_t len) override;
/**
* Write a unicode character
*/
virtual void putBufferUni(const uint32 *buf, size_t len) override;
void putBufferUni(const uint32 *buf, size_t len) override;
virtual uint getPosition() const override;
uint getPosition() const override;
virtual void setPosition(int pos, uint seekMode) override;
void setPosition(int pos, uint seekMode) override;
/**
* Get a character from the stream
*/
virtual int getChar() override;
int getChar() override;
/**
* Get a unicode character from the stream
*/
virtual int getCharUni() override;
int getCharUni() override;
/**
* Get a buffer
*/
virtual uint getBuffer(char *buf, uint len) override;
uint getBuffer(char *buf, uint len) override;
/**
* Get a unicode buffer
*/
virtual uint getBufferUni(uint32 *buf, uint len) override;
uint getBufferUni(uint32 *buf, uint len) override;
/**
* Get a line
*/
virtual uint getLine(char *buf, uint len) override;
uint getLine(char *buf, uint len) override;
/**
* Get a unicode line
*/
virtual uint getLineUni(uint32 *ubuf, uint len) override;
uint getLineUni(uint32 *ubuf, uint len) override;
};
/**
@ -492,66 +492,66 @@ public:
/**
* Write a character
*/
virtual void putChar(unsigned char ch) override;
void putChar(unsigned char ch) override;
/**
* Write a unicode character
*/
virtual void putCharUni(uint32 ch) override;
void putCharUni(uint32 ch) override;
/**
* Write a buffer
*/
virtual void putBuffer(const char *buf, size_t len) override;
void putBuffer(const char *buf, size_t len) override;
/**
* Write a unicode character
*/
virtual void putBufferUni(const uint32 *buf, size_t len) override;
void putBufferUni(const uint32 *buf, size_t len) override;
virtual uint getPosition() const override;
uint getPosition() const override;
virtual void setPosition(int pos, uint seekMode) override;
void setPosition(int pos, uint seekMode) override;
/**
* Get a character from the stream
*/
virtual int getChar() override;
int getChar() override;
/**
* Get a unicode character from the stream
*/
virtual int getCharUni() override;
int getCharUni() override;
/**
* Get a buffer
*/
virtual uint getBuffer(char *buf, uint len) override;
uint getBuffer(char *buf, uint len) override;
/**
* Get a unicode buffer
*/
virtual uint getBufferUni(uint32 *buf, uint len) override;
uint getBufferUni(uint32 *buf, uint len) override;
/**
* Get a line
*/
virtual uint getLine(char *buf, uint len) override;
uint getLine(char *buf, uint len) override;
/**
* Get a unicode line
*/
virtual uint getLineUni(uint32 *ubuf, uint len) override;
uint getLineUni(uint32 *ubuf, uint len) override;
/**
* Cast a stream to a ScummVM write stream
*/
virtual operator Common::WriteStream *() const override { return _outStream; }
operator Common::WriteStream *() const override { return _outStream; }
/**
* Cast a stream to a ScummVM read stream
*/
virtual operator Common::SeekableReadStream *() const override { return _inStream; }
operator Common::SeekableReadStream *() const override { return _inStream; }
};
/**
@ -571,7 +571,7 @@ public:
/**
* Destructor
*/
virtual ~FileStream();
~FileStream() override;
};
/**

8
engines/glk/tads/tads.h
View File

@ -46,23 +46,23 @@ public:
/**
* Returns the running interpreter type
*/
virtual InterpreterType getInterpreterType() const override { return INTERPRETER_SCOTT; }
InterpreterType getInterpreterType() const override { return INTERPRETER_SCOTT; }
/**
* Returns true whether a given feature is supported by the engine
*/
virtual bool hasFeature(EngineFeature f) const override;
bool hasFeature(EngineFeature f) const override;
/**
* Load a savegame from the passed Quetzal file chunk stream
*/
virtual Common::Error readSaveData(Common::SeekableReadStream *rs) override;
Common::Error readSaveData(Common::SeekableReadStream *rs) override;
/**
* Save the game. The passed write stream represents access to the UMem chunk
* in the Quetzal save file that will be created
*/
virtual Common::Error writeGameData(Common::WriteStream *ws) override;
Common::Error writeGameData(Common::WriteStream *ws) override;
};
extern TADS *g_vm;

4
engines/glk/tads/tads2/tads2.h
View File

@ -42,12 +42,12 @@ public:
/**
* Execute the game
*/
virtual void runGame() override;
void runGame() override;
/**
* Returns the running interpreter type
*/
virtual InterpreterType getInterpreterType() const override { return INTERPRETER_TADS2; }
InterpreterType getInterpreterType() const override { return INTERPRETER_TADS2; }
};
//typedef TADS2 appctxdef;

4
engines/glk/tads/tads3/tads3.h
View File

@ -42,12 +42,12 @@ public:
/**
* Execute the game
*/
virtual void runGame() override;
void runGame() override;
/**
* Returns the running interpreter type
*/
virtual InterpreterType getInterpreterType() const override { return INTERPRETER_TADS3; }
InterpreterType getInterpreterType() const override { return INTERPRETER_TADS3; }
};
} // End of namespace TADS3

26
engines/glk/window_graphics.h
View File

@ -50,7 +50,7 @@ public:
/**
* Destructor
*/
virtual ~GraphicsWindow();
~GraphicsWindow() override;
bool drawPicture(uint image, int xpos, int ypos, bool scale,
uint imagewidth, uint imageheight);
@ -60,54 +60,54 @@ public:
/**
* Rearranges the window
*/
virtual void rearrange(const Rect &box) override;
void rearrange(const Rect &box) override;
/**
* Get window split size within parent pair window
*/
virtual uint getSplit(uint size, bool vertical) const override {
uint getSplit(uint size, bool vertical) const override {
return size;
}
/**
* Click the window
*/
virtual void click(const Point &newPos) override;
void click(const Point &newPos) override;
/**
* Cancel a mouse event
*/
virtual void cancelMouseEvent() override {
void cancelMouseEvent() override {
_mouseRequest = false;
}
/**
* Cancel a hyperlink event
*/
virtual void cancelHyperlinkEvent() override {
void cancelHyperlinkEvent() override {
_hyperRequest = false;
}
virtual void requestMouseEvent() override {
void requestMouseEvent() override {
_mouseRequest = true;
}
virtual void requestHyperlinkEvent() override {
void requestHyperlinkEvent() override {
_hyperRequest = true;
}
/**
* Redraw the window
*/
virtual void redraw() override;
void redraw() override;
virtual void eraseRect(bool whole, const Rect &box) override;
void eraseRect(bool whole, const Rect &box) override;
virtual void fillRect(uint color, const Rect &box) override;
void fillRect(uint color, const Rect &box) override;
virtual void getSize(uint *width, uint *height) const override;
void getSize(uint *width, uint *height) const override;
virtual void setBackgroundColor(uint color) override;
void setBackgroundColor(uint color) override;
};
} // End of namespace Glk

12
engines/glk/window_pair.h
View File

@ -53,26 +53,26 @@ public:
/**
* Destructor
*/
~PairWindow();
~PairWindow() override;
/**
* Rearranges the window
*/
virtual void rearrange(const Rect &box) override;
void rearrange(const Rect &box) override;
/**
* Redraw the window
*/
virtual void redraw() override;
void redraw() override;
virtual void getArrangement(uint *method, uint *size, Window **keyWin) override;
void getArrangement(uint *method, uint *size, Window **keyWin) override;
virtual void setArrangement(uint method, uint size, Window *keyWin) override;
void setArrangement(uint method, uint size, Window *keyWin) override;
/**
* Click the window
*/
virtual void click(const Point &newPos) override;
void click(const Point &newPos) override;
};
} // End of namespace Glk

46
engines/glk/window_text_buffer.h
View File

@ -146,7 +146,7 @@ public:
/**
* Destructor
*/
virtual ~TextBufferWindow();
~TextBufferWindow() override;
int acceptScroll(uint arg);
@ -155,93 +155,93 @@ public:
/**
* Get the font info structure associated with the window
*/
virtual FontInfo *getFontInfo() override { return &_font; }
FontInfo *getFontInfo() override { return &_font; }
/**
* Rearranges the window
*/
virtual void rearrange(const Rect &box) override;
void rearrange(const Rect &box) override;
/**
* Get window split size within parent pair window
*/
virtual uint getSplit(uint size, bool vertical) const override;
uint getSplit(uint size, bool vertical) const override;
/**
* Write a unicode character
*/
virtual void putCharUni(uint32 ch) override;
void putCharUni(uint32 ch) override;
/**
* Unput a unicode character
*/
virtual bool unputCharUni(uint32 ch) override;
bool unputCharUni(uint32 ch) override;
/**
* Clear the window
*/
virtual void clear() override;
void clear() override;
/**
* Click the window
*/
virtual void click(const Point &newPos) override;
void click(const Point &newPos) override;
/**
* Prepare for inputing a line
*/
virtual void requestLineEvent(char *buf, uint maxlen, uint initlen) override;
void requestLineEvent(char *buf, uint maxlen, uint initlen) override;
/**
* Prepare for inputing a line
*/
virtual void requestLineEventUni(uint32 *buf, uint maxlen, uint initlen) override;
void requestLineEventUni(uint32 *buf, uint maxlen, uint initlen) override;
/**
* Cancel an input line event
*/
virtual void cancelLineEvent(Event *ev) override;
void cancelLineEvent(Event *ev) override;
/**
* Cancel a hyperlink event
*/
virtual void cancelHyperlinkEvent() override {
void cancelHyperlinkEvent() override {
_hyperRequest = false;
}
/**
* Redraw the window
*/
virtual void redraw() override;
void redraw() override;
virtual void acceptReadLine(uint32 arg) override;
void acceptReadLine(uint32 arg) override;
virtual void acceptReadChar(uint arg) override;
void acceptReadChar(uint arg) override;
virtual void getSize(uint *width, uint *height) const override;
void getSize(uint *width, uint *height) const override;
virtual void requestCharEvent() override;
void requestCharEvent() override;
virtual void requestCharEventUni() override;
void requestCharEventUni() override;
virtual void setEchoLineEvent(uint val) override {
void setEchoLineEvent(uint val) override {
_echoLineInput = val != 0;
}
virtual void requestHyperlinkEvent() override {
void requestHyperlinkEvent() override {
_hyperRequest = true;
}
virtual void cancelCharEvent() override {
void cancelCharEvent() override {
_charRequest = _charRequestUni = false;
}
virtual void flowBreak() override;
void flowBreak() override;
/**
* Returns a pointer to the styles for the window
*/
virtual const WindowStyle *getStyles() const override {
const WindowStyle *getStyles() const override {
return _styles;
}
};

54
engines/glk/window_text_grid.h
View File

@ -88,17 +88,17 @@ public:
/**
* Destructor
*/
virtual ~TextGridWindow();
~TextGridWindow() override;
/**
* Get the font info structure associated with the window
*/
virtual FontInfo *getFontInfo() override { return &_font; }
FontInfo *getFontInfo() override { return &_font; }
/**
* Set the size of a window
*/
virtual void setSize(const Point &newSize) override {
void setSize(const Point &newSize) override {
Window::setSize(newSize);
_curX = CLIP((int16)_curX, _bbox.left, _bbox.right);
_curY = CLIP((int16)_curY, _bbox.top, _bbox.bottom);
@ -107,7 +107,7 @@ public:
/**
* Sets the position of a window
*/
virtual void setPosition(const Point &newPos) override {
void setPosition(const Point &newPos) override {
_bbox.moveTo(newPos);
_curX = CLIP((int16)_curX, _bbox.left, _bbox.right);
_curY = CLIP((int16)_curY, _bbox.top, _bbox.bottom);
@ -116,103 +116,103 @@ public:
/**
* Rearranges the window
*/
virtual void rearrange(const Rect &box) override;
void rearrange(const Rect &box) override;
/**
* Get window split size within parent pair window
*/
virtual uint getSplit(uint size, bool vertical) const override;
uint getSplit(uint size, bool vertical) const override;
/**
* Write a unicode character
*/
virtual void putCharUni(uint32 ch) override;
void putCharUni(uint32 ch) override;
/**
* Unput a unicode character
*/
virtual bool unputCharUni(uint32 ch) override;
bool unputCharUni(uint32 ch) override;
/**
* Get the cursor position
*/
virtual Point getCursor() const override { return Point(_curX, _curY); }
Point getCursor() const override { return Point(_curX, _curY); }
/**
* Move the cursor
*/
virtual void moveCursor(const Point &newPos) override;
void moveCursor(const Point &newPos) override;
/**
* Clear the window
*/
virtual void clear() override;
void clear() override;
/**
* Click the window
*/
virtual void click(const Point &newPos) override;
void click(const Point &newPos) override;
/**
* Cancel a hyperlink event
*/
virtual void cancelHyperlinkEvent() override {
void cancelHyperlinkEvent() override {
_hyperRequest = false;
}
/**
* Redraw the window
*/
virtual void redraw() override;
void redraw() override;
virtual void acceptReadLine(uint32 arg) override;
void acceptReadLine(uint32 arg) override;
virtual void acceptReadChar(uint arg) override;
void acceptReadChar(uint arg) override;
virtual void getSize(uint *width, uint *height) const override;
void getSize(uint *width, uint *height) const override;
virtual void requestCharEvent() override;
void requestCharEvent() override;
virtual void requestCharEventUni() override;
void requestCharEventUni() override;
/**
* Prepare for inputing a line
*/
virtual void requestLineEvent(char *buf, uint maxlen, uint initlen) override;
void requestLineEvent(char *buf, uint maxlen, uint initlen) override;
/**
* Prepare for inputing a line
*/
virtual void requestLineEventUni(uint32 *buf, uint maxlen, uint initlen) override;
void requestLineEventUni(uint32 *buf, uint maxlen, uint initlen) override;
/**
* Cancel an input line event
*/
virtual void cancelLineEvent(Event *ev) override;
void cancelLineEvent(Event *ev) override;
/**
* Cancel a mouse event
*/
virtual void cancelMouseEvent() override {
void cancelMouseEvent() override {
_mouseRequest = false;
}
virtual void requestMouseEvent() override {
void requestMouseEvent() override {
_mouseRequest = true;
}
virtual void requestHyperlinkEvent() override {
void requestHyperlinkEvent() override {
_hyperRequest = true;
}
virtual void cancelCharEvent() override {
void cancelCharEvent() override {
_charRequest = _charRequestUni = false;
}
/**
* Returns a pointer to the styles for the window
*/
virtual const WindowStyle *getStyles() const override {
const WindowStyle *getStyles() const override {
return _styles;
}
};