[Scummvm-git-logs] scummvm master -> 64b3165a6c6b30645b19c34e02a1975d0f9b8cbe
sev-
sev at scummvm.org
Mon Aug 24 20:31:31 UTC 2020
This automated email contains information about 8 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
7618a85a8a NEVERHOOD: Detect big demo
e66668143e NEVERHOOD: isBigDemo getter
e2eae698e2 NEVERHOOD: Big demo has mail room
e5d04bdfca NEVERHOOD: TNT room is in big demo
e5bd3ed180 NEVERHOOD: Lock out unavailable ride in demo
fc700de0f5 NEVERHOOD: Unlock TNT room back door in big demo
00d84dba10 NEVERHOOD: Big demo has nav videos
64b3165a6c NEVERHOOD: Cleanup detection entry struct
Commit: 7618a85a8aa4b584241a0bb625d437218cd2ba69
https://github.com/scummvm/scummvm/commit/7618a85a8aa4b584241a0bb625d437218cd2ba69
Author: Henrik "Henke37" Andersson (henke at henke37.cjb.net)
Date: 2020-08-24T22:31:23+02:00
Commit Message:
NEVERHOOD: Detect big demo
Changed paths:
engines/neverhood/detection.cpp
diff --git a/engines/neverhood/detection.cpp b/engines/neverhood/detection.cpp
index 3c839d62ed..383f685e47 100644
--- a/engines/neverhood/detection.cpp
+++ b/engines/neverhood/detection.cpp
@@ -97,11 +97,11 @@ static const NeverhoodGameDescription gameDescriptions[] = {
},
{
- // Neverhood English demo version
+ // Neverhood English big demo version
{
"neverhood",
- "Demo",
- AD_ENTRY1s("nevdemo.blb", "05b735cfb1086892bec79b54dca5545b", 22564568),
+ "Big Demo",
+ AD_ENTRY1s("nevdemo.blb", "e637221d296f9a25ff22eaed96b07519", 117274189),
Common::EN_ANY,
Common::kPlatformWindows,
ADGF_DEMO,
@@ -113,6 +113,22 @@ static const NeverhoodGameDescription gameDescriptions[] = {
0,
},
+ {
+ // Neverhood English demo version
+ {
+ "neverhood",
+ "Demo",
+ AD_ENTRY1s("nevdemo.blb", "05b735cfb1086892bec79b54dca5545b", 22564568),
+ Common::EN_ANY,
+ Common::kPlatformWindows,
+ ADGF_DEMO,
+ GUIO1(GUIO_NONE)},
+ 0,
+ 0,
+ 0,
+ 0,
+ },
+
{
// Neverhood earlier English demo version
{
Commit: e66668143ef913466dfb0b2215a1f66ead5b88a5
https://github.com/scummvm/scummvm/commit/e66668143ef913466dfb0b2215a1f66ead5b88a5
Author: Henrik "Henke37" Andersson (henke at henke37.cjb.net)
Date: 2020-08-24T22:31:23+02:00
Commit Message:
NEVERHOOD: isBigDemo getter
Changed paths:
engines/neverhood/detection.cpp
engines/neverhood/neverhood.h
diff --git a/engines/neverhood/detection.cpp b/engines/neverhood/detection.cpp
index 383f685e47..10f12aae87 100644
--- a/engines/neverhood/detection.cpp
+++ b/engines/neverhood/detection.cpp
@@ -64,6 +64,11 @@ bool NeverhoodEngine::isDemo() const {
return _gameDescription->desc.flags & ADGF_DEMO;
}
+bool NeverhoodEngine::isBigDemo() const {
+ //HACK: this is just a stup to allow testing
+ return true;
+}
+
bool NeverhoodEngine::applyResourceFixes() const {
return getLanguage() == Common::RU_RUS;
}
diff --git a/engines/neverhood/neverhood.h b/engines/neverhood/neverhood.h
index d1d64c12c0..802c026a55 100644
--- a/engines/neverhood/neverhood.h
+++ b/engines/neverhood/neverhood.h
@@ -75,6 +75,7 @@ public:
Common::Language getLanguage() const;
bool hasFeature(EngineFeature f) const override;
bool isDemo() const;
+ bool isBigDemo() const;
bool applyResourceFixes() const;
Common::String getTargetName() { return _targetName; };
Commit: e2eae698e219bd9a1e5b6069833347238bacd959
https://github.com/scummvm/scummvm/commit/e2eae698e219bd9a1e5b6069833347238bacd959
Author: Henrik "Henke37" Andersson (henke at henke37.cjb.net)
Date: 2020-08-24T22:31:23+02:00
Commit Message:
NEVERHOOD: Big demo has mail room
Changed paths:
engines/neverhood/modules/module1000.cpp
diff --git a/engines/neverhood/modules/module1000.cpp b/engines/neverhood/modules/module1000.cpp
index 6761557a0b..6102b16879 100644
--- a/engines/neverhood/modules/module1000.cpp
+++ b/engines/neverhood/modules/module1000.cpp
@@ -96,7 +96,7 @@ void Module1000::updateScene() {
if (_moduleResult == 1)
leaveModule(0);
else if (_moduleResult == 2) {
- if (_vm->isDemo())
+ if (_vm->isDemo() && !_vm->isBigDemo())
// Demo version returns to the same scene
createScene(1, 2);
else
Commit: e5d04bdfcac35634df87410702e9b0cdcdcafb0f
https://github.com/scummvm/scummvm/commit/e5d04bdfcac35634df87410702e9b0cdcdcafb0f
Author: Henrik "Henke37" Andersson (henke at henke37.cjb.net)
Date: 2020-08-24T22:31:23+02:00
Commit Message:
NEVERHOOD: TNT room is in big demo
Changed paths:
engines/neverhood/modules/module2300.cpp
diff --git a/engines/neverhood/modules/module2300.cpp b/engines/neverhood/modules/module2300.cpp
index b6aff90f86..67e509b00c 100644
--- a/engines/neverhood/modules/module2300.cpp
+++ b/engines/neverhood/modules/module2300.cpp
@@ -127,7 +127,7 @@ void Module2300::updateScene() {
case 1:
if (_moduleResult == 1)
createScene(0, 0);
- else if (_vm->isDemo())
+ else if (_vm->isDemo() && !(_vm->isBigDemo() && _moduleResult == 4))
createScene(9999, 0);
else if (_moduleResult == 2)
createScene(2, 1);
Commit: e5bd3ed180a31d1750eee9e635604a064f87e277
https://github.com/scummvm/scummvm/commit/e5bd3ed180a31d1750eee9e635604a064f87e277
Author: Henrik "Henke37" Andersson (henke at henke37.cjb.net)
Date: 2020-08-24T22:31:23+02:00
Commit Message:
NEVERHOOD: Lock out unavailable ride in demo
Changed paths:
engines/neverhood/gamemodule.cpp
diff --git a/engines/neverhood/gamemodule.cpp b/engines/neverhood/gamemodule.cpp
index cb643b82ee..9e54536cf2 100644
--- a/engines/neverhood/gamemodule.cpp
+++ b/engines/neverhood/gamemodule.cpp
@@ -715,7 +715,9 @@ void GameModule::updateModule() {
createModule(2600, 1);
break;
case 2600:
- if (_moduleResult == 1)
+ if (_vm->isDemo())
+ createModule(9999, -1);
+ else if (_moduleResult == 1)
createModule(2500, 0);
else
createModule(1200, 1);
Commit: fc700de0f5ee6d1d750ca7adc9bd58991a9a9372
https://github.com/scummvm/scummvm/commit/fc700de0f5ee6d1d750ca7adc9bd58991a9a9372
Author: Henrik "Henke37" Andersson (henke at henke37.cjb.net)
Date: 2020-08-24T22:31:23+02:00
Commit Message:
NEVERHOOD: Unlock TNT room back door in big demo
Changed paths:
engines/neverhood/gamemodule.cpp
diff --git a/engines/neverhood/gamemodule.cpp b/engines/neverhood/gamemodule.cpp
index 9e54536cf2..e0ce12f47d 100644
--- a/engines/neverhood/gamemodule.cpp
+++ b/engines/neverhood/gamemodule.cpp
@@ -715,7 +715,7 @@ void GameModule::updateModule() {
createModule(2600, 1);
break;
case 2600:
- if (_vm->isDemo())
+ if (_vm->isDemo() && !_vm->isBigDemo())
createModule(9999, -1);
else if (_moduleResult == 1)
createModule(2500, 0);
Commit: 00d84dba104fa8dfb16f55e546bf2336b8cde925
https://github.com/scummvm/scummvm/commit/00d84dba104fa8dfb16f55e546bf2336b8cde925
Author: Henrik "Henke37" Andersson (henke at henke37.cjb.net)
Date: 2020-08-24T22:31:23+02:00
Commit Message:
NEVERHOOD: Big demo has nav videos
Changed paths:
engines/neverhood/neverhood.cpp
diff --git a/engines/neverhood/neverhood.cpp b/engines/neverhood/neverhood.cpp
index d33fb56574..683e4c3059 100644
--- a/engines/neverhood/neverhood.cpp
+++ b/engines/neverhood/neverhood.cpp
@@ -111,7 +111,7 @@ Common::Error NeverhoodEngine::run() {
_updateSound = true;
_enableMusic = !_mixer->isSoundTypeMuted(Audio::Mixer::kMusicSoundType);
- if (isDemo()) {
+ if (isDemo() && !isBigDemo()) {
// Adjust this navigation list for the demo version
NavigationList *navigationList = _staticData->getNavigationList(0x004B67E8);
(*navigationList)[0].middleSmackerFileHash = 0;
Commit: 64b3165a6c6b30645b19c34e02a1975d0f9b8cbe
https://github.com/scummvm/scummvm/commit/64b3165a6c6b30645b19c34e02a1975d0f9b8cbe
Author: Henrik "Henke37" Andersson (henke at henke37.cjb.net)
Date: 2020-08-24T22:31:23+02:00
Commit Message:
NEVERHOOD: Cleanup detection entry struct
Changed paths:
engines/neverhood/detection.cpp
engines/neverhood/neverhood.h
diff --git a/engines/neverhood/detection.cpp b/engines/neverhood/detection.cpp
index 10f12aae87..43c3207329 100644
--- a/engines/neverhood/detection.cpp
+++ b/engines/neverhood/detection.cpp
@@ -34,20 +34,13 @@ namespace Neverhood {
struct NeverhoodGameDescription {
ADGameDescription desc;
- int gameID;
- int gameType;
uint32 features;
- uint16 version;
};
const char *NeverhoodEngine::getGameId() const {
return _gameDescription->desc.gameId;
}
-uint32 NeverhoodEngine::getFeatures() const {
- return _gameDescription->features;
-}
-
Common::Platform NeverhoodEngine::getPlatform() const {
return _gameDescription->desc.platform;
}
@@ -56,17 +49,12 @@ Common::Language NeverhoodEngine::getLanguage() const {
return _gameDescription->desc.language;
}
-uint16 NeverhoodEngine::getVersion() const {
- return _gameDescription->version;
-}
-
bool NeverhoodEngine::isDemo() const {
return _gameDescription->desc.flags & ADGF_DEMO;
}
bool NeverhoodEngine::isBigDemo() const {
- //HACK: this is just a stup to allow testing
- return true;
+ return _gameDescription->features & GF_BIG_DEMO;
}
bool NeverhoodEngine::applyResourceFixes() const {
@@ -95,10 +83,7 @@ static const NeverhoodGameDescription gameDescriptions[] = {
ADGF_NO_FLAGS,
GUIO1(GUIO_NONE)
},
- 0,
- 0,
- 0,
- 0,
+ 0
},
{
@@ -112,10 +97,7 @@ static const NeverhoodGameDescription gameDescriptions[] = {
ADGF_DEMO,
GUIO1(GUIO_NONE)
},
- 0,
- 0,
- 0,
- 0,
+ GF_BIG_DEMO
},
{
@@ -127,11 +109,9 @@ static const NeverhoodGameDescription gameDescriptions[] = {
Common::EN_ANY,
Common::kPlatformWindows,
ADGF_DEMO,
- GUIO1(GUIO_NONE)},
- 0,
- 0,
- 0,
- 0,
+ GUIO1(GUIO_NONE)
+ },
+ 0
},
{
@@ -145,10 +125,7 @@ static const NeverhoodGameDescription gameDescriptions[] = {
ADGF_DEMO,
GUIO1(GUIO_NONE)
},
- 0,
- 0,
- 0,
- 0,
+ 0
},
{
@@ -162,10 +139,7 @@ static const NeverhoodGameDescription gameDescriptions[] = {
ADGF_NO_FLAGS,
GUIO1(GUIO_NONE)
},
- 0,
- 0,
- 0,
- 0,
+ 0
},
// FIXME: Disabled for now, as it has broken resources that corrupt the heap
@@ -189,7 +163,7 @@ static const NeverhoodGameDescription gameDescriptions[] = {
},
#endif
- { AD_TABLE_END_MARKER, 0, 0, 0, 0 }
+ { AD_TABLE_END_MARKER, 0 }
};
} // End of namespace Neverhood
diff --git a/engines/neverhood/neverhood.h b/engines/neverhood/neverhood.h
index 802c026a55..c80af7c5c1 100644
--- a/engines/neverhood/neverhood.h
+++ b/engines/neverhood/neverhood.h
@@ -38,6 +38,7 @@
namespace Neverhood {
enum NeverhoodGameFeatures {
+ GF_BIG_DEMO = (1 << 0)
};
struct NeverhoodGameDescription;
@@ -69,8 +70,6 @@ public:
// Detection related functions
const NeverhoodGameDescription *_gameDescription;
const char *getGameId() const;
- uint32 getFeatures() const;
- uint16 getVersion() const;
Common::Platform getPlatform() const;
Common::Language getLanguage() const;
bool hasFeature(EngineFeature f) const override;
More information about the Scummvm-git-logs
mailing list