[Scummvm-git-logs] scummvm master -> d2996b9ed2ab22d42e6736553f89c7cadb9abd05
bluegr
noreply at scummvm.org
Sat Jul 6 04:57:27 UTC 2024
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:
c3dc4e00fd PEGASUS: Make use of the ADGF_DVD flag
d2996b9ed2 ZVISION: Make use of the ADGF_DVD flag
Commit: c3dc4e00fd9a3f9eac892daf4505f74ca488d37f
https://github.com/scummvm/scummvm/commit/c3dc4e00fd9a3f9eac892daf4505f74ca488d37f
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2024-07-06T07:57:24+03:00
Commit Message:
PEGASUS: Make use of the ADGF_DVD flag
Changed paths:
engines/pegasus/detection.cpp
engines/pegasus/detection.h
engines/pegasus/metaengine.cpp
diff --git a/engines/pegasus/detection.cpp b/engines/pegasus/detection.cpp
index 6a6f7c78df2..3c70317ba33 100644
--- a/engines/pegasus/detection.cpp
+++ b/engines/pegasus/detection.cpp
@@ -55,7 +55,7 @@ static const PegasusGameDescription gameDescriptions[] = {
AD_ENTRY1s("JMP PP Resources", "d13a602d2498010d720a6534f097f88b", 2075081),
Common::EN_ANY,
Common::kPlatformMacintosh,
- ADGF_MACRESFORK|GF_DVD,
+ ADGF_MACRESFORK|ADGF_DVD,
GUIO0()
},
},
@@ -66,7 +66,7 @@ static const PegasusGameDescription gameDescriptions[] = {
AD_ENTRY1s("JMP PP Resources", "d13a602d2498010d720a6534f097f88b", 2075081),
Common::EN_ANY,
Common::kPlatformWindows,
- ADGF_MACRESFORK|GF_DVD,
+ ADGF_MACRESFORK|ADGF_DVD,
GUIO0()
},
},
@@ -78,7 +78,7 @@ static const PegasusGameDescription gameDescriptions[] = {
AD_ENTRY1s("JMP PP Resources", "d13a602d2498010d720a6534f097f88b", 2075081),
Common::EN_ANY,
Common::kPlatformLinux,
- ADGF_MACRESFORK|GF_DVD,
+ ADGF_MACRESFORK|ADGF_DVD,
GUIO0()
},
},
@@ -121,7 +121,7 @@ static const PegasusGameDescription gameDescriptions[] = {
AD_ENTRY1s("JMP PP Resources", "r:d0fcda50dc75c7a81ae314e6a813f4d2", 93239),
Common::EN_ANY,
Common::kPlatformMacintosh,
- ADGF_MACRESFORK | ADGF_DEMO | GF_DVD,
+ ADGF_MACRESFORK | ADGF_DEMO | ADGF_DVD,
GUIO2(GUIO_NOLAUNCHLOAD, GUIO_NOMIDI)
},
},
@@ -133,7 +133,7 @@ static const PegasusGameDescription gameDescriptions[] = {
AD_ENTRY1s("JMP PP Resources", "r:d0fcda50dc75c7a81ae314e6a813f4d2", 93239),
Common::EN_ANY,
Common::kPlatformWindows,
- ADGF_MACRESFORK | ADGF_DEMO | GF_DVD,
+ ADGF_MACRESFORK | ADGF_DEMO | ADGF_DVD,
GUIO2(GUIO_NOLAUNCHLOAD, GUIO_NOMIDI)
},
},
diff --git a/engines/pegasus/detection.h b/engines/pegasus/detection.h
index 19a995bbc1a..67912c8d217 100644
--- a/engines/pegasus/detection.h
+++ b/engines/pegasus/detection.h
@@ -26,10 +26,6 @@
namespace Pegasus {
-enum {
- GF_DVD = (1 << 1)
-};
-
struct PegasusGameDescription {
AD_GAME_DESCRIPTION_HELPERS(desc);
diff --git a/engines/pegasus/metaengine.cpp b/engines/pegasus/metaengine.cpp
index e042bf1768f..7e3222f299f 100644
--- a/engines/pegasus/metaengine.cpp
+++ b/engines/pegasus/metaengine.cpp
@@ -43,7 +43,7 @@ bool PegasusEngine::isDemo() const {
}
bool PegasusEngine::isDVD() const {
- return (_gameDescription->desc.flags & GF_DVD) != 0;
+ return (_gameDescription->desc.flags & ADGF_DVD) != 0;
}
bool PegasusEngine::isDVDDemo() const {
Commit: d2996b9ed2ab22d42e6736553f89c7cadb9abd05
https://github.com/scummvm/scummvm/commit/d2996b9ed2ab22d42e6736553f89c7cadb9abd05
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2024-07-06T07:57:24+03:00
Commit Message:
ZVISION: Make use of the ADGF_DVD flag
Changed paths:
engines/zvision/detection.h
engines/zvision/detection_tables.h
engines/zvision/scripting/scr_file_handling.cpp
engines/zvision/zvision.cpp
diff --git a/engines/zvision/detection.h b/engines/zvision/detection.h
index 064e0832958..fcaf5850002 100644
--- a/engines/zvision/detection.h
+++ b/engines/zvision/detection.h
@@ -32,10 +32,6 @@ enum ZVisionGameId {
GID_GRANDINQUISITOR = 2
};
-enum ZVisionFeatures {
- GF_DVD = (1 << 0) // ZGI DVD version
-};
-
struct ZVisionGameDescription {
AD_GAME_DESCRIPTION_HELPERS(desc);
diff --git a/engines/zvision/detection_tables.h b/engines/zvision/detection_tables.h
index fd7d648ed62..f6cdac83f5d 100644
--- a/engines/zvision/detection_tables.h
+++ b/engines/zvision/detection_tables.h
@@ -233,7 +233,7 @@ static const ZVisionGameDescription gameDescriptions[] = {
AD_ENTRY1s("SCRIPTS.ZFS", "03157a3399513bfaaf8dc6d5ab798b36", 8433326),
Common::EN_ANY,
Common::kPlatformWindows,
- GF_DVD,
+ ADGF_DVD,
#if defined(USE_MPEG2) && defined(USE_A52)
GUIO4(GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_DOUBLE_FPS, GAMEOPTION_DISABLE_ANIM_WHILE_TURNING, GAMEOPTION_USE_HIRES_MPEG_MOVIES)
#else
diff --git a/engines/zvision/scripting/scr_file_handling.cpp b/engines/zvision/scripting/scr_file_handling.cpp
index 5721b9a0657..3f1cdf5d1d4 100644
--- a/engines/zvision/scripting/scr_file_handling.cpp
+++ b/engines/zvision/scripting/scr_file_handling.cpp
@@ -109,7 +109,7 @@ void ScriptManager::parsePuzzle(Puzzle *puzzle, Common::SeekableReadStream &stre
//
// Note that the bug only affects the DVD version. The CD
// version doesn't have a separate room for the cutscene.
- else if (_engine->getGameId() == GID_GRANDINQUISITOR && (_engine->getFeatures() & GF_DVD) && puzzle->key == 10836)
+ else if (_engine->getGameId() == GID_GRANDINQUISITOR && (_engine->getFeatures() & ADGF_DVD) && puzzle->key == 10836)
puzzle->resultActions.push_front(new ActionAssign(_engine, 11, "10803, 0"));
} else if (line.matchString("flags {", true)) {
setStateFlag(puzzle->key, parseFlags(stream));
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index 863872d1dab..e7a8004d7cd 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -197,7 +197,7 @@ void ZVision::initialize() {
modes.push_back(Graphics::Mode(WINDOW_WIDTH, WINDOW_HEIGHT));
#if defined(USE_MPEG2) && defined(USE_A52)
// For the DVD version of ZGI we can play high resolution videos
- if (getGameId() == GID_GRANDINQUISITOR && (getFeatures() & GF_DVD))
+ if (getGameId() == GID_GRANDINQUISITOR && (getFeatures() & ADGF_DVD))
modes.push_back(Graphics::Mode(HIRES_WINDOW_WIDTH, HIRES_WINDOW_HEIGHT));
#endif
initGraphicsModes(modes);
More information about the Scummvm-git-logs
mailing list