[Scummvm-git-logs] scummvm master -> 5c73fbc8e1e19b5832a88475e73495a40c53b349
alxpnv
noreply at scummvm.org
Mon Nov 22 11:04:53 UTC 2021
This automated email contains information about 6 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
bc4c43b57e ASYLUM: clean up game descriptions
177c92f77a ASYLUM: add detection for the German CD version
17c27cdea8 ASYLUM: add detection for Spanish fanmade translation
b751e47f42 ASYLUM: big endian fix
a930286e6c ASYLUM: fix checking region flag in Actor::actionAreaCheck()
5c73fbc8e1 ASYLUM: remove duplicated code in Actor::update()
Commit: bc4c43b57e18ef26d5d49d9276c80ee4f2dfb934
https://github.com/scummvm/scummvm/commit/bc4c43b57e18ef26d5d49d9276c80ee4f2dfb934
Author: alxpnv (alxpnv22 at yahoo.com)
Date: 2021-11-22T14:08:44+03:00
Commit Message:
ASYLUM: clean up game descriptions
Changed paths:
engines/asylum/detection_tables.h
diff --git a/engines/asylum/detection_tables.h b/engines/asylum/detection_tables.h
index d400e5b635..ea4907c6af 100644
--- a/engines/asylum/detection_tables.h
+++ b/engines/asylum/detection_tables.h
@@ -34,8 +34,9 @@ static const char *directoryGlobs[] = {
static const ADGameDescription gameDescriptions[] = {
{
+ // English CD version (unpatched)
"asylum",
- "Unpatched",
+ "CD Unpatched",
{
{"SNTRM.DAT", 0, "7cfcc457c1f579fbf9878ac175d29374", 8930},
{"RES.000", 0, "4d13f1412f9e7dd3eaf0a58f0e00e662", 272057},
@@ -48,8 +49,10 @@ static const ADGameDescription gameDescriptions[] = {
GUIO0()
},
{
+ // English CD version (patched)
+ // Level 2 Lockout Bug patch was applied
"asylum",
- "Patched", // Level 2 Lockout Bug patch was applied
+ "CD Patched",
{
{"SNTRM.DAT", 0, "7cfcc457c1f579fbf9878ac175d29374", 8930},
{"RES.000", 0, "4d13f1412f9e7dd3eaf0a58f0e00e662", 272057},
@@ -62,6 +65,7 @@ static const ADGameDescription gameDescriptions[] = {
GUIO0()
},
{
+ // English GOG.com version
"asylum",
"GOG.com",
{
@@ -77,6 +81,7 @@ static const ADGameDescription gameDescriptions[] = {
GUIO0()
},
{
+ // French GOG.com version
"asylum",
"GOG.com",
{
@@ -92,6 +97,7 @@ static const ADGameDescription gameDescriptions[] = {
GUIO0()
},
{
+ // English Steam version
"asylum",
"Steam",
{
@@ -107,6 +113,7 @@ static const ADGameDescription gameDescriptions[] = {
GUIO0()
},
{
+ // German Steam version
"asylum",
"Steam",
{
@@ -122,6 +129,7 @@ static const ADGameDescription gameDescriptions[] = {
GUIO0()
},
{
+ // French Steam version
"asylum",
"Steam",
{
@@ -137,8 +145,9 @@ static const ADGameDescription gameDescriptions[] = {
GUIO0()
},
{
+ // French CD version
"asylum",
- "French Version",
+ "CD",
{
{"SNTRM.DAT", 0, "e09a12543c6ede1727c8ecffb74e7fd2", 8930},
{"RES.000", 0, "2a4677ee3fd7bfa3161e16cd59371238", 277931},
@@ -151,8 +160,9 @@ static const ADGameDescription gameDescriptions[] = {
GUIO0()
},
{
+ // Russian CD version
"asylum",
- "Russian Version",
+ "CD",
{
{"SNTRM.DAT", 0, "7cfcc457c1f579fbf9878ac175d29374", 8930},
{"RES.000", 0, "1f8a262bf8b3035bd3cfda24068c4651", 263624},
@@ -165,7 +175,7 @@ static const ADGameDescription gameDescriptions[] = {
GUIO0()
},
{
- // Sanitarium - English Demo
+ // English Demo
"asylum",
"Demo",
AD_ENTRY2s("SNTRM.DAT", "6a8079e0b49affc99d148624fbb584a1", 326,
@@ -176,7 +186,7 @@ static const ADGameDescription gameDescriptions[] = {
GUIO0()
},
{
- // Sanitarium - English Alt Demo
+ // English Alt Demo
"asylum",
"Demo",
AD_ENTRY2s("ASYLUM.DAT", "6a8079e0b49affc99d148624fbb584a1", 326,
Commit: 177c92f77a0b525e586c45c2ef0d1e0584feaf4e
https://github.com/scummvm/scummvm/commit/177c92f77a0b525e586c45c2ef0d1e0584feaf4e
Author: alxpnv (alxpnv22 at yahoo.com)
Date: 2021-11-22T14:08:44+03:00
Commit Message:
ASYLUM: add detection for the German CD version
Ticket 13085
Changed paths:
engines/asylum/detection_tables.h
diff --git a/engines/asylum/detection_tables.h b/engines/asylum/detection_tables.h
index ea4907c6af..e4fc06a557 100644
--- a/engines/asylum/detection_tables.h
+++ b/engines/asylum/detection_tables.h
@@ -159,6 +159,21 @@ static const ADGameDescription gameDescriptions[] = {
ADGF_TESTING | ADGF_DROPPLATFORM,
GUIO0()
},
+ {
+ // German CD version
+ "asylum",
+ "CD",
+ {
+ {"SNTRM.DAT", 0, "f427fda37a0e29afd4acf982c4cb9fb0", 8930},
+ {"RES.000", 0, "058ea2fca583c27a8e3d7ccc16a9a3bd", 285660},
+ {"SCN.006", 0, "3a5b54da08198012dc0614114782d5fb", 2918330},
+ AD_LISTEND
+ },
+ Common::DE_DEU,
+ Common::kPlatformWindows,
+ ADGF_TESTING | ADGF_DROPPLATFORM,
+ GUIO0()
+ },
{
// Russian CD version
"asylum",
Commit: 17c27cdea8cda20471b3005c7874ebe33da8bb7b
https://github.com/scummvm/scummvm/commit/17c27cdea8cda20471b3005c7874ebe33da8bb7b
Author: alxpnv (alxpnv22 at yahoo.com)
Date: 2021-11-22T14:08:44+03:00
Commit Message:
ASYLUM: add detection for Spanish fanmade translation
Ticket 13087
Changed paths:
engines/asylum/detection_tables.h
diff --git a/engines/asylum/detection_tables.h b/engines/asylum/detection_tables.h
index e4fc06a557..25eb5af511 100644
--- a/engines/asylum/detection_tables.h
+++ b/engines/asylum/detection_tables.h
@@ -189,6 +189,21 @@ static const ADGameDescription gameDescriptions[] = {
ADGF_TESTING | ADGF_DROPPLATFORM,
GUIO0()
},
+ {
+ // Spanish fanmade translation
+ "asylum",
+ "Fanmade",
+ {
+ {"SNTRM.DAT", 0, "7cfcc457c1f579fbf9878ac175d29374", 8930},
+ {"RES.000", 0, "4a112c41f58ac89b472be8cbfe82ab4b", 272057},
+ {"SCN.006", 0, "3a5b54da08198012dc0614114782d5fb", 2918330},
+ AD_LISTEND
+ },
+ Common::ES_ESP,
+ Common::kPlatformWindows,
+ ADGF_TESTING | ADGF_DROPPLATFORM,
+ GUIO0()
+ },
{
// English Demo
"asylum",
Commit: b751e47f423e9cd6ce36a0847a77a57812c4fe6d
https://github.com/scummvm/scummvm/commit/b751e47f423e9cd6ce36a0847a77a57812c4fe6d
Author: alxpnv (alxpnv22 at yahoo.com)
Date: 2021-11-22T14:08:44+03:00
Commit Message:
ASYLUM: big endian fix
Ticket 13081
Changed paths:
engines/asylum/respack.h
diff --git a/engines/asylum/respack.h b/engines/asylum/respack.h
index 0c2fbf8435..a7d59183a1 100644
--- a/engines/asylum/respack.h
+++ b/engines/asylum/respack.h
@@ -49,7 +49,7 @@ struct ResourceEntry {
if (data == NULL)
error("[ResourceEntry::getData] Invalid data");
- return READ_UINT32(data + off);
+ return READ_LE_UINT32(data + off);
}
};
Commit: a930286e6c605ba3594990847b4e80a778d32d6b
https://github.com/scummvm/scummvm/commit/a930286e6c605ba3594990847b4e80a778d32d6b
Author: alxpnv (alxpnv22 at yahoo.com)
Date: 2021-11-22T14:08:44+03:00
Commit Message:
ASYLUM: fix checking region flag in Actor::actionAreaCheck()
Changed paths:
engines/asylum/resources/actor.cpp
diff --git a/engines/asylum/resources/actor.cpp b/engines/asylum/resources/actor.cpp
index 1c5b8800b7..8d26de217b 100644
--- a/engines/asylum/resources/actor.cpp
+++ b/engines/asylum/resources/actor.cpp
@@ -3213,7 +3213,10 @@ void Actor::actionAreaCheck() {
ActionArea *area = getWorld()->actions[areaIndex];
ActionArea *actorArea = getWorld()->actions[_actionIdx3];
- if ((area->flags & 1) && !getSharedData()->getFlag(kFlagSkipScriptProcessing)) {
+ if (!(area->flags & 1))
+ return;
+
+ if (!getSharedData()->getFlag(kFlagSkipScriptProcessing)) {
debugC(kDebugLevelScripts, "[Script] Entered ActionArea (idx: %d, name: %s)", areaIndex, area->name);
debugC(kDebugLevelScripts, "[Script] Queuing Script #1 (idx: %d) for Actor (idx: %d)", actorArea->scriptIndex2, _index);
getScript()->queueScript(actorArea->scriptIndex2, _index);
Commit: 5c73fbc8e1e19b5832a88475e73495a40c53b349
https://github.com/scummvm/scummvm/commit/5c73fbc8e1e19b5832a88475e73495a40c53b349
Author: alxpnv (alxpnv22 at yahoo.com)
Date: 2021-11-22T14:08:44+03:00
Commit Message:
ASYLUM: remove duplicated code in Actor::update()
Changed paths:
engines/asylum/resources/actor.cpp
diff --git a/engines/asylum/resources/actor.cpp b/engines/asylum/resources/actor.cpp
index 8d26de217b..e15f3c48e5 100644
--- a/engines/asylum/resources/actor.cpp
+++ b/engines/asylum/resources/actor.cpp
@@ -549,18 +549,6 @@ void Actor::update() {
move(DIR(_direction + 6), dist);
}
- // Finish
- if (_soundResourceId != kResourceNone && getSound()->isPlaying(_soundResourceId))
- setVolume();
-
- if (_index != getSharedData()->getPlayerIndex() && getWorld()->chapter != kChapter9)
- getSpecial()->run(nullptr, _index);
-
- updateReflectionData();
-
- if (_field_944 != 5)
- actionAreaCheck();
-
}
break;
@@ -609,18 +597,6 @@ void Actor::update() {
}
}
- // Finish
- if (_soundResourceId != kResourceNone && getSound()->isPlaying(_soundResourceId))
- setVolume();
-
- if (_index != getSharedData()->getPlayerIndex() && getWorld()->chapter != kChapter9)
- getSpecial()->run(nullptr, _index);
-
- updateReflectionData();
-
- if (_field_944 != 5)
- actionAreaCheck();
-
}
break;
@@ -670,6 +646,7 @@ void Actor::update() {
break;
}
+ // Finish
if (_soundResourceId && getSound()->isPlaying(_soundResourceId))
setVolume();
More information about the Scummvm-git-logs
mailing list