[Scummvm-git-logs] scummvm master -> 555c6807db90d6bdcc73867b6142375e448b4e9a
sev-
sev at scummvm.org
Sun Feb 9 10:36:05 UTC 2020
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
88ce1aaed9 ULTIMA: Fix inheritance
555c6807db AGI: Added override keywords
Commit: 88ce1aaed97435e2c9374e94e6c74c9d8bbcddf6
https://github.com/scummvm/scummvm/commit/88ce1aaed97435e2c9374e94e6c74c9d8bbcddf6
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-09T11:30:56+01:00
Commit Message:
ULTIMA: Fix inheritance
Changed paths:
engines/ultima/nuvie/nuvie.h
engines/ultima/shared/early/ultima_early.h
engines/ultima/shared/engine/events.h
engines/ultima/ultima8/ultima8.cpp
engines/ultima/ultima8/ultima8.h
diff --git a/engines/ultima/nuvie/nuvie.h b/engines/ultima/nuvie/nuvie.h
index 894b02d..b747ffb 100644
--- a/engines/ultima/nuvie/nuvie.h
+++ b/engines/ultima/nuvie/nuvie.h
@@ -100,7 +100,7 @@ public:
*/
virtual Common::Error saveGameState(int slot, const Common::String &desc, bool isAutosave) override;
- virtual ::GUI::Debugger *getDebugger() const override {
+ virtual ::GUI::Debugger *getDebugger() override {
return _debugger;
}
diff --git a/engines/ultima/shared/early/ultima_early.h b/engines/ultima/shared/early/ultima_early.h
index 0d4c62f..d37201e 100644
--- a/engines/ultima/shared/early/ultima_early.h
+++ b/engines/ultima/shared/early/ultima_early.h
@@ -132,7 +132,7 @@ public:
*/
Game *createGame() const;
- virtual GUI::Debugger *getDebugger() const override { return nullptr; }
+ virtual GUI::Debugger *getDebugger() override { return nullptr; }
};
} // End of namespace Shared
diff --git a/engines/ultima/shared/engine/events.h b/engines/ultima/shared/engine/events.h
index 721a4ef..567c424 100644
--- a/engines/ultima/shared/engine/events.h
+++ b/engines/ultima/shared/engine/events.h
@@ -48,7 +48,7 @@ enum MouseButton {
};
enum SpecialButtons {
- MK_LBUTTON = 1, MK_RBUTTON = 2, MK_MBUTTON = 4, MK_SHIFT = 8, MK_CONTROL = 0x10
+ MK_LBUTTON = 1, MK_RBUTTON = 2, MK_MBUTTON = 4, MK_SHIFT = 8, MK_CONTROL = 0x10
};
/**
@@ -137,7 +137,7 @@ public:
/**
* Get the debugger
*/
- virtual GUI::Debugger *getDebugger() const = 0;
+ virtual GUI::Debugger *getDebugger() = 0;
/**
* Get the screen
diff --git a/engines/ultima/ultima8/ultima8.cpp b/engines/ultima/ultima8/ultima8.cpp
index 6070592..ac3a5df 100644
--- a/engines/ultima/ultima8/ultima8.cpp
+++ b/engines/ultima/ultima8/ultima8.cpp
@@ -125,7 +125,7 @@ using Std::string;
DEFINE_RUNTIME_CLASSTYPE_CODE(Ultima8Engine, CoreApp)
-Ultima8Engine::Ultima8Engine(OSystem *syst, const Ultima::UltimaGameDescription *gameDesc) :
+Ultima8Engine::Ultima8Engine(OSystem *syst, const Ultima::UltimaGameDescription *gameDesc) :
Shared::UltimaEngine(syst, gameDesc), CoreApp(gameDesc), _saveCount(0), _game(0),
_kernel(0), _objectManager(0), _debugger(0), _hidManager(0), _mouse(0), _ucMachine(0),
_screen(0), _fontManager(0), _fullScreen(false), _paletteManager(0), _gameData(0),
@@ -1210,7 +1210,7 @@ void Ultima8Engine::handleEvent(const Common::Event &event) {
_mouse->setMouseCoords(event.mouse.x, event.mouse.y);
if (_mouse->buttonDown(button))
- handled = true;
+ handled = true;
break;
}
@@ -1540,7 +1540,7 @@ void Ultima8Engine::syncSoundSettings() {
UltimaEngine::syncSoundSettings();
// Update music volume
- AudioMixer *audioMixer = AudioMixer::get_instance();
+ AudioMixer *audioMixer = AudioMixer::get_instance();
MidiPlayer *midiPlayer = audioMixer ? audioMixer->getMidiPlayer() : nullptr;
if (midiPlayer)
midiPlayer->setVolume(_mixer->getVolumeForSoundType(Audio::Mixer::kMusicSoundType));
@@ -2057,7 +2057,7 @@ bool Ultima8Engine::isDataRequired(Common::String &folder, int &majorVersion, in
return true;
}
-GUI::Debugger *Ultima8Engine::getDebugger() const {
+GUI::Debugger *Ultima8Engine::getDebugger() {
return _debugger;
}
diff --git a/engines/ultima/ultima8/ultima8.h b/engines/ultima/ultima8/ultima8.h
index 01151d2..42b54f4 100644
--- a/engines/ultima/ultima8/ultima8.h
+++ b/engines/ultima/ultima8/ultima8.h
@@ -1,3 +1,4 @@
+
/* ScummVM - Graphic Adventure Engine
*
* ScummVM is the legal property of its developers, whose names
@@ -240,7 +241,7 @@ public:
return _screen;
}
- virtual GUI::Debugger *getDebugger() const override;
+ virtual GUI::Debugger *getDebugger() override;
virtual Graphics::Screen *getScreen() const override;
virtual void runGame() override;
Commit: 555c6807db90d6bdcc73867b6142375e448b4e9a
https://github.com/scummvm/scummvm/commit/555c6807db90d6bdcc73867b6142375e448b4e9a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-09T11:35:49+01:00
Commit Message:
AGI: Added override keywords
Changed paths:
engines/agi/agi.h
engines/agi/preagi.h
diff --git a/engines/agi/agi.h b/engines/agi/agi.h
index 043463d..f4e2967 100644
--- a/engines/agi/agi.h
+++ b/engines/agi/agi.h
@@ -836,9 +836,9 @@ struct AgiOpCodeDefinitionEntry {
class AgiEngine : public AgiBase {
protected:
// Engine APIs
- virtual Common::Error go();
+ virtual Common::Error go() override;
- void initialize();
+ void initialize() override;
uint32 _lastSaveTime;
@@ -846,10 +846,10 @@ public:
AgiEngine(OSystem *syst, const AGIGameDescription *gameDesc);
virtual ~AgiEngine();
- bool promptIsEnabled();
+ bool promptIsEnabled() override;
- Common::Error loadGameState(int slot);
- Common::Error saveGameState(int slot, const Common::String &description);
+ Common::Error loadGameState(int slot) override;
+ Common::Error saveGameState(int slot, const Common::String &description) override;
private:
int _keyQueue[KEY_QUEUE_SIZE];
@@ -896,17 +896,17 @@ public:
Common::Stack<ImageStackElement> _imageStack;
- void clearImageStack();
+ void clearImageStack() override;
void recordImageStackCall(uint8 type, int16 p1, int16 p2, int16 p3,
- int16 p4, int16 p5, int16 p6, int16 p7);
+ int16 p4, int16 p5, int16 p6, int16 p7) override;
void replayImageStackCall(uint8 type, int16 p1, int16 p2, int16 p3,
- int16 p4, int16 p5, int16 p6, int16 p7);
- void releaseImageStack();
+ int16 p4, int16 p5, int16 p6, int16 p7) override;
+ void releaseImageStack() override;
void wait(uint32 msec, bool busy = false);
Console *_console;
- GUI::Debugger *getDebugger() { return _console; }
+ GUI::Debugger *getDebugger() override { return _console; }
int agiInit();
int agiDeinit();
@@ -915,9 +915,9 @@ public:
int agiUnloadResource(int16 resourceType, int16 resourceNr);
void agiUnloadResources();
- virtual int getKeypress();
- virtual bool isKeypress();
- virtual void clearKeyQueue();
+ virtual int getKeypress() override;
+ virtual bool isKeypress() override;
+ virtual void clearKeyQueue() override;
byte getVar(int16 varNr);
void setVar(int16 varNr, byte newValue);
@@ -927,7 +927,7 @@ private:
void setVolumeViaSystemSetting();
public:
- void syncSoundSettings();
+ void syncSoundSettings() override;
public:
void decrypt(uint8 *mem, int len);
diff --git a/engines/agi/preagi.h b/engines/agi/preagi.h
index 6950aa3..0b2b73a 100644
--- a/engines/agi/preagi.h
+++ b/engines/agi/preagi.h
@@ -55,12 +55,12 @@ class PreAgiEngine : public AgiBase {
int _gameId;
protected:
- void initialize();
+ void initialize() override;
void pollTimer() {}
- int getKeypress() { return 0; }
- bool isKeypress() { return false; }
- void clearKeyQueue() {}
+ int getKeypress() override { return 0; }
+ bool isKeypress() override { return false; }
+ void clearKeyQueue() override {}
PreAgiEngine(OSystem *syst, const AGIGameDescription *gameDesc);
virtual ~PreAgiEngine();
@@ -70,12 +70,12 @@ protected:
PictureMgr *_picture;
- void clearImageStack() {}
+ void clearImageStack() override {}
void recordImageStackCall(uint8 type, int16 p1, int16 p2, int16 p3,
- int16 p4, int16 p5, int16 p6, int16 p7) {}
+ int16 p4, int16 p5, int16 p6, int16 p7) override {}
void replayImageStackCall(uint8 type, int16 p1, int16 p2, int16 p3,
- int16 p4, int16 p5, int16 p6, int16 p7) {}
- void releaseImageStack() {}
+ int16 p4, int16 p5, int16 p6, int16 p7) override {}
+ void releaseImageStack() override {}
int saveGame(const Common::String &fileName, const Common::String &saveName) { return -1; }
int loadGame(const Common::String &fileName, bool checkId = true) { return -1; }
More information about the Scummvm-git-logs
mailing list