[Scummvm-git-logs] scummvm master -> 6e1652a58c6cc056e7903091e2f7eca3a8e463ac
bgK
bastien.bouclet at gmail.com
Sun Feb 9 11:59:35 UTC 2020
This automated email contains information about 6 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
db347350a5 CGE2: Remove duplicate override keywords
0d85e92cf7 CINE: Remove duplicate override keywords
88414a32ae SKY: Remove duplicate override keywords
2495c9d141 STARTREK: Remove duplicate override keywords
b0e26f1989 TSAGE: Remove duplicate override keywords
6e1652a58c WINTERMUTE: Remove duplicate override keywords
Commit: db347350a5faac9cc067ee554bf60b1c1ace7e0a
https://github.com/scummvm/scummvm/commit/db347350a5faac9cc067ee554bf60b1c1ace7e0a
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2020-02-09T12:58:14+01:00
Commit Message:
CGE2: Remove duplicate override keywords
Changed paths:
engines/cge2/sound.h
diff --git a/engines/cge2/sound.h b/engines/cge2/sound.h
index 40f67cf..5700f2b 100644
--- a/engines/cge2/sound.h
+++ b/engines/cge2/sound.h
@@ -115,13 +115,13 @@ private:
void sndMidiStop();
public:
explicit MusicPlayer(CGE2Engine *vm);
- ~MusicPlayer() override override;
+ ~MusicPlayer() override;
void loadMidi(int ref);
void killMidi();
- void send(uint32 b) override override;
- void sendToChannel(byte channel, uint32 b) override override;
+ void send(uint32 b) override;
+ void sendToChannel(byte channel, uint32 b) override;
};
} // End of namespace CGE2
Commit: 0d85e92cf7fbf36263ab59100b9be78706a0a84d
https://github.com/scummvm/scummvm/commit/0d85e92cf7fbf36263ab59100b9be78706a0a84d
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2020-02-09T12:58:14+01:00
Commit Message:
CINE: Remove duplicate override keywords
Changed paths:
engines/cine/script.h
diff --git a/engines/cine/script.h b/engines/cine/script.h
index e3d7a16..1dc9ab2 100644
--- a/engines/cine/script.h
+++ b/engines/cine/script.h
@@ -344,16 +344,16 @@ public:
*/
class OSScriptInfo : public FWScriptInfo {
protected:
- OpFunc opcodeHandler(byte opcode) const override override;
+ OpFunc opcodeHandler(byte opcode) const override;
public:
- ~OSScriptInfo() override override {}
+ ~OSScriptInfo() override {}
- const char *opcodeInfo(byte opcode) const override override;
- FWScript *create(const RawScript &script, int16 index) const override override;
- FWScript *create(const RawObjectScript &script, int16 index) const override override;
- FWScript *create(const RawScript &script, int16 index, const ScriptVars &labels, const ScriptVars &local, uint16 compare, uint16 pos) const override override;
- FWScript *create(const RawObjectScript &script, int16 index, const ScriptVars &labels, const ScriptVars &local, uint16 compare, uint16 pos) const override override;
+ const char *opcodeInfo(byte opcode) const override;
+ FWScript *create(const RawScript &script, int16 index) const override;
+ FWScript *create(const RawObjectScript &script, int16 index) const override;
+ FWScript *create(const RawScript &script, int16 index, const ScriptVars &labels, const ScriptVars &local, uint16 compare, uint16 pos) const override;
+ FWScript *create(const RawObjectScript &script, int16 index, const ScriptVars &labels, const ScriptVars &local, uint16 compare, uint16 pos) const override;
friend class FWScript;
};
Commit: 88414a32ae167bc719d71df734b32328199c734b
https://github.com/scummvm/scummvm/commit/88414a32ae167bc719d71df734b32328199c734b
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2020-02-09T12:58:19+01:00
Commit Message:
SKY: Remove duplicate override keywords
Changed paths:
engines/sky/music/gmchannel.h
diff --git a/engines/sky/music/gmchannel.h b/engines/sky/music/gmchannel.h
index e5c7256..8f6cc6e 100644
--- a/engines/sky/music/gmchannel.h
+++ b/engines/sky/music/gmchannel.h
@@ -41,11 +41,11 @@ typedef struct {
class GmChannel : public ChannelBase {
public:
GmChannel(uint8 *pMusicData, uint16 startOfData, MidiDriver *pMidiDrv, const byte *pInstMap, const byte *veloTab);
- ~GmChannel() override override;
+ ~GmChannel() override;
virtual void stopNote();
- uint8 process(uint16 aktTime) override override;
- void updateVolume(uint16 pVolume) override override;
- bool isActive() override override;
+ uint8 process(uint16 aktTime) override;
+ void updateVolume(uint16 pVolume) override;
+ bool isActive() override;
private:
const byte *_instMap;
const byte *_veloTab;
Commit: 2495c9d1412988bc01b0c0be6c034dae11098bee
https://github.com/scummvm/scummvm/commit/2495c9d1412988bc01b0c0be6c034dae11098bee
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2020-02-09T12:58:19+01:00
Commit Message:
STARTREK: Remove duplicate override keywords
Changed paths:
engines/startrek/fixedint.h
diff --git a/engines/startrek/fixedint.h b/engines/startrek/fixedint.h
index 6dd7b08..cb7a421 100644
--- a/engines/startrek/fixedint.h
+++ b/engines/startrek/fixedint.h
@@ -158,7 +158,7 @@ public:
return val >= f.val;
}
- void saveLoadWithSerializer(Common::Serializer &ser) override override {
+ void saveLoadWithSerializer(Common::Serializer &ser) override {
if (totalBits == 16)
ser.syncAsSint16LE(val);
else if (totalBits == 32)
Commit: b0e26f19890665fa3ebeba6545cbe23c9a21661b
https://github.com/scummvm/scummvm/commit/b0e26f19890665fa3ebeba6545cbe23c9a21661b
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2020-02-09T12:58:21+01:00
Commit Message:
TSAGE: Remove duplicate override keywords
Changed paths:
engines/tsage/ringworld2/ringworld2_speakers.h
diff --git a/engines/tsage/ringworld2/ringworld2_speakers.h b/engines/tsage/ringworld2/ringworld2_speakers.h
index b2a275c..285e432 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.h
+++ b/engines/tsage/ringworld2/ringworld2_speakers.h
@@ -57,14 +57,14 @@ private:
public:
VisualSpeaker();
- Common::String getClassName() override override { return "VisualSpeaker"; }
- void synchronize(Serializer &s) override override;
- void remove() override override;
- void signal() override override;
- void dispatch() override override;
- void setText(const Common::String &msg) override override;
+ Common::String getClassName() override { return "VisualSpeaker"; }
+ void synchronize(Serializer &s) override;
+ void remove() override;
+ void signal() override;
+ void dispatch() override;
+ void setText(const Common::String &msg) override;
virtual void animateSpeaker() {}
- void stopSpeaking() override override;
+ void stopSpeaking() override;
void setDelay(int delay);
};
@@ -73,7 +73,7 @@ class SpeakerGameText : public VisualSpeaker {
public:
SpeakerGameText();
- Common::String getClassName() override override { return "SpeakerGameText"; }
+ Common::String getClassName() override { return "SpeakerGameText"; }
};
// Classes related to Captain
@@ -82,8 +82,8 @@ class SpeakerCaptain3210 : public VisualSpeaker {
public:
SpeakerCaptain3210();
- Common::String getClassName() override override { return "SpeakerCaptain3210"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerCaptain3210"; }
+ void animateSpeaker() override;
};
// Classes related to Caretaker
@@ -92,7 +92,7 @@ class SpeakerCaretaker2450 : public VisualSpeaker {
public:
SpeakerCaretaker2450();
- Common::String getClassName() override override { return "SpeakerCaretaker2450"; }
+ Common::String getClassName() override { return "SpeakerCaretaker2450"; }
};
// Classes related to Chief
@@ -101,8 +101,8 @@ class SpeakerChief1100 : public VisualSpeaker {
public:
SpeakerChief1100();
- Common::String getClassName() override override { return "SpeakerChief1100"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerChief1100"; }
+ void animateSpeaker() override;
};
// Classes related to Guard
@@ -110,13 +110,13 @@ public:
class SpeakerGuard : public VisualSpeaker {
public:
SpeakerGuard();
- Common::String getClassName() override override { return "SpeakerGuard"; }
+ Common::String getClassName() override { return "SpeakerGuard"; }
};
class SpeakerGuard2800 : public SpeakerGuard {
public:
- Common::String getClassName() override override { return "SpeakerGuard2800"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerGuard2800"; }
+ void animateSpeaker() override;
};
// Classes related to Jocko
@@ -124,25 +124,25 @@ public:
class SpeakerJocko : public VisualSpeaker {
public:
SpeakerJocko();
- Common::String getClassName() override override { return "SpeakerJocko"; }
+ Common::String getClassName() override { return "SpeakerJocko"; }
};
class SpeakerJocko3200 : public SpeakerJocko {
public:
- Common::String getClassName() override override { return "SpeakerJocko3200"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerJocko3200"; }
+ void animateSpeaker() override;
};
class SpeakerJocko3220 : public SpeakerJocko {
public:
- Common::String getClassName() override override { return "SpeakerJocko3220"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerJocko3220"; }
+ void animateSpeaker() override;
};
class SpeakerJocko3230 : public SpeakerJocko {
public:
- Common::String getClassName() override override { return "SpeakerJocko3230"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerJocko3230"; }
+ void animateSpeaker() override;
};
// Classes related to Miranda
@@ -150,61 +150,61 @@ public:
class SpeakerMiranda : public VisualSpeaker {
public:
SpeakerMiranda();
- Common::String getClassName() override override { return "SpeakerMiranda"; }
+ Common::String getClassName() override { return "SpeakerMiranda"; }
};
class SpeakerMiranda300 : public SpeakerMiranda {
public:
- Common::String getClassName() override override { return "SpeakerMiranda300"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerMiranda300"; }
+ void animateSpeaker() override;
};
class SpeakerMiranda1625 : public SpeakerMiranda {
public:
- Common::String getClassName() override override { return "SpeakerMiranda1625"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerMiranda1625"; }
+ void animateSpeaker() override;
};
class SpeakerMiranda3255 : public SpeakerMiranda {
public:
- Common::String getClassName() override override { return "SpeakerMiranda3255"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerMiranda3255"; }
+ void animateSpeaker() override;
};
class SpeakerMiranda3375 : public SpeakerMiranda {
public:
- Common::String getClassName() override override { return "SpeakerMiranda3375"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerMiranda3375"; }
+ void animateSpeaker() override;
};
class SpeakerMiranda3385 : public SpeakerMiranda {
public:
- Common::String getClassName() override override { return "SpeakerMiranda3385"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerMiranda3385"; }
+ void animateSpeaker() override;
};
class SpeakerMiranda3395 : public SpeakerMiranda {
public:
- Common::String getClassName() override override { return "SpeakerMiranda3395"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerMiranda3395"; }
+ void animateSpeaker() override;
};
class SpeakerMiranda3400 : public SpeakerMiranda {
public:
- Common::String getClassName() override override { return "SpeakerMiranda3400"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerMiranda3400"; }
+ void animateSpeaker() override;
};
class SpeakerMiranda3600 : public SpeakerMiranda {
public:
- Common::String getClassName() override override { return "SpeakerMiranda3600"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerMiranda3600"; }
+ void animateSpeaker() override;
};
class SpeakerMiranda3700 : public SpeakerMiranda {
public:
- Common::String getClassName() override override { return "SpeakerMiranda3700"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerMiranda3700"; }
+ void animateSpeaker() override;
};
// Classes related to Nej
@@ -212,25 +212,25 @@ public:
class SpeakerNej : public VisualSpeaker {
public:
SpeakerNej();
- Common::String getClassName() override override { return "SpeakerNej"; }
+ Common::String getClassName() override { return "SpeakerNej"; }
};
class SpeakerNej2700 : public SpeakerNej {
public:
- Common::String getClassName() override override { return "SpeakerNej2700"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerNej2700"; }
+ void animateSpeaker() override;
};
class SpeakerNej2750 : public SpeakerNej {
public:
- Common::String getClassName() override override { return "SpeakerNej2750"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerNej2750"; }
+ void animateSpeaker() override;
};
class SpeakerNej2800 : public SpeakerNej {
public:
- Common::String getClassName() override override { return "SpeakerNej2800"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerNej2800"; }
+ void animateSpeaker() override;
};
// Classes related to Pharisha
@@ -239,13 +239,13 @@ class SpeakerPharisha : public VisualSpeaker {
public:
SpeakerPharisha();
- Common::String getClassName() override override { return "SpeakerPharisha"; }
+ Common::String getClassName() override { return "SpeakerPharisha"; }
};
class SpeakerPharisha2435 : public SpeakerPharisha {
public:
- Common::String getClassName() override override { return "SpeakerPharisha2435"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerPharisha2435"; }
+ void animateSpeaker() override;
};
// Classes related to Private
@@ -254,8 +254,8 @@ class SpeakerPrivate3210 : public VisualSpeaker {
public:
SpeakerPrivate3210();
- Common::String getClassName() override override { return "SpeakerPrivate3210"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerPrivate3210"; }
+ void animateSpeaker() override;
};
// Classes related to Protector
@@ -264,8 +264,8 @@ class SpeakerProtector3600 : public VisualSpeaker {
public:
SpeakerProtector3600();
- Common::String getClassName() override override { return "SpeakerProtector3600"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerProtector3600"; }
+ void animateSpeaker() override;
};
// Classes related to Quinn
@@ -273,98 +273,98 @@ public:
class SpeakerQuinn : public VisualSpeaker {
public:
SpeakerQuinn();
- Common::String getClassName() override override { return "SpeakerQuinn"; }
+ Common::String getClassName() override { return "SpeakerQuinn"; }
};
class SpeakerQuinn300 : public SpeakerQuinn {
public:
- Common::String getClassName() override override { return "SpeakerQuinn300"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerQuinn300"; }
+ void animateSpeaker() override;
};
class SpeakerQuinn500 : public SpeakerQuinn {
public:
- Common::String getClassName() override override { return "SpeakerQuinn500"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerQuinn500"; }
+ void animateSpeaker() override;
};
class SpeakerQuinn1100 : public SpeakerQuinn {
public:
- Common::String getClassName() override override { return "SpeakerQuinn1100"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerQuinn1100"; }
+ void animateSpeaker() override;
};
class SpeakerQuinn2435 : public SpeakerQuinn {
public:
- Common::String getClassName() override override { return "SpeakerQuinn2435"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerQuinn2435"; }
+ void animateSpeaker() override;
};
class SpeakerQuinn2450 : public SpeakerQuinn {
public:
- Common::String getClassName() override override { return "SpeakerQuinn2450"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerQuinn2450"; }
+ void animateSpeaker() override;
};
class SpeakerQuinn2700 : public SpeakerQuinn {
public:
- Common::String getClassName() override override { return "SpeakerQuinn2700"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerQuinn2700"; }
+ void animateSpeaker() override;
};
class SpeakerQuinn2750 : public SpeakerQuinn {
public:
- Common::String getClassName() override override { return "SpeakerQuinn2750"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerQuinn2750"; }
+ void animateSpeaker() override;
};
class SpeakerQuinn2800 : public SpeakerQuinn {
public:
- Common::String getClassName() override override { return "SpeakerQuinn2800"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerQuinn2800"; }
+ void animateSpeaker() override;
};
class SpeakerQuinn3255 : public SpeakerQuinn {
public:
- Common::String getClassName() override override { return "SpeakerQuinn3255"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerQuinn3255"; }
+ void animateSpeaker() override;
};
class SpeakerQuinn3375 : public SpeakerQuinn {
public:
- Common::String getClassName() override override { return "SpeakerQuinn3375"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerQuinn3375"; }
+ void animateSpeaker() override;
};
class SpeakerQuinn3385 : public SpeakerQuinn {
public:
- Common::String getClassName() override override { return "SpeakerQuinn3385"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerQuinn3385"; }
+ void animateSpeaker() override;
};
class SpeakerQuinn3395 : public SpeakerQuinn {
public:
- Common::String getClassName() override override { return "SpeakerQuinn3395"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerQuinn3395"; }
+ void animateSpeaker() override;
};
class SpeakerQuinn3400 : public SpeakerQuinn {
public:
- Common::String getClassName() override override { return "SpeakerQuinn3400"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerQuinn3400"; }
+ void animateSpeaker() override;
};
class SpeakerQuinn3600 : public SpeakerQuinn {
public:
- Common::String getClassName() override override { return "SpeakerQuinn3600"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerQuinn3600"; }
+ void animateSpeaker() override;
};
class SpeakerQuinn3700 : public SpeakerQuinn {
public:
- Common::String getClassName() override override { return "SpeakerQuinn3700"; }
- void setText(const Common::String &msg) override override;
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerQuinn3700"; }
+ void setText(const Common::String &msg) override;
+ void animateSpeaker() override;
};
// Classes related to QuinnL
@@ -373,7 +373,7 @@ class SpeakerQuinnL : public SpeakerQuinn {
public:
SpeakerQuinnL();
- Common::String getClassName() override override { return "SpeakerQuinnL"; }
+ Common::String getClassName() override { return "SpeakerQuinnL"; }
};
// Classes related to Ralf
@@ -382,8 +382,8 @@ class SpeakerRalf3245 : public VisualSpeaker {
public:
SpeakerRalf3245();
- Common::String getClassName() override override { return "SpeakerRalf3245"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerRalf3245"; }
+ void animateSpeaker() override;
};
// Classes related to Rocko
@@ -391,25 +391,25 @@ public:
class SpeakerRocko : public VisualSpeaker {
public:
SpeakerRocko();
- Common::String getClassName() override override { return "SpeakerRocko"; }
+ Common::String getClassName() override { return "SpeakerRocko"; }
};
class SpeakerRocko3200 : public SpeakerRocko {
public:
- Common::String getClassName() override override { return "SpeakerRocko3200"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerRocko3200"; }
+ void animateSpeaker() override;
};
class SpeakerRocko3220 : public SpeakerRocko {
public:
- Common::String getClassName() override override { return "SpeakerRocko3220"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerRocko3220"; }
+ void animateSpeaker() override;
};
class SpeakerRocko3230 : public SpeakerRocko {
public:
- Common::String getClassName() override override { return "SpeakerRocko3230"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerRocko3230"; }
+ void animateSpeaker() override;
};
// Classes related to Seeker
@@ -417,80 +417,80 @@ public:
class SpeakerSeeker : public VisualSpeaker {
public:
SpeakerSeeker();
- Common::String getClassName() override override { return "SpeakerSeeker"; }
+ Common::String getClassName() override { return "SpeakerSeeker"; }
};
class SpeakerSeeker300 : public SpeakerSeeker {
public:
- Common::String getClassName() override override { return "SpeakerSeeker300"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerSeeker300"; }
+ void animateSpeaker() override;
};
class SpeakerSeeker500 : public SpeakerSeeker {
public:
- Common::String getClassName() override override { return "SpeakerSeeker500"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerSeeker500"; }
+ void animateSpeaker() override;
};
class SpeakerSeeker1100 : public SpeakerSeeker {
public:
- Common::String getClassName() override override { return "SpeakerSeeker1100"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerSeeker1100"; }
+ void animateSpeaker() override;
};
class SpeakerSeeker1900 : public SpeakerSeeker {
public:
- Common::String getClassName() override override { return "SpeakerSeeker1900"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerSeeker1900"; }
+ void animateSpeaker() override;
};
class SpeakerSeeker2435 : public SpeakerSeeker {
public:
- Common::String getClassName() override override { return "SpeakerSeeker2435"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerSeeker2435"; }
+ void animateSpeaker() override;
};
class SpeakerSeeker2450 : public SpeakerSeeker {
public:
- Common::String getClassName() override override { return "SpeakerSeeker2450"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerSeeker2450"; }
+ void animateSpeaker() override;
};
class SpeakerSeeker3375 : public SpeakerSeeker {
public:
- Common::String getClassName() override override { return "SpeakerSeeker3375"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerSeeker3375"; }
+ void animateSpeaker() override;
};
class SpeakerSeeker3385 : public SpeakerSeeker {
public:
- Common::String getClassName() override override { return "SpeakerSeeker3385"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerSeeker3385"; }
+ void animateSpeaker() override;
};
class SpeakerSeeker3395 : public SpeakerSeeker {
public:
- Common::String getClassName() override override { return "SpeakerSeeker3395"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerSeeker3395"; }
+ void animateSpeaker() override;
};
class SpeakerSeeker3400 : public SpeakerSeeker {
public:
- Common::String getClassName() override override { return "SpeakerSeeker3400"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerSeeker3400"; }
+ void animateSpeaker() override;
};
class SpeakerSeeker3600 : public SpeakerSeeker {
public:
- Common::String getClassName() override override { return "SpeakerSeeker3600"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerSeeker3600"; }
+ void animateSpeaker() override;
};
class SpeakerSeeker3700 : public SpeakerSeeker {
public:
- Common::String getClassName() override override { return "SpeakerSeeker3700"; }
- void setText(const Common::String &msg) override override;
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerSeeker3700"; }
+ void setText(const Common::String &msg) override;
+ void animateSpeaker() override;
};
// Classes related to SeekerL
@@ -499,7 +499,7 @@ class SpeakerSeekerL : public SpeakerSeeker {
public:
SpeakerSeekerL();
- Common::String getClassName() override override { return "SpeakerSeekerL"; }
+ Common::String getClassName() override { return "SpeakerSeekerL"; }
};
// Classes related to Socko
@@ -508,8 +508,8 @@ class SpeakerSocko3200 : public VisualSpeaker {
public:
SpeakerSocko3200();
- Common::String getClassName() override override { return "SpeakerSocko3200"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerSocko3200"; }
+ void animateSpeaker() override;
};
// Classes related to Soldier
@@ -517,20 +517,20 @@ public:
class SpeakerSoldier : public VisualSpeaker {
public:
SpeakerSoldier(int color);
- Common::String getClassName() override override { return "SpeakerSoldier"; }
+ Common::String getClassName() override { return "SpeakerSoldier"; }
};
class SpeakerSoldier300 : public SpeakerSoldier {
public:
SpeakerSoldier300() : SpeakerSoldier(60) {}
- Common::String getClassName() override override { return "SpeakerSoldier300"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerSoldier300"; }
+ void animateSpeaker() override;
};
class SpeakerSoldier1625 : public SpeakerSoldier {
public:
SpeakerSoldier1625() : SpeakerSoldier(5) {}
- Common::String getClassName() override override { return "SpeakerSoldier1625"; }
+ Common::String getClassName() override { return "SpeakerSoldier1625"; }
};
// Classes related to Teal
@@ -538,49 +538,49 @@ public:
class SpeakerTeal : public VisualSpeaker {
public:
SpeakerTeal();
- Common::String getClassName() override override { return "SpeakerTeal"; }
+ Common::String getClassName() override { return "SpeakerTeal"; }
};
class SpeakerTealMode7 : public SpeakerTeal {
public:
SpeakerTealMode7();
- Common::String getClassName() override override { return "SpeakerTealMode7"; }
+ Common::String getClassName() override { return "SpeakerTealMode7"; }
};
class SpeakerTeal180 : public SpeakerTeal {
public:
- Common::String getClassName() override override { return "SpeakerTeal180"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerTeal180"; }
+ void animateSpeaker() override;
};
class SpeakerTeal300 : public SpeakerTeal {
public:
- Common::String getClassName() override override { return "SpeakerTeal300"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerTeal300"; }
+ void animateSpeaker() override;
};
class SpeakerTeal1625 : public SpeakerTeal {
public:
- Common::String getClassName() override override { return "SpeakerTeal1625"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerTeal1625"; }
+ void animateSpeaker() override;
};
class SpeakerTeal3240 : public SpeakerTeal {
public:
- Common::String getClassName() override override { return "SpeakerTeal3240"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerTeal3240"; }
+ void animateSpeaker() override;
};
class SpeakerTeal3400 : public SpeakerTeal {
public:
- Common::String getClassName() override override { return "SpeakerTeal3400"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerTeal3400"; }
+ void animateSpeaker() override;
};
class SpeakerTeal3600 : public SpeakerTealMode7 {
public:
- Common::String getClassName() override override { return "SpeakerTeal3600"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerTeal3600"; }
+ void animateSpeaker() override;
};
// Classes related to Tomko
@@ -589,8 +589,8 @@ class SpeakerTomko3245 : public VisualSpeaker {
public:
SpeakerTomko3245();
- Common::String getClassName() override override { return "SpeakerTomko3245"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerTomko3245"; }
+ void animateSpeaker() override;
};
// Classes related to Webbster
@@ -598,68 +598,68 @@ public:
class SpeakerWebbster : public VisualSpeaker {
public:
SpeakerWebbster(int color);
- Common::String getClassName() override override { return "SpeakerWebbster"; }
+ Common::String getClassName() override { return "SpeakerWebbster"; }
};
class SpeakerWebbster180 : public SpeakerWebbster {
public:
SpeakerWebbster180() : SpeakerWebbster(27) {}
- Common::String getClassName() override override { return "SpeakerWebbster180"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerWebbster180"; }
+ void animateSpeaker() override;
};
class SpeakerWebbster2500 : public SpeakerWebbster {
public:
SpeakerWebbster2500() : SpeakerWebbster(27) {}
- Common::String getClassName() override override { return "SpeakerWebbster2500"; }
+ Common::String getClassName() override { return "SpeakerWebbster2500"; }
};
class SpeakerWebbster3240 : public SpeakerWebbster {
public:
SpeakerWebbster3240() : SpeakerWebbster(10) {}
- Common::String getClassName() override override { return "SpeakerWebbster3240"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerWebbster3240"; }
+ void animateSpeaker() override;
};
class SpeakerWebbster3375 : public SpeakerWebbster {
public:
SpeakerWebbster3375() : SpeakerWebbster(60) {}
- Common::String getClassName() override override { return "SpeakerWebbster3375"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerWebbster3375"; }
+ void animateSpeaker() override;
};
class SpeakerWebbster3385 : public SpeakerWebbster {
public:
SpeakerWebbster3385() : SpeakerWebbster(60) {}
- Common::String getClassName() override override { return "SpeakerWebbster3385"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerWebbster3385"; }
+ void animateSpeaker() override;
};
class SpeakerWebbster3395 : public SpeakerWebbster {
public:
SpeakerWebbster3395() : SpeakerWebbster(60) {}
- Common::String getClassName() override override { return "SpeakerWebbster3395"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerWebbster3395"; }
+ void animateSpeaker() override;
};
class SpeakerWebbster3400 : public SpeakerWebbster {
public:
SpeakerWebbster3400() : SpeakerWebbster(27) {}
- Common::String getClassName() override override { return "SpeakerWebbster3400"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerWebbster3400"; }
+ void animateSpeaker() override;
};
class SpeakerDutyOfficer180: public VisualSpeaker {
public:
SpeakerDutyOfficer180();
- Common::String getClassName() override override { return "SpeakerDutyOfficer"; }
- void animateSpeaker() override override;
+ Common::String getClassName() override { return "SpeakerDutyOfficer"; }
+ void animateSpeaker() override;
};
} // End of namespace Ringworld2
Commit: 6e1652a58c6cc056e7903091e2f7eca3a8e463ac
https://github.com/scummvm/scummvm/commit/6e1652a58c6cc056e7903091e2f7eca3a8e463ac
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2020-02-09T12:58:21+01:00
Commit Message:
WINTERMUTE: Remove duplicate override keywords
Changed paths:
engines/wintermute/base/scriptables/debuggable/debuggable_script.h
engines/wintermute/debugger/listing_providers/blank_listing_provider.h
engines/wintermute/debugger/listing_providers/cached_source_listing_provider.h
engines/wintermute/debugger/listing_providers/source_listing.h
engines/wintermute/debugger/listing_providers/source_listing_provider.h
diff --git a/engines/wintermute/base/scriptables/debuggable/debuggable_script.h b/engines/wintermute/base/scriptables/debuggable/debuggable_script.h
index 6152629..8b15c68 100644
--- a/engines/wintermute/base/scriptables/debuggable/debuggable_script.h
+++ b/engines/wintermute/base/scriptables/debuggable/debuggable_script.h
@@ -40,7 +40,7 @@ class DebuggableScript : public ScScript {
void setStepDepth(int depth);
public:
DebuggableScript(BaseGame *inGame, DebuggableScEngine *engine);
- ~DebuggableScript() override override;
+ ~DebuggableScript() override;
ScValue *resolveName(const Common::String &name);
/**
* Return argument to last II_DBG_LINE encountered
diff --git a/engines/wintermute/debugger/listing_providers/blank_listing_provider.h b/engines/wintermute/debugger/listing_providers/blank_listing_provider.h
index 77079d2..87aaa10 100644
--- a/engines/wintermute/debugger/listing_providers/blank_listing_provider.h
+++ b/engines/wintermute/debugger/listing_providers/blank_listing_provider.h
@@ -31,8 +31,8 @@ namespace Wintermute {
class BlankListingProvider : public ListingProvider {
public:
BlankListingProvider();
- ~BlankListingProvider() override override;
- Listing *getListing(const Common::String &filename, ErrorCode &error) override override;
+ ~BlankListingProvider() override;
+ Listing *getListing(const Common::String &filename, ErrorCode &error) override;
};
} // End of namespace Wintermute
#endif
diff --git a/engines/wintermute/debugger/listing_providers/cached_source_listing_provider.h b/engines/wintermute/debugger/listing_providers/cached_source_listing_provider.h
index 36cfc6e..931b5cd 100644
--- a/engines/wintermute/debugger/listing_providers/cached_source_listing_provider.h
+++ b/engines/wintermute/debugger/listing_providers/cached_source_listing_provider.h
@@ -41,10 +41,10 @@ class CachedSourceListingProvider : public SourceListingProvider {
void invalidateCache();
public:
CachedSourceListingProvider();
- ~CachedSourceListingProvider() override override;
- ErrorCode setPath(const Common::String &path) override override;
- Common::String getPath() const override override;
- Listing *getListing(const Common::String &filename, ErrorCode &err) override override;
+ ~CachedSourceListingProvider() override;
+ ErrorCode setPath(const Common::String &path) override;
+ Common::String getPath() const override;
+ Listing *getListing(const Common::String &filename, ErrorCode &err) override;
};
} // End of namespace Wintermute
diff --git a/engines/wintermute/debugger/listing_providers/source_listing.h b/engines/wintermute/debugger/listing_providers/source_listing.h
index 8e9eaf5..a873cfd 100644
--- a/engines/wintermute/debugger/listing_providers/source_listing.h
+++ b/engines/wintermute/debugger/listing_providers/source_listing.h
@@ -29,9 +29,9 @@ class SourceListing : public Listing {
const Common::Array<Common::String> _strings;
public:
SourceListing(const Common::Array<Common::String> &strings);
- ~SourceListing() override override;
- uint getLength() const override override;
- Common::String getLine(uint n) override override;
+ ~SourceListing() override;
+ uint getLength() const override;
+ Common::String getLine(uint n) override;
};
}
#endif /* DUMMY_LISTING_H_ */
diff --git a/engines/wintermute/debugger/listing_providers/source_listing_provider.h b/engines/wintermute/debugger/listing_providers/source_listing_provider.h
index ae69537..9599375 100644
--- a/engines/wintermute/debugger/listing_providers/source_listing_provider.h
+++ b/engines/wintermute/debugger/listing_providers/source_listing_provider.h
@@ -34,11 +34,11 @@ class Listing;
class SourceListingProvider : ListingProvider {
public:
- ~SourceListingProvider() override override {};
+ ~SourceListingProvider() override {};
/**
* Get a listing. When implementing this, the result should be safe to delete for the caller.
*/
- Listing *getListing(const Common::String &filename, ErrorCode &err) override override = 0;
+ Listing *getListing(const Common::String &filename, ErrorCode &err) override = 0;
virtual ErrorCode setPath(const Common::String &path) = 0;
virtual Common::String getPath() const = 0;
More information about the Scummvm-git-logs
mailing list