[Scummvm-git-logs] scummvm master -> 5ce98899046562ee9f0fe7bb16ef1ca7252e270c
bluegr
noreply at scummvm.org
Thu May 15 08:33:02 UTC 2025
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
783b85be14 NANCY: Add global GUI options per game version
5ce9889904 NANCY: Throw a warning for unknown action record types
Commit: 783b85be14333a37989099e956c41d8a2af47012
https://github.com/scummvm/scummvm/commit/783b85be14333a37989099e956c41d8a2af47012
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2025-05-15T11:32:35+03:00
Commit Message:
NANCY: Add global GUI options per game version
This simplifies the GUIO flag usage, and allow us to make global
changes for many different games easier
Changed paths:
engines/nancy/detection.cpp
diff --git a/engines/nancy/detection.cpp b/engines/nancy/detection.cpp
index 00a152032db..7619462656e 100644
--- a/engines/nancy/detection.cpp
+++ b/engines/nancy/detection.cpp
@@ -59,9 +59,12 @@ static const PlainGameDescriptor nancyGames[] = {
{ nullptr, nullptr }
};
+#define VAMPIRE_GUIOPTIONS GUIO3(GUIO_NOLANG, GAMEOPTION_PLAYER_SPEECH, GAMEOPTION_CHARACTER_SPEECH)
+#define NANCY_GUIOPTIONS GUIO2(GAMEOPTION_PLAYER_SPEECH, GAMEOPTION_CHARACTER_SPEECH)
#define NANCY2_GUIOPTIONS GUIO4(GAMEOPTION_PLAYER_SPEECH, GAMEOPTION_CHARACTER_SPEECH, GAMEOPTION_FIX_SOFTLOCKS, GAMEOPTION_NANCY2_TIMER)
#define NANCY5_GUIOPTIONS GUIO3(GAMEOPTION_PLAYER_SPEECH, GAMEOPTION_CHARACTER_SPEECH, GAMEOPTION_FIX_SOFTLOCKS)
#define NANCY6_7_GUIOPTIONS GUIO2(GAMEOPTION_AUTO_MOVE, GAMEOPTION_FIX_SOFTLOCKS)
+#define NANCY8_GUIOPTIONS GUIO1(GAMEOPTION_AUTO_MOVE)
static const Nancy::NancyGameDescription gameDescriptions[] = {
@@ -72,7 +75,7 @@ static const Nancy::NancyGameDescription gameDescriptions[] = {
Common::EN_ANY,
Common::kPlatformWindows,
ADGF_DROPLANGUAGE | ADGF_DROPPLATFORM,
- GUIO3(GUIO_NOLANG, GAMEOPTION_PLAYER_SPEECH, GAMEOPTION_CHARACTER_SPEECH)
+ VAMPIRE_GUIOPTIONS
},
Nancy::kGameTypeVampire
},
@@ -83,7 +86,7 @@ static const Nancy::NancyGameDescription gameDescriptions[] = {
Common::EN_ANY,
Common::kPlatformWindows,
ADGF_DROPPLATFORM,
- GUIO2(GAMEOPTION_PLAYER_SPEECH, GAMEOPTION_CHARACTER_SPEECH)
+ NANCY_GUIOPTIONS
},
Nancy::kGameTypeNancy1
},
@@ -94,7 +97,7 @@ static const Nancy::NancyGameDescription gameDescriptions[] = {
Common::RU_RUS,
Common::kPlatformWindows,
ADGF_DROPPLATFORM,
- GUIO2(GAMEOPTION_PLAYER_SPEECH, GAMEOPTION_CHARACTER_SPEECH)
+ NANCY_GUIOPTIONS
},
Nancy::kGameTypeNancy1
},
@@ -112,7 +115,7 @@ static const Nancy::NancyGameDescription gameDescriptions[] = {
Common::RU_RUS,
Common::kPlatformWindows,
ADGF_DROPPLATFORM | Nancy::GF_COMPRESSED,
- GUIO2(GAMEOPTION_PLAYER_SPEECH, GAMEOPTION_CHARACTER_SPEECH)
+ NANCY_GUIOPTIONS
},
Nancy::kGameTypeNancy1
},
@@ -162,7 +165,7 @@ static const Nancy::NancyGameDescription gameDescriptions[] = {
Common::EN_ANY,
Common::kPlatformWindows,
ADGF_DROPPLATFORM,
- GUIO2(GAMEOPTION_PLAYER_SPEECH, GAMEOPTION_CHARACTER_SPEECH)
+ NANCY_GUIOPTIONS
},
Nancy::kGameTypeNancy3
},
@@ -173,7 +176,7 @@ static const Nancy::NancyGameDescription gameDescriptions[] = {
Common::EN_ANY,
Common::kPlatformWindows,
ADGF_DROPPLATFORM,
- GUIO2(GAMEOPTION_PLAYER_SPEECH, GAMEOPTION_CHARACTER_SPEECH)
+ NANCY_GUIOPTIONS
},
Nancy::kGameTypeNancy3
},
@@ -190,7 +193,7 @@ static const Nancy::NancyGameDescription gameDescriptions[] = {
Common::EN_ANY,
Common::kPlatformWindows,
ADGF_DROPPLATFORM | Nancy::GF_COMPRESSED,
- GUIO2(GAMEOPTION_PLAYER_SPEECH, GAMEOPTION_CHARACTER_SPEECH)
+ NANCY_GUIOPTIONS
},
Nancy::kGameTypeNancy3
},
@@ -207,7 +210,7 @@ static const Nancy::NancyGameDescription gameDescriptions[] = {
Common::EN_ANY,
Common::kPlatformWindows,
ADGF_DROPPLATFORM | Nancy::GF_COMPRESSED,
- GUIO2(GAMEOPTION_PLAYER_SPEECH, GAMEOPTION_CHARACTER_SPEECH)
+ NANCY_GUIOPTIONS
},
Nancy::kGameTypeNancy3
},
@@ -218,7 +221,7 @@ static const Nancy::NancyGameDescription gameDescriptions[] = {
Common::RU_RUS,
Common::kPlatformWindows,
ADGF_DROPPLATFORM,
- GUIO2(GAMEOPTION_PLAYER_SPEECH, GAMEOPTION_CHARACTER_SPEECH)
+ NANCY_GUIOPTIONS
},
Nancy::kGameTypeNancy3
},
@@ -235,7 +238,7 @@ static const Nancy::NancyGameDescription gameDescriptions[] = {
Common::RU_RUS,
Common::kPlatformWindows,
ADGF_DROPPLATFORM | Nancy::GF_COMPRESSED,
- GUIO2(GAMEOPTION_PLAYER_SPEECH, GAMEOPTION_CHARACTER_SPEECH)
+ NANCY_GUIOPTIONS
},
Nancy::kGameTypeNancy3
},
@@ -246,7 +249,7 @@ static const Nancy::NancyGameDescription gameDescriptions[] = {
Common::EN_ANY,
Common::kPlatformWindows,
ADGF_DROPPLATFORM,
- GUIO2(GAMEOPTION_PLAYER_SPEECH, GAMEOPTION_CHARACTER_SPEECH)
+ NANCY_GUIOPTIONS
},
Nancy::kGameTypeNancy4
},
@@ -257,7 +260,7 @@ static const Nancy::NancyGameDescription gameDescriptions[] = {
Common::EN_ANY,
Common::kPlatformWindows,
ADGF_DROPPLATFORM,
- GUIO2(GAMEOPTION_PLAYER_SPEECH, GAMEOPTION_CHARACTER_SPEECH)
+ NANCY_GUIOPTIONS
},
Nancy::kGameTypeNancy4
},
@@ -274,7 +277,7 @@ static const Nancy::NancyGameDescription gameDescriptions[] = {
Common::EN_ANY,
Common::kPlatformWindows,
ADGF_DROPPLATFORM | Nancy::GF_COMPRESSED,
- GUIO2(GAMEOPTION_PLAYER_SPEECH, GAMEOPTION_CHARACTER_SPEECH)
+ NANCY_GUIOPTIONS
},
Nancy::kGameTypeNancy4
},
@@ -291,7 +294,7 @@ static const Nancy::NancyGameDescription gameDescriptions[] = {
Common::EN_ANY,
Common::kPlatformWindows,
ADGF_DROPPLATFORM | Nancy::GF_COMPRESSED,
- GUIO2(GAMEOPTION_PLAYER_SPEECH, GAMEOPTION_CHARACTER_SPEECH)
+ NANCY_GUIOPTIONS
},
Nancy::kGameTypeNancy4
},
@@ -308,7 +311,7 @@ static const Nancy::NancyGameDescription gameDescriptions[] = {
Common::EN_ANY,
Common::kPlatformWindows,
ADGF_DROPPLATFORM | Nancy::GF_COMPRESSED,
- GUIO2(GAMEOPTION_PLAYER_SPEECH, GAMEOPTION_CHARACTER_SPEECH)
+ NANCY_GUIOPTIONS
},
Nancy::kGameTypeNancy4
},
@@ -319,7 +322,7 @@ static const Nancy::NancyGameDescription gameDescriptions[] = {
Common::RU_RUS,
Common::kPlatformWindows,
ADGF_DROPPLATFORM,
- GUIO2(GAMEOPTION_PLAYER_SPEECH, GAMEOPTION_CHARACTER_SPEECH)
+ NANCY_GUIOPTIONS
},
Nancy::kGameTypeNancy4
},
@@ -337,7 +340,7 @@ static const Nancy::NancyGameDescription gameDescriptions[] = {
Common::RU_RUS,
Common::kPlatformWindows,
ADGF_DROPPLATFORM | Nancy::GF_COMPRESSED,
- GUIO2(GAMEOPTION_PLAYER_SPEECH, GAMEOPTION_CHARACTER_SPEECH)
+ NANCY_GUIOPTIONS
},
Nancy::kGameTypeNancy4
},
@@ -606,7 +609,7 @@ static const Nancy::NancyGameDescription gameDescriptions[] = {
Common::EN_ANY,
Common::kPlatformWindows,
ADGF_UNSTABLE | ADGF_DROPPLATFORM,
- GUIO1(GAMEOPTION_AUTO_MOVE)
+ NANCY8_GUIOPTIONS
},
Nancy::kGameTypeNancy8
},
@@ -623,7 +626,7 @@ static const Nancy::NancyGameDescription gameDescriptions[] = {
Common::EN_ANY,
Common::kPlatformWindows,
ADGF_UNSTABLE | ADGF_DROPPLATFORM | Nancy::GF_COMPRESSED,
- GUIO1(GAMEOPTION_AUTO_MOVE)
+ NANCY8_GUIOPTIONS
},
Nancy::kGameTypeNancy8
},
@@ -634,7 +637,7 @@ static const Nancy::NancyGameDescription gameDescriptions[] = {
Common::RU_RUS,
Common::kPlatformWindows,
ADGF_UNSTABLE | ADGF_DROPPLATFORM,
- GUIO1(GAMEOPTION_AUTO_MOVE)
+ NANCY8_GUIOPTIONS
},
Nancy::kGameTypeNancy8
},
@@ -651,7 +654,7 @@ static const Nancy::NancyGameDescription gameDescriptions[] = {
Common::RU_RUS,
Common::kPlatformWindows,
ADGF_UNSTABLE | ADGF_DROPPLATFORM | Nancy::GF_COMPRESSED,
- GUIO1(GAMEOPTION_AUTO_MOVE)
+ NANCY8_GUIOPTIONS
},
Nancy::kGameTypeNancy8
},
@@ -666,7 +669,7 @@ static const Nancy::NancyGameDescription gameDescriptions[] = {
Common::EN_ANY,
Common::kPlatformWindows,
ADGF_UNSTABLE | ADGF_DROPPLATFORM,
- GUIO1(GAMEOPTION_AUTO_MOVE)
+ NANCY8_GUIOPTIONS
},
Nancy::kGameTypeNancy9
},
@@ -683,7 +686,7 @@ static const Nancy::NancyGameDescription gameDescriptions[] = {
Common::EN_ANY,
Common::kPlatformWindows,
ADGF_UNSTABLE | ADGF_DROPPLATFORM | Nancy::GF_COMPRESSED,
- GUIO1(GAMEOPTION_AUTO_MOVE)
+ NANCY8_GUIOPTIONS
},
Nancy::kGameTypeNancy9
},
@@ -698,7 +701,7 @@ static const Nancy::NancyGameDescription gameDescriptions[] = {
Common::EN_ANY,
Common::kPlatformWindows,
ADGF_UNSTABLE | ADGF_DROPPLATFORM,
- GUIO1(GAMEOPTION_AUTO_MOVE)
+ NANCY8_GUIOPTIONS
},
Nancy::kGameTypeNancy10
},
@@ -715,7 +718,7 @@ static const Nancy::NancyGameDescription gameDescriptions[] = {
Common::EN_ANY,
Common::kPlatformWindows,
ADGF_UNSTABLE | ADGF_DROPPLATFORM | Nancy::GF_COMPRESSED,
- GUIO1(GAMEOPTION_AUTO_MOVE)
+ NANCY8_GUIOPTIONS
},
Nancy::kGameTypeNancy10
},
@@ -730,7 +733,7 @@ static const Nancy::NancyGameDescription gameDescriptions[] = {
Common::EN_ANY,
Common::kPlatformWindows,
ADGF_UNSTABLE | ADGF_DROPPLATFORM,
- GUIO1(GAMEOPTION_AUTO_MOVE)
+ NANCY8_GUIOPTIONS
},
Nancy::kGameTypeNancy11
},
@@ -747,7 +750,7 @@ static const Nancy::NancyGameDescription gameDescriptions[] = {
Common::EN_ANY,
Common::kPlatformWindows,
ADGF_UNSTABLE | ADGF_DROPPLATFORM | Nancy::GF_COMPRESSED,
- GUIO1(GAMEOPTION_AUTO_MOVE)
+ NANCY8_GUIOPTIONS
},
Nancy::kGameTypeNancy11
},
Commit: 5ce98899046562ee9f0fe7bb16ef1ca7252e270c
https://github.com/scummvm/scummvm/commit/5ce98899046562ee9f0fe7bb16ef1ca7252e270c
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2025-05-15T11:32:36+03:00
Commit Message:
NANCY: Throw a warning for unknown action record types
Helps identify places with unimplemented functionality a lot quicker
Changed paths:
engines/nancy/action/arfactory.cpp
diff --git a/engines/nancy/action/arfactory.cpp b/engines/nancy/action/arfactory.cpp
index 32c5980f0fe..4f72e1ede25 100644
--- a/engines/nancy/action/arfactory.cpp
+++ b/engines/nancy/action/arfactory.cpp
@@ -363,6 +363,7 @@ ActionRecord *ActionManager::createActionRecord(uint16 type, Common::SeekableRea
case 230:
return new Telephone(true);
default:
+ warning("Unknown action record type %d", type);
return nullptr;
}
}
More information about the Scummvm-git-logs
mailing list