[Scummvm-git-logs] scummvm master -> 2d54e3e87f414dceae3bcad38f3f07726c6fb6bd
sev-
sev at scummvm.org
Sat Feb 1 22:37:58 UTC 2020
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
4e47a3fae5 JANITORIAL: Whitespace fixes
cb37da1fbf ULTIMA: Fix duplicated object files
2d54e3e87f ULTIMA: Few override fixes
Commit: 4e47a3fae55ba15ea611a4ee143f33ca248e3592
https://github.com/scummvm/scummvm/commit/4e47a3fae55ba15ea611a4ee143f33ca248e3592
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-01T23:37:40+01:00
Commit Message:
JANITORIAL: Whitespace fixes
Changed paths:
engines/ultima/shared/engine/ultima.h
diff --git a/engines/ultima/shared/engine/ultima.h b/engines/ultima/shared/engine/ultima.h
index 4e18f96..9069da1 100644
--- a/engines/ultima/shared/engine/ultima.h
+++ b/engines/ultima/shared/engine/ultima.h
@@ -34,19 +34,19 @@ namespace Ultima {
namespace Shared {
enum UltimaDebugChannels {
- kDebugPath = 1 << 0,
- kDebugGraphics = 1 << 1
+ kDebugPath = 1 << 0,
+ kDebugGraphics = 1 << 1
};
class UltimaEngine : public Engine, public EventsCallback {
private:
- Common::RandomSource _randomSource;
+ Common::RandomSource _randomSource;
protected:
const UltimaGameDescription *_gameDescription;
Common::Archive *_dataArchive;
Debugger *_debugger;
protected:
- /**
+ /**
* Initializes needed data for the engine
*/
virtual bool initialize();
@@ -56,61 +56,61 @@ protected:
*/
virtual void deinitialize() {}
- /**
- * Returns the data archive folder and version that's required
- */
- virtual bool isDataRequired(Common::String &folder, int &majorVersion, int &minorVersion) {
- return false;
- }
-
- /**
- * Returns the Ultima meta engine
- */
- UltimaMetaEngine *getMetaEngine() const;
+ /**
+ * Returns the data archive folder and version that's required
+ */
+ virtual bool isDataRequired(Common::String &folder, int &majorVersion, int &minorVersion) {
+ return false;
+ }
+
+ /**
+ * Returns the Ultima meta engine
+ */
+ UltimaMetaEngine *getMetaEngine() const;
public:
EventsManager *_events;
public:
UltimaEngine(OSystem *syst, const Ultima::UltimaGameDescription *gameDesc);
~UltimaEngine();
- /**
- * Returns supported engine features
- */
- virtual bool hasFeature(EngineFeature f) const;
+ /**
+ * Returns supported engine features
+ */
+ virtual bool hasFeature(EngineFeature f) const;
- /**
- * Returns game features
- */
- uint32 getFeatures() const;
+ /**
+ * Returns game features
+ */
+ uint32 getFeatures() const;
/**
* Return the game's language
*/
Common::Language getLanguage() const;
- /**
- * Returns the game type being played
- */
+ /**
+ * Returns the game type being played
+ */
GameId getGameId() const;
- /**
- * Returns true if the game is running an enhanced version
- * as compared to the original game
- */
- bool isEnhanced() const {
+ /**
+ * Returns true if the game is running an enhanced version
+ * as compared to the original game
+ */
+ bool isEnhanced() const {
return getFeatures() & GF_VGA_ENHANCED;
- }
-
- /**
- * Returns the filename for a savegame given it's slot
- */
- Common::String getSaveFilename(int slotNumber) {
- return getMetaEngine()->getSavegameFile(slotNumber, _targetName.c_str());
- }
-
- /**
- * Show a messae in a GUI dialog
- */
+ }
+
+ /**
+ * Returns the filename for a savegame given it's slot
+ */
+ Common::String getSaveFilename(int slotNumber) {
+ return getMetaEngine()->getSavegameFile(slotNumber, _targetName.c_str());
+ }
+
+ /**
+ * Show a messae in a GUI dialog
+ */
void GUIError(const Common::String &msg);
/**
@@ -125,12 +125,12 @@ public:
return min + _randomSource.getRandomNumber(max - min);
}
- /**
- * Get a reference to the data archive
- */
- Common::Archive *getDataArchive() const {
- return _dataArchive;
- }
+ /**
+ * Get a reference to the data archive
+ */
+ Common::Archive *getDataArchive() const {
+ return _dataArchive;
+ }
/**
* Checks if an auto save should be done, and if so, takes care of it
@@ -144,66 +144,66 @@ public:
return _debugger;
}
- /**
- * Returns a file system node for the game directory
- */
- Common::FSNode getGameDirectory() const;
-
- /**
- * Shows the ScummVM save dialog, allowing users to save their game
- */
- virtual bool saveGame();
-
- /**
- * Shows the ScummVM Restore dialog, allowing users to restore a game
- */
- virtual bool loadGame();
-
- /**
- * Indicates whether a game state can be loaded.
- * @param isAutosave Flags whether it's an autosave check
- */
- virtual bool canLoadGameStateCurrently(bool isAutosave) = 0;
-
- /**
- * Indicates whether a game state can be loaded.
- */
- virtual bool canLoadGameStateCurrently() override {
- return canLoadGameStateCurrently(false);
- }
-
- /**
- * Indicates whether a game state can be saved.
- * @param isAutosave Flags whether it's an autosave check
- */
- virtual bool canSaveGameStateCurrently(bool isAutosave) = 0;
-
- /**
- * Indicates whether a game state can be saved.
- */
- virtual bool canSaveGameStateCurrently() override {
- return canSaveGameStateCurrently(false);
- }
-
- /**
- * Save a game state.
- * @param slot the slot into which the savestate should be stored
- * @param desc a description for the savestate, entered by the user
- * @param isAutosave If true, autosave is being created
- * @return returns kNoError on success, else an error code.
- */
- virtual Common::Error saveGameState(int slot, const Common::String &desc) override {
- return saveGameState(slot, desc, false);
- }
-
- /**
- * Save a game state.
- * @param slot the slot into which the savestate should be stored
- * @param desc a description for the savestate, entered by the user
- * @param isAutosave If true, autosave is being created
- * @return returns kNoError on success, else an error code.
- */
- virtual Common::Error saveGameState(int slot, const Common::String &desc, bool isAutosave) = 0;
+ /**
+ * Returns a file system node for the game directory
+ */
+ Common::FSNode getGameDirectory() const;
+
+ /**
+ * Shows the ScummVM save dialog, allowing users to save their game
+ */
+ virtual bool saveGame();
+
+ /**
+ * Shows the ScummVM Restore dialog, allowing users to restore a game
+ */
+ virtual bool loadGame();
+
+ /**
+ * Indicates whether a game state can be loaded.
+ * @param isAutosave Flags whether it's an autosave check
+ */
+ virtual bool canLoadGameStateCurrently(bool isAutosave) = 0;
+
+ /**
+ * Indicates whether a game state can be loaded.
+ */
+ virtual bool canLoadGameStateCurrently() override {
+ return canLoadGameStateCurrently(false);
+ }
+
+ /**
+ * Indicates whether a game state can be saved.
+ * @param isAutosave Flags whether it's an autosave check
+ */
+ virtual bool canSaveGameStateCurrently(bool isAutosave) = 0;
+
+ /**
+ * Indicates whether a game state can be saved.
+ */
+ virtual bool canSaveGameStateCurrently() override {
+ return canSaveGameStateCurrently(false);
+ }
+
+ /**
+ * Save a game state.
+ * @param slot the slot into which the savestate should be stored
+ * @param desc a description for the savestate, entered by the user
+ * @param isAutosave If true, autosave is being created
+ * @return returns kNoError on success, else an error code.
+ */
+ virtual Common::Error saveGameState(int slot, const Common::String &desc) override {
+ return saveGameState(slot, desc, false);
+ }
+
+ /**
+ * Save a game state.
+ * @param slot the slot into which the savestate should be stored
+ * @param desc a description for the savestate, entered by the user
+ * @param isAutosave If true, autosave is being created
+ * @return returns kNoError on success, else an error code.
+ */
+ virtual Common::Error saveGameState(int slot, const Common::String &desc, bool isAutosave) = 0;
};
extern UltimaEngine *g_ultima;
Commit: cb37da1fbfb862fac4a6d19b453b8ee5d0d6662f
https://github.com/scummvm/scummvm/commit/cb37da1fbfb862fac4a6d19b453b8ee5d0d6662f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-01T23:37:40+01:00
Commit Message:
ULTIMA: Fix duplicated object files
Changed paths:
engines/ultima/module.mk
diff --git a/engines/ultima/module.mk b/engines/ultima/module.mk
index a6c298d..8cf507c 100644
--- a/engines/ultima/module.mk
+++ b/engines/ultima/module.mk
@@ -26,7 +26,6 @@ MODULE_OBJS := \
shared/engine/data_archive.o \
shared/engine/debugger.o \
shared/engine/events.o \
- shared/engine/debugger.o \
shared/engine/input_handler.o \
shared/engine/input_translator.o \
shared/engine/messages.o \
@@ -380,7 +379,6 @@ MODULE_OBJS := \
ultima8/graphics/texture.o \
ultima8/graphics/texture_bitmap.o \
ultima8/graphics/texture_png.o \
- ultima8/graphics/texture_targa.o \
ultima8/graphics/type_flags.o \
ultima8/graphics/wpn_ovlay_dat.o \
ultima8/graphics/xform_blend.o \
Commit: 2d54e3e87f414dceae3bcad38f3f07726c6fb6bd
https://github.com/scummvm/scummvm/commit/2d54e3e87f414dceae3bcad38f3f07726c6fb6bd
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-01T23:37:40+01:00
Commit Message:
ULTIMA: Few override fixes
Changed paths:
engines/ultima/shared/early/game_base.h
engines/ultima/shared/early/ultima_early.h
engines/ultima/shared/engine/ultima.h
diff --git a/engines/ultima/shared/early/game_base.h b/engines/ultima/shared/early/game_base.h
index 94e1a18..aed282f 100644
--- a/engines/ultima/shared/early/game_base.h
+++ b/engines/ultima/shared/early/game_base.h
@@ -59,8 +59,8 @@ private:
*/
int getSavegameSlot();
- void leftButtonDoubleClick(const Point &mousePos);
- void middleButtonDoubleClick(const Point &mousePos);
+ void leftButtonDoubleClick(const Point &mousePos) override;
+ void middleButtonDoubleClick(const Point &mousePos) override;
void rightButtonDoubleClick(const Point &mousePos);
/**
@@ -86,7 +86,7 @@ public:
* Constructor
*/
GameBase();
-
+
/**
* Destructor
*/
@@ -95,7 +95,7 @@ public:
/**
* Called to handle any regular updates the game requires
*/
- virtual void onIdle();
+ virtual void onIdle() override;
virtual void mouseMove(const Point &mousePos) override;
virtual void leftButtonDown(const Point &mousePos) override;
@@ -111,7 +111,7 @@ public:
* Called when the game starts
*/
virtual void starting(bool isLoading) {}
-
+
/**
* Returns true if the current video mode is VGA
*/
diff --git a/engines/ultima/shared/early/ultima_early.h b/engines/ultima/shared/early/ultima_early.h
index f38d761..fefb35e 100644
--- a/engines/ultima/shared/early/ultima_early.h
+++ b/engines/ultima/shared/early/ultima_early.h
@@ -129,7 +129,7 @@ public:
* @param isAutosave If true, autosave is being created
* @return returns kNoError on success, else an error code.
*/
- virtual Common::Error saveGameState(int slot, const Common::String &desc, bool isAutosave);
+ virtual Common::Error saveGameState(int slot, const Common::String &desc, bool isAutosave) override;
/*
* Creates a new hierarchy for the game, that contains all the logic for playing that particular game.
diff --git a/engines/ultima/shared/engine/ultima.h b/engines/ultima/shared/engine/ultima.h
index 9069da1..403de9d 100644
--- a/engines/ultima/shared/engine/ultima.h
+++ b/engines/ultima/shared/engine/ultima.h
@@ -76,7 +76,7 @@ public:
/**
* Returns supported engine features
*/
- virtual bool hasFeature(EngineFeature f) const;
+ virtual bool hasFeature(EngineFeature f) const override;
/**
* Returns game features
More information about the Scummvm-git-logs
mailing list