[Scummvm-git-logs] scummvm master -> 4a1d7a1753a1b20dbe3b230d7a3687a92546b055
dreammaster
paulfgilbert at gmail.com
Fri Sep 11 02:48:09 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:
44147fd01a GLK: Disable unstable subengines by default
4a1d7a1753 ULTIMA: Disable unstable subengines by default
Commit: 44147fd01aa24b66ebb8f8f15575a7749efd5c33
https://github.com/scummvm/scummvm/commit/44147fd01aa24b66ebb8f8f15575a7749efd5c33
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2020-09-10T19:38:40-07:00
Commit Message:
GLK: Disable unstable subengines by default
Changed paths:
engines/glk/detection.cpp
diff --git a/engines/glk/detection.cpp b/engines/glk/detection.cpp
index 15ab8fdc2f..c18acd02a9 100644
--- a/engines/glk/detection.cpp
+++ b/engines/glk/detection.cpp
@@ -35,12 +35,8 @@
#include "glk/alan3/alan3.h"
#include "glk/archetype/archetype.h"
#include "glk/archetype/detection.h"
-#include "glk/comprehend/comprehend.h"
-#include "glk/comprehend/detection.h"
#include "glk/zcode/detection.h"
#include "glk/zcode/zcode.h"
-#include "glk/glulx/detection.h"
-#include "glk/glulx/glulx.h"
#include "glk/hugo/detection.h"
#include "glk/hugo/hugo.h"
#include "glk/jacl/detection.h"
@@ -53,9 +49,16 @@
#include "glk/quest/quest.h"
#include "glk/scott/detection.h"
#include "glk/scott/scott.h"
+
+#ifndef RELEASE_BUILD
+#include "glk/comprehend/comprehend.h"
+#include "glk/comprehend/detection.h"
+#include "glk/glulx/detection.h"
+#include "glk/glulx/glulx.h"
#include "glk/tads/detection.h"
#include "glk/tads/tads2/tads2.h"
#include "glk/tads/tads3/tads3.h"
+#endif
#include "base/plugins.h"
#include "common/md5.h"
@@ -169,7 +172,9 @@ template<class META, class ENG>bool create(OSystem *syst,
}
Common::Error GlkMetaEngine::createInstance(OSystem *syst, Engine **engine) const {
+#ifndef RELEASE_BUILD
Glk::GameDescriptor td = Glk::GameDescriptor::empty();
+#endif
assert(engine);
// Populate the game description
@@ -208,14 +213,16 @@ Common::Error GlkMetaEngine::createInstance(OSystem *syst, Engine **engine) cons
else if ((create<Glk::Alan2::Alan2MetaEngine, Glk::Alan2::Alan2>(syst, gameDesc, *engine))) {}
else if ((create<Glk::Alan3::Alan3MetaEngine, Glk::Alan3::Alan3>(syst, gameDesc, *engine))) {}
else if ((create<Glk::Archetype::ArchetypeMetaEngine, Glk::Archetype::Archetype>(syst, gameDesc, *engine))) {}
- else if ((create<Glk::Comprehend::ComprehendMetaEngine, Glk::Comprehend::Comprehend>(syst, gameDesc, *engine))) {}
- else if ((create<Glk::Glulx::GlulxMetaEngine, Glk::Glulx::Glulx>(syst, gameDesc, *engine))) {}
else if ((create<Glk::Hugo::HugoMetaEngine, Glk::Hugo::Hugo>(syst, gameDesc, *engine))) {}
else if ((create<Glk::JACL::JACLMetaEngine, Glk::JACL::JACL>(syst, gameDesc, *engine))) {}
else if ((create<Glk::Level9::Level9MetaEngine, Glk::Level9::Level9>(syst, gameDesc, *engine))) {}
else if ((create<Glk::Magnetic::MagneticMetaEngine, Glk::Magnetic::Magnetic>(syst, gameDesc, *engine))) {}
else if ((create<Glk::Quest::QuestMetaEngine, Glk::Quest::Quest>(syst, gameDesc, *engine))) {}
else if ((create<Glk::Scott::ScottMetaEngine, Glk::Scott::Scott>(syst, gameDesc, *engine))) {}
+ else if ((create<Glk::ZCode::ZCodeMetaEngine, Glk::ZCode::ZCode>(syst, gameDesc, *engine))) {}
+#ifndef RELEASE_BUILD
+ else if ((create<Glk::Comprehend::ComprehendMetaEngine, Glk::Comprehend::Comprehend>(syst, gameDesc, *engine))) {}
+ else if ((create<Glk::Glulx::GlulxMetaEngine, Glk::Glulx::Glulx>(syst, gameDesc, *engine))) {}
else if ((td = Glk::TADS::TADSMetaEngine::findGame(gameDesc._gameId.c_str()))._description) {
if (!isGameAllowed(td._supportLevel))
return Common::kUserCanceled;
@@ -223,8 +230,9 @@ Common::Error GlkMetaEngine::createInstance(OSystem *syst, Engine **engine) cons
new Glk::TADS::TADS3::TADS3(syst, gameDesc);
else
new Glk::TADS::TADS2::TADS2(syst, gameDesc);
- } else if ((create<Glk::ZCode::ZCodeMetaEngine, Glk::ZCode::ZCode>(syst, gameDesc, *engine))) {
- } else {
+ }
+#endif
+ else {
return Common::kNoGameDataFoundError;
}
@@ -261,16 +269,18 @@ PlainGameList GlkMetaEngine::getSupportedGames() const {
Glk::Alan2::Alan2MetaEngine::getSupportedGames(list);
Glk::Alan3::Alan3MetaEngine::getSupportedGames(list);
Glk::Archetype::ArchetypeMetaEngine::getSupportedGames(list);
- Glk::Comprehend::ComprehendMetaEngine::getSupportedGames(list);
- Glk::Glulx::GlulxMetaEngine::getSupportedGames(list);
Glk::Hugo::HugoMetaEngine::getSupportedGames(list);
Glk::JACL::JACLMetaEngine::getSupportedGames(list);
Glk::Level9::Level9MetaEngine::getSupportedGames(list);
Glk::Magnetic::MagneticMetaEngine::getSupportedGames(list);
Glk::Quest::QuestMetaEngine::getSupportedGames(list);
Glk::Scott::ScottMetaEngine::getSupportedGames(list);
- Glk::TADS::TADSMetaEngine::getSupportedGames(list);
Glk::ZCode::ZCodeMetaEngine::getSupportedGames(list);
+#ifndef RELEASE_BUILD
+ Glk::Comprehend::ComprehendMetaEngine::getSupportedGames(list);
+ Glk::Glulx::GlulxMetaEngine::getSupportedGames(list);
+ Glk::TADS::TADSMetaEngine::getSupportedGames(list);
+#endif
return list;
}
@@ -286,16 +296,18 @@ PlainGameDescriptor GlkMetaEngine::findGame(const char *gameId) const {
FIND_GAME(AGT);
FIND_GAME(Alan3);
FIND_GAME(Archetype);
- FIND_GAME(Comprehend);
- FIND_GAME(Glulx);
FIND_GAME(Hugo);
FIND_GAME(JACL);
FIND_GAME(Level9);
FIND_GAME(Magnetic);
FIND_GAME(Quest);
FIND_GAME(Scott);
- FIND_GAME(TADS);
FIND_GAME(ZCode);
+#ifndef RELEASE_BUILD
+ FIND_GAME(Comprehend);
+ FIND_GAME(Glulx);
+ FIND_GAME(TADS);
+#endif
return PlainGameDescriptor();
}
@@ -313,16 +325,18 @@ DetectedGames GlkMetaEngine::detectGames(const Common::FSList &fslist) const {
Glk::Alan2::Alan2MetaEngine::detectGames(fslist, detectedGames);
Glk::Alan3::Alan3MetaEngine::detectGames(fslist, detectedGames);
Glk::Archetype::ArchetypeMetaEngine::detectGames(fslist, detectedGames);
- Glk::Comprehend::ComprehendMetaEngine::detectGames(fslist, detectedGames);
- Glk::Glulx::GlulxMetaEngine::detectGames(fslist, detectedGames);
Glk::Hugo::HugoMetaEngine::detectGames(fslist, detectedGames);
Glk::JACL::JACLMetaEngine::detectGames(fslist, detectedGames);
Glk::Level9::Level9MetaEngine::detectGames(fslist, detectedGames);
Glk::Magnetic::MagneticMetaEngine::detectGames(fslist, detectedGames);
Glk::Quest::QuestMetaEngine::detectGames(fslist, detectedGames);
Glk::Scott::ScottMetaEngine::detectGames(fslist, detectedGames);
- Glk::TADS::TADSMetaEngine::detectGames(fslist, detectedGames);
Glk::ZCode::ZCodeMetaEngine::detectGames(fslist, detectedGames);
+#ifndef RELEASE_BUILD
+ Glk::Comprehend::ComprehendMetaEngine::detectGames(fslist, detectedGames);
+ Glk::Glulx::GlulxMetaEngine::detectGames(fslist, detectedGames);
+ Glk::TADS::TADSMetaEngine::detectGames(fslist, detectedGames);
+#endif
return detectedGames;
}
@@ -335,16 +349,18 @@ void GlkMetaEngine::detectClashes() const {
Glk::Alan2::Alan2MetaEngine::detectClashes(map);
Glk::Alan3::Alan3MetaEngine::detectClashes(map);
Glk::Archetype::ArchetypeMetaEngine::detectClashes(map);
- Glk::Comprehend::ComprehendMetaEngine::detectClashes(map);
- Glk::Glulx::GlulxMetaEngine::detectClashes(map);
Glk::Hugo::HugoMetaEngine::detectClashes(map);
Glk::JACL::JACLMetaEngine::detectClashes(map);
Glk::Level9::Level9MetaEngine::detectClashes(map);
Glk::Magnetic::MagneticMetaEngine::detectClashes(map);
Glk::Quest::QuestMetaEngine::detectClashes(map);
Glk::Scott::ScottMetaEngine::detectClashes(map);
- Glk::TADS::TADSMetaEngine::detectClashes(map);
Glk::ZCode::ZCodeMetaEngine::detectClashes(map);
+#ifndef RELEASE_BUILD
+ Glk::Comprehend::ComprehendMetaEngine::detectClashes(map);
+ Glk::Glulx::GlulxMetaEngine::detectClashes(map);
+ Glk::TADS::TADSMetaEngine::detectClashes(map);
+#endif
}
const ExtraGuiOptions GlkMetaEngine::getExtraGuiOptions(const Common::String &) const {
Commit: 4a1d7a1753a1b20dbe3b230d7a3687a92546b055
https://github.com/scummvm/scummvm/commit/4a1d7a1753a1b20dbe3b230d7a3687a92546b055
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2020-09-10T19:38:55-07:00
Commit Message:
ULTIMA: Disable unstable subengines by default
Changed paths:
engines/ultima/detection.cpp
engines/ultima/detection_tables.h
engines/ultima/shared/early/ultima_early.cpp
engines/ultima/shared/engine/resources.cpp
diff --git a/engines/ultima/detection.cpp b/engines/ultima/detection.cpp
index e231100e07..fbc700489f 100644
--- a/engines/ultima/detection.cpp
+++ b/engines/ultima/detection.cpp
@@ -38,7 +38,9 @@
namespace Ultima {
static const PlainGameDescriptor ULTIMA_GAMES[] = {
+#ifndef RELEASE_BUILD
{ "ultima1", "Ultima I - The First Age of Darkness" },
+#endif
{ "ultima4", "Ultima IV - Quest of the Avatar" },
{ "ultima4_enh", "Ultima IV - Quest of the Avatar - Enhanced" },
{ "ultima6", "Ultima VI - The False Prophet" },
@@ -69,9 +71,11 @@ bool UltimaMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGa
const Ultima::UltimaGameDescription *gd = (const Ultima::UltimaGameDescription *)desc;
if (gd) {
switch (gd->gameId) {
+#ifndef RELEASE_BUILD
case Ultima::GAME_ULTIMA1:
*engine = new Ultima::Shared::UltimaEarlyEngine(syst, gd);
break;
+#endif
case Ultima::GAME_ULTIMA4:
*engine = new Ultima::Ultima4::Ultima4Engine(syst, gd);
break;
diff --git a/engines/ultima/detection_tables.h b/engines/ultima/detection_tables.h
index 2f7b50ab64..68ed0b71eb 100644
--- a/engines/ultima/detection_tables.h
+++ b/engines/ultima/detection_tables.h
@@ -23,6 +23,7 @@
namespace Ultima {
static const UltimaGameDescription GAME_DESCRIPTIONS[] = {
+#ifndef RELEASE_BUILD
{
// Ultima I - The First Age of Darkness
{
@@ -76,6 +77,7 @@ static const UltimaGameDescription GAME_DESCRIPTIONS[] = {
GAME_ULTIMA1,
0
},
+#endif
{
// Ultima IV - Quest of the Avatar
diff --git a/engines/ultima/shared/early/ultima_early.cpp b/engines/ultima/shared/early/ultima_early.cpp
index 1927577cef..6cb21e3682 100644
--- a/engines/ultima/shared/early/ultima_early.cpp
+++ b/engines/ultima/shared/early/ultima_early.cpp
@@ -29,13 +29,17 @@
#include "graphics/scaler.h"
#include "gui/saveload.h"
#include "ultima/shared/early/ultima_early.h"
+#include "ultima/shared/early/game.h"
#include "ultima/shared/engine/ultima.h"
#include "ultima/shared/engine/debugger.h"
#include "ultima/shared/engine/events.h"
#include "ultima/shared/engine/resources.h"
#include "ultima/shared/core/mouse_cursor.h"
#include "ultima/shared/gfx/screen.h"
+
+#ifndef RELEASE_BUILD
#include "ultima/ultima1/game.h"
+#endif
namespace Ultima {
@@ -117,8 +121,10 @@ Graphics::Screen *UltimaEarlyEngine::getScreen() const {
Game *UltimaEarlyEngine::createGame() const {
switch (getGameId()) {
+#ifndef RELEASE_BUILD
case GAME_ULTIMA1:
return new Ultima1::Ultima1Game();
+#endif
default:
error("Unknown game");
}
diff --git a/engines/ultima/shared/engine/resources.cpp b/engines/ultima/shared/engine/resources.cpp
index da864c9956..63a0d25915 100644
--- a/engines/ultima/shared/engine/resources.cpp
+++ b/engines/ultima/shared/engine/resources.cpp
@@ -22,9 +22,12 @@
#include "ultima/shared/engine/resources.h"
#include "ultima/shared/early/font_resources.h"
-#include "ultima/ultima1/core/resources.h"
#include "common/endian.h"
+#ifndef RELEASE_BUILD
+#include "ultima/ultima1/core/resources.h"
+#endif
+
namespace Ultima {
namespace Shared {
@@ -34,8 +37,10 @@ bool Resources::open() {
// Save locally constructred resources to the archive manager for access
Shared::FontResources sharedFonts(this);
sharedFonts.save();
+#ifndef RELEASE_BUILD
Ultima1::GameResources u1Data(this);
u1Data.save();
+#endif
return true;
}
More information about the Scummvm-git-logs
mailing list