[Scummvm-git-logs] scummvm master -> 9894976adebb0d7004d4b0171ab5d64a949e8656
bgK
bastien.bouclet at gmail.com
Mon Dec 10 19:15:26 CET 2018
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
c08bb9cb4a ENGINES: Use an uppercase C for the metaengine copyright strings
0d1800b605 GLK: Remove unneeded include
10ff73e6e0 ILLUSIONS: Push down the advanced detector include
9894976ade PINK: Push down the advanced detector include
Commit: c08bb9cb4a95bed3e94de6f364b6d6ae83a7c016
https://github.com/scummvm/scummvm/commit/c08bb9cb4a95bed3e94de6f364b6d6ae83a7c016
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2018-12-10T18:39:26+01:00
Commit Message:
ENGINES: Use an uppercase C for the metaengine copyright strings
Changed paths:
engines/hopkins/detection.cpp
engines/mads/detection.cpp
engines/xeen/detection.cpp
diff --git a/engines/hopkins/detection.cpp b/engines/hopkins/detection.cpp
index 03d906a..d9e11f9 100644
--- a/engines/hopkins/detection.cpp
+++ b/engines/hopkins/detection.cpp
@@ -111,7 +111,7 @@ public:
}
virtual const char *getOriginalCopyright() const {
- return "Hopkins FBI (c) 1997-2003 MP Entertainment";
+ return "Hopkins FBI (C) 1997-2003 MP Entertainment";
}
virtual bool hasFeature(MetaEngineFeature f) const;
diff --git a/engines/mads/detection.cpp b/engines/mads/detection.cpp
index c75c9b9..b729bdf 100644
--- a/engines/mads/detection.cpp
+++ b/engines/mads/detection.cpp
@@ -149,7 +149,7 @@ public:
}
virtual const char *getOriginalCopyright() const {
- return "MADS (c) Microprose";
+ return "MADS (C) Microprose";
}
virtual bool hasFeature(MetaEngineFeature f) const;
diff --git a/engines/xeen/detection.cpp b/engines/xeen/detection.cpp
index e427396..c542c8d 100644
--- a/engines/xeen/detection.cpp
+++ b/engines/xeen/detection.cpp
@@ -118,7 +118,7 @@ public:
}
virtual const char *getOriginalCopyright() const {
- return "Xeen (c) 1992-1993 New World Computing, Inc.";
+ return "Xeen (C) 1992-1993 New World Computing, Inc.";
}
virtual bool hasFeature(MetaEngineFeature f) const;
Commit: 0d1800b6052fb781d442591fab007f95b6515b08
https://github.com/scummvm/scummvm/commit/0d1800b6052fb781d442591fab007f95b6515b08
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2018-12-10T19:10:50+01:00
Commit Message:
GLK: Remove unneeded include
Changed paths:
engines/glk/glk.h
diff --git a/engines/glk/glk.h b/engines/glk/glk.h
index ccf58c0..7460317 100644
--- a/engines/glk/glk.h
+++ b/engines/glk/glk.h
@@ -27,7 +27,6 @@
#include "common/random.h"
#include "common/system.h"
#include "common/serializer.h"
-#include "engines/advancedDetector.h"
#include "engines/engine.h"
#include "glk/glk_types.h"
#include "glk/streams.h"
Commit: 10ff73e6e03a4b9117fd7035355ee28c2dffa4a4
https://github.com/scummvm/scummvm/commit/10ff73e6e03a4b9117fd7035355ee28c2dffa4a4
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2018-12-10T19:11:25+01:00
Commit Message:
ILLUSIONS: Push down the advanced detector include
So the whole engine is not rebuilt when making changes to shared code.
Changed paths:
engines/illusions/detection.cpp
engines/illusions/illusions.h
diff --git a/engines/illusions/detection.cpp b/engines/illusions/detection.cpp
index 3a9c77e..024dea2 100644
--- a/engines/illusions/detection.cpp
+++ b/engines/illusions/detection.cpp
@@ -40,6 +40,15 @@ static const PlainGameDescriptor illusionsGames[] = {
namespace Illusions {
+struct IllusionsGameDescription {
+ ADGameDescription desc;
+ int gameId;
+};
+
+int IllusionsEngine::getGameId() const {
+ return _gameDescription->gameId;
+}
+
static const IllusionsGameDescription gameDescriptions[] = {
{
{
diff --git a/engines/illusions/illusions.h b/engines/illusions/illusions.h
index 4140c9c..8110c68 100644
--- a/engines/illusions/illusions.h
+++ b/engines/illusions/illusions.h
@@ -36,12 +36,9 @@
#include "common/system.h"
#include "common/winexe.h"
#include "common/winexe_pe.h"
-#include "engines/advancedDetector.h"
#include "engines/engine.h"
#include "graphics/surface.h"
-struct ADGameDescription;
-
namespace Illusions {
char *debugW2I(byte *wstr);
@@ -64,6 +61,7 @@ class Cursor;
class Dictionary;
struct Fader;
class FramesList;
+struct IllusionsGameDescription;
class Input;
class Screen;
class ScreenText;
@@ -84,11 +82,6 @@ enum {
kGameIdDuckman = 2
};
-struct IllusionsGameDescription {
- ADGameDescription desc;
- int gameId;
-};
-
class IllusionsEngine : public Engine {
public:
IllusionsEngine(OSystem *syst, const IllusionsGameDescription *gd);
@@ -153,9 +146,7 @@ public:
int16 _menuChoiceOfs;
- int getGameId() const {
- return _gameDescription->gameId;
- }
+ int getGameId() const;
void runUpdateFunctions();
int updateActors(uint flags);
Commit: 9894976adebb0d7004d4b0171ab5d64a949e8656
https://github.com/scummvm/scummvm/commit/9894976adebb0d7004d4b0171ab5d64a949e8656
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2018-12-10T19:12:18+01:00
Commit Message:
PINK: Push down the advanced detector include
So the whole engine is not rebuilt when making changes to shared code.
Changed paths:
engines/pink/detection.cpp
engines/pink/detection_tables.h
engines/pink/objects/actions/action_text.cpp
engines/pink/pink.cpp
engines/pink/pink.h
engines/pink/saveload.cpp
diff --git a/engines/pink/detection.cpp b/engines/pink/detection.cpp
index b0d9192..a25fd26 100644
--- a/engines/pink/detection.cpp
+++ b/engines/pink/detection.cpp
@@ -20,10 +20,20 @@
*
*/
-#include "gui/EventRecorder.h"
+#include "common/system.h"
+
+#include "engines/advancedDetector.h"
#include "pink/pink.h"
+namespace Pink {
+
+Common::Language PinkEngine::getLanguage() const {
+ return _desc->language;
+}
+
+} // End of Namespace Pink
+
static const PlainGameDescriptor pinkGames[] = {
{"peril", "The Pink Panther: Passport to Peril"},
{"pokus", "The Pink Panther: Hokus Pokus Pink"},
diff --git a/engines/pink/detection_tables.h b/engines/pink/detection_tables.h
index c9abef9..dab187e 100644
--- a/engines/pink/detection_tables.h
+++ b/engines/pink/detection_tables.h
@@ -23,8 +23,6 @@
#ifndef PINK_DETECTION_TABLES_H
#define PINK_DETECTION_TABLES_H
-#include "gui/EventRecorder.h"
-
namespace Pink {
static const ADGameDescription gameDescriptions[] = {
diff --git a/engines/pink/objects/actions/action_text.cpp b/engines/pink/objects/actions/action_text.cpp
index ea7d486..a5b97b1 100644
--- a/engines/pink/objects/actions/action_text.cpp
+++ b/engines/pink/objects/actions/action_text.cpp
@@ -90,7 +90,7 @@ void ActionText::start() {
_txtWnd->move(_xLeft, _yTop);
_txtWnd->resize(_xRight - _xLeft, _yBottom - _yTop);
- if (_actor->getPage()->getGame()->getGameDesc().language == Common::EN_ANY)
+ if (_actor->getPage()->getGame()->getLanguage() == Common::EN_ANY)
_txtWnd->appendText(str, font);
} else {
director->addTextAction(this);
diff --git a/engines/pink/pink.cpp b/engines/pink/pink.cpp
index 5eebeaa..2852348 100644
--- a/engines/pink/pink.cpp
+++ b/engines/pink/pink.cpp
@@ -24,6 +24,7 @@
#include "common/winexe_pe.h"
#include "common/config-manager.h"
+#include "engines/advancedDetector.h"
#include "engines/util.h"
#include "graphics/cursorman.h"
@@ -40,7 +41,7 @@ namespace Pink {
PinkEngine::PinkEngine(OSystem *system, const ADGameDescription *desc)
: Engine(system), _console(nullptr), _rnd("pink"),
- _desc(*desc), _bro(nullptr), _menu(nullptr), _actor(nullptr),
+ _desc(desc), _bro(nullptr), _menu(nullptr), _actor(nullptr),
_module(nullptr), _director(nullptr), _pdaMgr(this) {
DebugMan.addDebugChannel(kPinkDebugGeneral, "general", "General issues");
@@ -300,7 +301,7 @@ void PinkEngine::pauseEngineIntern(bool pause) {
}
bool PinkEngine::isPeril() {
- return !strcmp(_desc.gameId, kPeril);
+ return !strcmp(_desc->gameId, kPeril);
}
}
diff --git a/engines/pink/pink.h b/engines/pink/pink.h
index bafe15f..cfc7190 100644
--- a/engines/pink/pink.h
+++ b/engines/pink/pink.h
@@ -24,12 +24,13 @@
#define PINK_PINK_H
#include "common/random.h"
+#include "common/savefile.h"
#include "engines/engine.h"
+#include "engines/savestate.h"
#include "graphics/wincursor.h"
-#include "gui/EventRecorder.h"
#include "gui/debugger.h"
#include "pink/constants.h"
@@ -59,6 +60,8 @@
* missing menu
*/
+struct ADGameDescription;
+
namespace Graphics {
class MacMenu;
}
@@ -115,7 +118,7 @@ public:
void executeMenuCommand(uint id);
- const ADGameDescription &getGameDesc() { return _desc; }
+ Common::Language getLanguage() const;
OrbFile *getOrb() { return &_orb; }
BroFile *getBro() { return _bro; }
Common::RandomSource &getRnd() { return _rnd; };
@@ -158,7 +161,7 @@ private:
StringMap _variables;
PDAMgr _pdaMgr;
- const ADGameDescription _desc;
+ const ADGameDescription *_desc;
};
WARN_UNUSED_RESULT bool readSaveHeader(Common::InSaveFile &in, SaveStateDescriptor &desc, bool skipThumbnail = true);
diff --git a/engines/pink/saveload.cpp b/engines/pink/saveload.cpp
index 02bda4f..dacec35 100644
--- a/engines/pink/saveload.cpp
+++ b/engines/pink/saveload.cpp
@@ -20,6 +20,8 @@
*
*/
+#include "common/system.h"
+
#include "graphics/thumbnail.h"
#include "pink/pink.h"
More information about the Scummvm-git-logs
mailing list