[Scummvm-git-logs] scummvm master -> c0f9a5566dc1ef95a06829ed60a243855f5011f6
neuromancer
noreply at scummvm.org
Sat Mar 12 13:31:05 UTC 2022
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
85c2aee6ec HYPNO: corrected c20 level order in wet
61f64a4d28 HYPNO: add a flag to enable restored content
0c1ccd1022 HYPNO: added statistics after each fight as restored content in spider
c0f9a5566d HYPNO: added some missing videos, sounds and restored content in spider
Commit: 85c2aee6ecc34d6cfb567299a787d4860f6b2631
https://github.com/scummvm/scummvm/commit/85c2aee6ecc34d6cfb567299a787d4860f6b2631
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-03-12T10:34:05+01:00
Commit Message:
HYPNO: corrected c20 level order in wet
Changed paths:
engines/hypno/wet/wet.cpp
diff --git a/engines/hypno/wet/wet.cpp b/engines/hypno/wet/wet.cpp
index d011f21bfa9..d0f456fbe0c 100644
--- a/engines/hypno/wet/wet.cpp
+++ b/engines/hypno/wet/wet.cpp
@@ -30,10 +30,10 @@ namespace Hypno {
static const chapterEntry rawChapterTable[] = {
{11, {44, 172}, {218, 172}, {0, 0}}, // c11
{10, {19, 3}, {246, 3}, {246, 11}}, // c10
- {20, {44, 172}, {218, 172}, {0, 0}}, // c20
{21, {70, 160}, {180, 160}, {220, 185}}, // c21
{22, {70, 160}, {180, 160}, {220, 185}}, // c22
{23, {70, 160}, {180, 160}, {220, 185}}, // c23
+ {20, {44, 172}, {218, 172}, {0, 0}}, // c20
{31, {70, 160}, {180, 160}, {220, 185}}, // c31
{32, {70, 160}, {180, 160}, {220, 185}}, // c32
{33, {70, 160}, {180, 160}, {220, 185}}, // c33
Commit: 61f64a4d28cd6343c3443d074b9a6e3e1af7b9b1
https://github.com/scummvm/scummvm/commit/61f64a4d28cd6343c3443d074b9a6e3e1af7b9b1
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-03-12T10:53:45+01:00
Commit Message:
HYPNO: add a flag to enable restored content
Changed paths:
engines/hypno/detection.cpp
engines/hypno/hypno.cpp
engines/hypno/hypno.h
diff --git a/engines/hypno/detection.cpp b/engines/hypno/detection.cpp
index ad9f7a7909c..9b147965cc0 100644
--- a/engines/hypno/detection.cpp
+++ b/engines/hypno/detection.cpp
@@ -186,13 +186,20 @@ static const char *const directoryGlobs[] = {
nullptr
};
-static const ExtraGuiOption hypnoExtraGuiOption = {
+static const ExtraGuiOption hypnoExtraGuiOptionCheats = {
_s("Enable cheats"),
_s("Allow cheats using the C key."),
"cheats",
false
};
+static const ExtraGuiOption hypnoExtraGuiOptionRestoredContent = {
+ _s("Enable restored content"),
+ _s("Add additional content that is not enabled the original implementation."),
+ "restored",
+ false
+};
+
class HypnoMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
HypnoMetaEngineDetection() : AdvancedMetaEngineDetection(Hypno::gameDescriptions, sizeof(ADGameDescription), Hypno::hypnoGames) {
@@ -223,7 +230,8 @@ public:
const ExtraGuiOptions HypnoMetaEngineDetection::getExtraGuiOptions(const Common::String &target) const {
ExtraGuiOptions options;
- options.push_back(hypnoExtraGuiOption);
+ options.push_back(hypnoExtraGuiOptionCheats);
+ options.push_back(hypnoExtraGuiOptionRestoredContent);
return options;
}
diff --git a/engines/hypno/hypno.cpp b/engines/hypno/hypno.cpp
index 64c5e320c28..5448982452f 100644
--- a/engines/hypno/hypno.cpp
+++ b/engines/hypno/hypno.cpp
@@ -70,6 +70,8 @@ HypnoEngine::HypnoEngine(OSystem *syst, const ADGameDescription *gd)
if (!Common::parseBool(ConfMan.get("cheats"), _cheatsEnabled))
error("Failed to parse bool from cheats options");
+ if (!Common::parseBool(ConfMan.get("restored"), _restoredContentEnabled))
+ error("Failed to parse bool from restored options");
// Add quit level
Hotspot q(MakeMenu);
Action *a = new Quit();
diff --git a/engines/hypno/hypno.h b/engines/hypno/hypno.h
index 1c03adb37a5..09932b7fa30 100644
--- a/engines/hypno/hypno.h
+++ b/engines/hypno/hypno.h
@@ -82,6 +82,7 @@ public:
Common::Platform _platform;
Common::String _variant;
bool _cheatsEnabled;
+ bool _restoredContentEnabled;
Audio::SoundHandle _soundHandle;
Common::InstallShieldV3 _installerArchive;
Commit: 0c1ccd1022351b67f1a6b0ef841cc1c6ce3729a4
https://github.com/scummvm/scummvm/commit/0c1ccd1022351b67f1a6b0ef841cc1c6ce3729a4
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-03-12T12:10:19+01:00
Commit Message:
HYPNO: added statistics after each fight as restored content in spider
Changed paths:
engines/hypno/hypno.h
engines/hypno/spider/arcade.cpp
diff --git a/engines/hypno/hypno.h b/engines/hypno/hypno.h
index 09932b7fa30..911a7d8f589 100644
--- a/engines/hypno/hypno.h
+++ b/engines/hypno/hypno.h
@@ -386,6 +386,7 @@ public:
// Arcade
void runBeforeArcade(ArcadeShooting *arc) override;
+ void runAfterArcade(ArcadeShooting *arc) override;
void findNextSegment(ArcadeShooting *arc) override;
void initSegment(ArcadeShooting *arc) override;
diff --git a/engines/hypno/spider/arcade.cpp b/engines/hypno/spider/arcade.cpp
index f9d0c207fbe..d611133e711 100644
--- a/engines/hypno/spider/arcade.cpp
+++ b/engines/hypno/spider/arcade.cpp
@@ -57,6 +57,28 @@ void SpiderEngine::runBeforeArcade(ArcadeShooting *arc) {
_lastPlayerPosition = kPlayerLeft;
}
+void SpiderEngine::runAfterArcade(ArcadeShooting *arc) {
+ _checkpoint = _currentLevel;
+ if (_restoredContentEnabled) {
+ Common::String message;
+ if (_health > 0)
+ message += "Spider-man won!\n";
+ else
+ message += "Spider-man was defeated!\n";
+
+ message += Common::String::format("%-21s = %7d\n", "Webs fired", _shootsFired);
+ message += Common::String::format("%-19s = %7d\n", "Enemy targets", _enemyTargets);
+ message += Common::String::format("%-18s = %7d\n", "Targets destroyed", _targetsDestroyed);
+ message += Common::String::format("%-19s = %7d\n", "Targets missed", _targetsMissed);
+ message += Common::String::format("%-24s = %5d %%\n", "Kill ratio", killRatio());
+ message += Common::String::format("%-21s = %5d %%\n", "Accuracy", accuracyRatio());
+ message += Common::String::format("%-22s = %5d %%\n", "Energy", _health);
+ message += Common::String::format("%-23s = %5d pts", "Score", _score);
+ GUI::MessageDialog dialog(message, "OK", "", Graphics::kTextAlignLeft);
+ dialog.runModal();
+ }
+}
+
void SpiderEngine::initSegment(ArcadeShooting *arc) {
_segmentShootSequenceOffset = 0;
_segmentShootSequenceMax = 0;
Commit: c0f9a5566dc1ef95a06829ed60a243855f5011f6
https://github.com/scummvm/scummvm/commit/c0f9a5566dc1ef95a06829ed60a243855f5011f6
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-03-12T14:30:50+01:00
Commit Message:
HYPNO: added some missing videos, sounds and restored content in spider
Changed paths:
engines/hypno/spider/arcade.cpp
engines/hypno/spider/spider.cpp
diff --git a/engines/hypno/spider/arcade.cpp b/engines/hypno/spider/arcade.cpp
index d611133e711..f1672ec12f9 100644
--- a/engines/hypno/spider/arcade.cpp
+++ b/engines/hypno/spider/arcade.cpp
@@ -106,8 +106,8 @@ void SpiderEngine::hitPlayer() {
_compositeSurface->fillRect(Common::Rect(0, 0, 640, 480), c);
drawScreen();
}
- // if (!_hitSound.empty())
- // playSound(_soundPath + _hitSound, 1);
+ if (!_hitSound.empty())
+ playSound(_soundPath + _hitSound, 1, 11025);
}
void SpiderEngine::drawShoot(const Common::Point &target) {
diff --git a/engines/hypno/spider/spider.cpp b/engines/hypno/spider/spider.cpp
index f705474bcf7..e1e154d4cbb 100644
--- a/engines/hypno/spider/spider.cpp
+++ b/engines/hypno/spider/spider.cpp
@@ -270,6 +270,7 @@ void SpiderEngine::loadAssetsFullGame() {
Transition *trans_apt_1 = new Transition("busint.mi_");
trans_apt_1->intros.push_back("spider/cine/ross004s.smk");
+ trans_apt_1->intros.push_back("spider/cine/ross005s.smk");
trans_apt_1->intros.push_back("spider/cine/apts002s.smk");
trans_apt_1->intros.push_back("spider/cine/blcs00.smk");
_levels["<trans_apt_1>"] = trans_apt_1;
@@ -566,9 +567,13 @@ void SpiderEngine::loadAssetsFullGame() {
sc->hots[4].actions.push_back(gl);
loadArcadeLevel("c5.mi_", "<trans_apt_6>", "<over_hob2>", prefix);
+ if (_restoredContentEnabled)
+ _levels["c5.mi_"]->intros.push_back("cine/ppv006bs.smk");
_levels["c5.mi_"]->intros.push_back("cine/ctss001s.smk");
loadArcadeLevel("c5h.mi_", "<trans_apt_6>", "<over_hob2>", prefix);
+ if (_restoredContentEnabled)
+ _levels["c5.mi_"]->intros.push_back("cine/ppv006bs.smk");
_levels["c5h.mi_"]->intros.push_back("cine/ctss001s.smk");
Transition *trans_apt_6 = new Transition("factory1.mi_");
@@ -579,6 +584,8 @@ void SpiderEngine::loadAssetsFullGame() {
loadSceneLevel("ball1.mi_", "<note>", prefix);
_levels["ball1.mi_"]->music = "sound.lib/ballroom.raw";
_levels["ball1.mi_"]->musicRate = 11025;
+ if (_restoredContentEnabled)
+ _levels["ball1.mi_"]->intros.push_back("cine/ppv006as.smk");
loadSceneLevel("coat.mi_", "ball2.mi_", prefix);
_levels["coat.mi_"]->music = "sound.lib/ballroom.raw";
_levels["coat.mi_"]->musicRate = 11025;
@@ -710,6 +717,7 @@ void SpiderEngine::loadAssetsFullGame() {
Transition *after_c13 = new Transition("docoffi2.mi_");
after_c13->intros.push_back("spider/cine/vrfs06bs.smk");
+ after_c13->intros.push_back("spider/cine/spv064as.smk");
//after_c13->intros.push_back("spider/cine/spv064s.smk"); low-quality version?
_levels["<after_c13>"] = after_c13;
@@ -770,6 +778,7 @@ void SpiderEngine::loadAssetsFullGame() {
Transition *after_c10 = new Transition("docoffic.mi_");
after_c10->intros.push_back("spider/cine/utns004s.smk");
+ after_c10->intros.push_back("spider/cine/bustitxs.smk");
_levels["<after_c10>"] = after_c10;
loadSceneLevel("docoffic.mi_", "decide9.mi_", prefix);
More information about the Scummvm-git-logs
mailing list