[Scummvm-git-logs] scummvm branch-2-9 -> f3c95e7f5d135165e11712ce01fc018439db95a1
bluegr
noreply at scummvm.org
Fri Nov 22 08:37:01 UTC 2024
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:
db7b83252b DIRECTOR: Add detection for the demo version of Safecracker
ce8999f603 ENGINES: Define that a game is using 3D graphics on init - bug #15521
f3c95e7f5d Revert "AGI: Process events while executing commands"
Commit: db7b83252be5a5253a695c659573194c9157bb40
https://github.com/scummvm/scummvm/commit/db7b83252be5a5253a695c659573194c9157bb40
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2024-11-22T10:34:51+02:00
Commit Message:
DIRECTOR: Add detection for the demo version of Safecracker
Changed paths:
engines/director/detection_tables.h
diff --git a/engines/director/detection_tables.h b/engines/director/detection_tables.h
index e14adc31ecf..58fb32864b9 100644
--- a/engines/director/detection_tables.h
+++ b/engines/director/detection_tables.h
@@ -1864,6 +1864,7 @@ namespace Director {
#define MACDEMO2(t,e,f1,m1,s1,f2,m2,s2,v) GENGAME2_(t,e,f1,m1,s1,f2,m2,s2,Common::EN_ANY,Common::kPlatformMacintosh,(ADGF_MACRESFORK|ADGF_DEMO),v)
#define WINDEMO2(t,e,f1,m1,s1,f2,m2,s2,v) GENGAME2_(t,e,f1,m1,s1,f2,m2,s2,Common::EN_ANY,Common::kPlatformWindows,ADGF_DEMO,v)
#define WINDEMO2t(t,e,f1,m1,s1,f2,m2,s2,v) GENGAME2t_(t,e,f1,m1,s1,f2,m2,s2,Common::EN_ANY,Common::kPlatformWindows,ADGF_DEMO,v)
+#define WINDEMO2f(t,e,f1,m1,s1,f2,m2,s2,v,fl) GENGAME2_(t,e,f1,m1,s1,f2,m2,s2,Common::EN_ANY,Common::kPlatformWindows,(fl|ADGF_DEMO),v)
#define MACGAME2_l(t,e,f1,m1,s1,f2,m2,s2,l,v) GENGAME2_(t,e,f1,m1,s1,f2,m2,s2,l,Common::kPlatformMacintosh,ADGF_MACRESFORK,v)
#define PIPGAME2_l(t,e,f1,m1,s1,f2,m2,s2,l,v) GENGAME2_(t,e,f1,m1,s1,f2,m2,s2,l,Common::kPlatformPippin,ADGF_MACRESFORK,v)
#define WINGAME2_l(t,e,f1,m1,s1,f2,m2,s2,l,v) GENGAME2_(t,e,f1,m1,s1,f2,m2,s2,l,Common::kPlatformWindows,ADGF_NO_FLAGS,v)
@@ -7216,6 +7217,8 @@ static const DirectorGameDescription gameDescriptions[] = {
"SC_DATA/MAIN_SWE.Dxr", "d:e4976c37b4cfbb8111f0919595b0dea2", 6383684, Common::SE_SWE, 501, GF_32BPP),
WINGAME2f("safecracker", "", "sc_eng.exe", "t:01871e94a5d9b0fad2b063b486cda3f1", 1415977,
"SC_DATA/Main_eng.dxr", "ecc8f8b40956ad36041b5492ec5a4577", 6491010, 501, GF_32BPP),
+ WINDEMO2f("safecracker", "Demo", "sc_demo.exe", "t:edec426e8e11231c8fad68f607ec4e0b", 1415543,
+ "SC_DATA/Main_eng.dxr", "00ccbc4268e3d9cac9323239a4e6be8a", 567556, 501, GF_32BPP),
// Published by the University of Arizona and the Environmental Education Exchange
MACGAME1("saguaro", "", "Settings/SCInstall", "ec6fba1c2d0fd9dbe987f4336cb08e2b", 719005, 501),
Commit: ce8999f6038f600e67ea22f8dcc61b65354673f1
https://github.com/scummvm/scummvm/commit/ce8999f6038f600e67ea22f8dcc61b65354673f1
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-11-22T10:34:51+02:00
Commit Message:
ENGINES: Define that a game is using 3D graphics on init - bug #15521
Changed paths:
engines/engine.cpp
engines/sherlock/scalpel/scalpel.cpp
engines/util.h
diff --git a/engines/engine.cpp b/engines/engine.cpp
index a5f557cb32b..bd37122427b 100644
--- a/engines/engine.cpp
+++ b/engines/engine.cpp
@@ -231,7 +231,7 @@ bool Engine::enhancementEnabled(int32 cls) {
return _activeEnhancements & cls;
}
-void initCommonGFX() {
+void initCommonGFX(bool is3D) {
const Common::ConfigManager::Domain *gameDomain = ConfMan.getActiveDomain();
// Any global or command line settings already have been applied at the time
@@ -253,7 +253,7 @@ void initCommonGFX() {
g_system->setStretchMode(ConfMan.get("stretch_mode").c_str());
// Stop here for hardware-accelerated 3D games
- if (g_system->hasFeature(OSystem::kFeatureOpenGLForGame))
+ if (is3D)
return;
// Set up filtering, scaling and shaders for 2D games
@@ -370,7 +370,7 @@ int initGraphicsAny(const Graphics::ModeWithFormatList &modes, int start) {
for (candidate = start; candidate < (int)modes.size(); candidate++) {
g_system->beginGFXTransaction();
- initCommonGFX();
+ initCommonGFX(false);
#ifdef USE_RGB_COLOR
if (modes[candidate].hasFormat)
g_system->initSize(modes[candidate].width, modes[candidate].height, &modes[candidate].format);
@@ -492,7 +492,7 @@ void initGraphics(int width, int height) {
void initGraphics3d(int width, int height) {
g_system->beginGFXTransaction();
g_system->setGraphicsMode(0, OSystem::kGfxModeRender3d);
- initCommonGFX();
+ initCommonGFX(true);
g_system->initSize(width, height);
g_system->endGFXTransaction();
@@ -518,7 +518,7 @@ void GUIErrorMessage(const Common::String &msg, const char *url) {
void GUIErrorMessage(const Common::U32String &msg, const char *url) {
g_system->setWindowCaption(_("Error"));
g_system->beginGFXTransaction();
- initCommonGFX();
+ initCommonGFX(false);
g_system->initSize(320, 200);
if (g_system->endGFXTransaction() == OSystem::kTransactionSuccess) {
if (url) {
diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index 9c15d1f9aff..e502171f774 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -257,7 +257,7 @@ void ScalpelEngine::setupGraphics() {
// First try for a 640x400 mode
g_system->beginGFXTransaction();
- initCommonGFX();
+ initCommonGFX(false);
g_system->initSize(640, 400, &pixelFormatRGB565);
OSystem::TransactionError gfxError = g_system->endGFXTransaction();
diff --git a/engines/util.h b/engines/util.h
index 37c00f689f0..db68ae24de6 100644
--- a/engines/util.h
+++ b/engines/util.h
@@ -39,8 +39,10 @@
/**
* Set up the graphics mode of the backend.
+ *
+ * @param is3D: set to true if the game to be launched uses 3D graphics
*/
-void initCommonGFX();
+void initCommonGFX(bool is3D);
/**
* Send a list of graphics modes to the backend so it can make a decision
Commit: f3c95e7f5d135165e11712ce01fc018439db95a1
https://github.com/scummvm/scummvm/commit/f3c95e7f5d135165e11712ce01fc018439db95a1
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-11-22T10:36:39+02:00
Commit Message:
Revert "AGI: Process events while executing commands"
This reverts commit 5cc7ddd2406eede4e20d11378eb34792f58d9dc7.
This is quite a big change to be introduced for the upcoming release.
It will need further testing.
Changed paths:
engines/agi/op_cmd.cpp
diff --git a/engines/agi/op_cmd.cpp b/engines/agi/op_cmd.cpp
index 3cd90845a93..10036406a9e 100644
--- a/engines/agi/op_cmd.cpp
+++ b/engines/agi/op_cmd.cpp
@@ -2368,8 +2368,6 @@ int AgiEngine::runLogic(int16 logicNr) {
_game._curLogic->cIP = _game._curLogic->sIP;
while (state->_curLogic->cIP < _game.logics[logicNr].size && !(shouldQuit() || _restartGame)) {
- processScummVMEvents();
-
// TODO: old code, needs to be adjusted
#if 0
if (_debug.enabled) {
More information about the Scummvm-git-logs
mailing list