[Scummvm-git-logs] scummvm master -> 7122e42ab2c3c0fae09f08d47103bdb59049d2a1
neuromancer
noreply at scummvm.org
Sat Apr 23 10:34:09 UTC 2022
This automated email contains information about 7 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
71d79e7459 HYPNO: avoid negative health in wet
31a15f1bad HYPNO: ui fixes for level c10 in wet
aabdfcdb41 HYPNO: mouse box adjustments for level c20 in wet
b1297640c1 HYPNO: ui fixes for level c33 in wet
644c5d6d31 HYPNO: completed ui for level c30 in wet
17357297ec HYPNO: improved ui for levels c4x in wet
7122e42ab2 HYPNO: improved ui for levels c5x in wet
Commit: 71d79e74597b96e3bfb06669d7541ae84ade301b
https://github.com/scummvm/scummvm/commit/71d79e74597b96e3bfb06669d7541ae84ade301b
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-04-23T12:34:24+02:00
Commit Message:
HYPNO: avoid negative health in wet
Changed paths:
engines/hypno/wet/arcade.cpp
diff --git a/engines/hypno/wet/arcade.cpp b/engines/hypno/wet/arcade.cpp
index 88850c2f598..a4f01348d62 100644
--- a/engines/hypno/wet/arcade.cpp
+++ b/engines/hypno/wet/arcade.cpp
@@ -284,6 +284,9 @@ void WetEngine::findNextSegment(ArcadeShooting *arc) {
void WetEngine::runAfterArcade(ArcadeShooting *arc) {
_checkpoint = _currentLevel;
+ if (_health < 0)
+ _health = 0;
+
if (isDemo() && _variant != "Demo" && _restoredContentEnabled) {
showDemoScore();
} else if (!isDemo() || (_variant == "Demo" && _language == Common::EN_USA)) {
Commit: 31a15f1bad3c45073ce05966ad529c2d06e58fff
https://github.com/scummvm/scummvm/commit/31a15f1bad3c45073ce05966ad529c2d06e58fff
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-04-23T12:34:24+02:00
Commit Message:
HYPNO: ui fixes for level c10 in wet
Changed paths:
engines/hypno/wet/arcade.cpp
diff --git a/engines/hypno/wet/arcade.cpp b/engines/hypno/wet/arcade.cpp
index a4f01348d62..31044ddc755 100644
--- a/engines/hypno/wet/arcade.cpp
+++ b/engines/hypno/wet/arcade.cpp
@@ -702,8 +702,8 @@ void WetEngine::drawPlayer() {
c = kHypnoColorRed; // red ?
Common::Point mousePos = g_system->getEventManager()->getMousePos();
int i = detectTarget(mousePos);
- if (i > 0)
- drawString("block05.fgx", "TARGET ACQUIRED", 116, 3, 80, c);
+ if (i >= 0)
+ drawString("block05.fgx", "TARGET ACQUIRED", 116, 3, 80, c);
if (_arcadeMode == "Y1" || _arcadeMode == "Y3")
return;
@@ -754,12 +754,28 @@ void WetEngine::drawHealth() {
int mm = _objKillsRequired[_objIdx];
if (_playerFrameIdx < _playerFrameSep) {
const chapterEntry *entry = _chapterTable[_levelId];
- //uint32 id = _levelId;
- drawString("block05.fgx", Common::String::format("ENERGY %d%%", p), entry->energyPos[0], entry->energyPos[1], 65, c);
- drawString("block05.fgx", Common::String::format("SCORE %04d", s), entry->scorePos[0], entry->scorePos[1], 72, c);
+ Common::Point ep(entry->energyPos[0], entry->energyPos[1]);
+ Common::Point sp(entry->scorePos[0], entry->scorePos[1]);
+ Common::Point op(entry->objectivesPos[0], entry->objectivesPos[1]);
+
+ if (_arcadeMode == "Y1") {
+ Common::Rect r;
+ r = Common::Rect(ep.x - 2, ep.y - 2, ep.x + 69, sp.y + 9);
+ _compositeSurface->frameRect(r, kHypnoColorGreen);
+
+ r = Common::Rect(sp.x - 2, sp.y - 2, sp.x + 74, sp.y + 8);
+ _compositeSurface->frameRect(r, kHypnoColorGreen);
+
+ // TODO: not rendering correctly
+ //r = Common::Rect(op.x - 2, op.y - 2, op.x + 75, op.y + 9);
+ //_compositeSurface->frameRect(r, kHypnoColorGreen);
+ }
+
+ drawString("block05.fgx", Common::String::format("ENERGY %d%%", p), ep.x, ep.y, 65, c);
+ drawString("block05.fgx", Common::String::format("SCORE %04d", s), sp.x, sp.y, 72, c);
// Objectives are always in the zero in the demo
- if (entry->objectivesPos[0] > 0 && entry->objectivesPos[1] > 0)
- drawString("block05.fgx", Common::String::format("M.O. %d/%d", mo, mm), entry->objectivesPos[0], entry->objectivesPos[1], 60, c);
+ if (op.x > 0 && op.y > 0)
+ drawString("block05.fgx", Common::String::format("M.O. %d/%d", mo, mm), op.x, op.y, 60, c);
}
}
@@ -775,9 +791,15 @@ void WetEngine::drawAmmo() {
if (d >= 13)
return;
Common::Point p(entry->ammoPos[0], entry->ammoPos[1]);
- Common::Rect r = Common::Rect(p.x, p.y + d, p.x + 15, p.y + 13);
- uint32 c = kHypnoColorWhiteOrBlue; // blue
- _compositeSurface->fillRect(r, c);
+ Common::Rect r;
+ if (_arcadeMode == "Y1") {
+ r = Common::Rect(p.x - 1, p.y - 1, p.x + 16, p.y + 14);
+ _compositeSurface->frameRect(r, kHypnoColorGreen);
+ }
+
+ r = Common::Rect(p.x, p.y + d, p.x + 15, p.y + 13);
+ _compositeSurface->fillRect(r, kHypnoColorWhiteOrBlue); // blue
+
}
Commit: aabdfcdb417846a78d6694328e8d7f1d6da1ebfb
https://github.com/scummvm/scummvm/commit/aabdfcdb417846a78d6694328e8d7f1d6da1ebfb
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-04-23T12:34:24+02:00
Commit Message:
HYPNO: mouse box adjustments for level c20 in wet
Changed paths:
engines/hypno/wet/wet.cpp
diff --git a/engines/hypno/wet/wet.cpp b/engines/hypno/wet/wet.cpp
index 5c010daf0a9..657cf4c2c00 100644
--- a/engines/hypno/wet/wet.cpp
+++ b/engines/hypno/wet/wet.cpp
@@ -278,6 +278,7 @@ void WetEngine::loadAssetsFullGame() {
Code *end_credits = new Code("<credits>");
_levels["<credits>"] = end_credits;
+ ArcadeShooting *arc;
loadArcadeLevel("c110.mi_", "c10", "<check_lives>", "");
loadArcadeLevel("c111.mi_", "c10", "<check_lives>", "");
loadArcadeLevel("c112.mi_", "c10", "<check_lives>", "");
@@ -302,6 +303,18 @@ void WetEngine::loadAssetsFullGame() {
loadArcadeLevel("c201.mi_", "c31", "<check_lives>", "");
loadArcadeLevel("c202.mi_", "c31", "<check_lives>", "");
+ arc = (ArcadeShooting*) _levels["c200.mi_"];
+ arc->mouseBox.right = 320;
+ arc->mouseBox.bottom = 135;
+
+ arc = (ArcadeShooting*) _levels["c201.mi_"];
+ arc->mouseBox.right = 320;
+ arc->mouseBox.bottom = 135;
+
+ arc = (ArcadeShooting*) _levels["c202.mi_"];
+ arc->mouseBox.right = 320;
+ arc->mouseBox.bottom = 135;
+
loadArcadeLevel("c310.mi_", "c32", "<check_lives>", "");
loadArcadeLevel("c311.mi_", "c32", "<check_lives>", "");
loadArcadeLevel("c312.mi_", "c32", "<check_lives>", "");
@@ -315,7 +328,7 @@ void WetEngine::loadAssetsFullGame() {
loadArcadeLevel("c332.mi_", "c30", "<check_lives>", "");
loadArcadeLevel("c300.mi_", "c41", "<check_lives>", "");
- ArcadeShooting *arc = (ArcadeShooting*) _levels["c300.mi_"];
+ arc = (ArcadeShooting*) _levels["c300.mi_"];
arc->id = 30; // Fixed from the original (3)
loadArcadeLevel("c301.mi_", "c41", "<check_lives>", "");
Commit: b1297640c1efdfdd3ce24a841e48d60ac8b71412
https://github.com/scummvm/scummvm/commit/b1297640c1efdfdd3ce24a841e48d60ac8b71412
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-04-23T12:34:24+02:00
Commit Message:
HYPNO: ui fixes for level c33 in wet
Changed paths:
engines/hypno/wet/wet.cpp
diff --git a/engines/hypno/wet/wet.cpp b/engines/hypno/wet/wet.cpp
index 657cf4c2c00..ff41dcad509 100644
--- a/engines/hypno/wet/wet.cpp
+++ b/engines/hypno/wet/wet.cpp
@@ -36,7 +36,7 @@ static const chapterEntry rawChapterTable[] = {
{20, {128, 150}, {238, 150},{0, 0}, {0, 0}, kHypnoColorCyan}, // c20
{31, {70, 160}, {180, 160}, {220, 185}, {44, 164}, kHypnoColorGreen}, // c31
{32, {70, 160}, {180, 160}, {220, 185}, {44, 164}, kHypnoColorRed}, // c32
- {33, {70, 160}, {180, 160}, {220, 185}, {44, 164}, kHypnoColorRed}, // c33
+ {33, {70, 160}, {180, 160}, {220, 185}, {44, 162}, kHypnoColorRed}, // c33
{30, {19, 3}, {246, 3}, {246, 11}, {0, 0}, kHypnoColorRed}, // c30
{41, {70, 160}, {180, 160}, {220, 185}, {0, 0}, kHypnoColorRed}, // c41
{42, {70, 160}, {180, 160}, {220, 185}, {0, 0}, kHypnoColorRed}, // c42
Commit: 644c5d6d3184d1ba7b4bb9532511d4eae637be2f
https://github.com/scummvm/scummvm/commit/644c5d6d3184d1ba7b4bb9532511d4eae637be2f
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-04-23T12:34:24+02:00
Commit Message:
HYPNO: completed ui for level c30 in wet
Changed paths:
engines/hypno/wet/arcade.cpp
engines/hypno/wet/wet.cpp
diff --git a/engines/hypno/wet/arcade.cpp b/engines/hypno/wet/arcade.cpp
index 31044ddc755..8b682099eac 100644
--- a/engines/hypno/wet/arcade.cpp
+++ b/engines/hypno/wet/arcade.cpp
@@ -758,7 +758,7 @@ void WetEngine::drawHealth() {
Common::Point sp(entry->scorePos[0], entry->scorePos[1]);
Common::Point op(entry->objectivesPos[0], entry->objectivesPos[1]);
- if (_arcadeMode == "Y1") {
+ if (_arcadeMode == "Y1" || _arcadeMode == "Y3") {
Common::Rect r;
r = Common::Rect(ep.x - 2, ep.y - 2, ep.x + 69, sp.y + 9);
_compositeSurface->frameRect(r, kHypnoColorGreen);
@@ -792,7 +792,7 @@ void WetEngine::drawAmmo() {
return;
Common::Point p(entry->ammoPos[0], entry->ammoPos[1]);
Common::Rect r;
- if (_arcadeMode == "Y1") {
+ if (_arcadeMode == "Y1" || _arcadeMode == "Y3") {
r = Common::Rect(p.x - 1, p.y - 1, p.x + 16, p.y + 14);
_compositeSurface->frameRect(r, kHypnoColorGreen);
}
diff --git a/engines/hypno/wet/wet.cpp b/engines/hypno/wet/wet.cpp
index ff41dcad509..44a76d95557 100644
--- a/engines/hypno/wet/wet.cpp
+++ b/engines/hypno/wet/wet.cpp
@@ -37,7 +37,7 @@ static const chapterEntry rawChapterTable[] = {
{31, {70, 160}, {180, 160}, {220, 185}, {44, 164}, kHypnoColorGreen}, // c31
{32, {70, 160}, {180, 160}, {220, 185}, {44, 164}, kHypnoColorRed}, // c32
{33, {70, 160}, {180, 160}, {220, 185}, {44, 162}, kHypnoColorRed}, // c33
- {30, {19, 3}, {246, 3}, {246, 11}, {0, 0}, kHypnoColorRed}, // c30
+ {30, {19, 3}, {246, 3}, {246, 11}, {2, 2}, kHypnoColorRed}, // c30
{41, {70, 160}, {180, 160}, {220, 185}, {0, 0}, kHypnoColorRed}, // c41
{42, {70, 160}, {180, 160}, {220, 185}, {0, 0}, kHypnoColorRed}, // c42
{43, {70, 160}, {180, 160}, {220, 185}, {0, 0}, kHypnoColorRed}, // c43
Commit: 17357297ec2ccfa0362802ec3fcf6a7d58ba0147
https://github.com/scummvm/scummvm/commit/17357297ec2ccfa0362802ec3fcf6a7d58ba0147
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-04-23T12:34:24+02:00
Commit Message:
HYPNO: improved ui for levels c4x in wet
Changed paths:
engines/hypno/wet/arcade.cpp
engines/hypno/wet/wet.cpp
diff --git a/engines/hypno/wet/arcade.cpp b/engines/hypno/wet/arcade.cpp
index 8b682099eac..cd1dd2a5049 100644
--- a/engines/hypno/wet/arcade.cpp
+++ b/engines/hypno/wet/arcade.cpp
@@ -758,7 +758,7 @@ void WetEngine::drawHealth() {
Common::Point sp(entry->scorePos[0], entry->scorePos[1]);
Common::Point op(entry->objectivesPos[0], entry->objectivesPos[1]);
- if (_arcadeMode == "Y1" || _arcadeMode == "Y3") {
+ if (_arcadeMode == "Y1" || _arcadeMode == "Y3" || _arcadeMode == "Y4") {
Common::Rect r;
r = Common::Rect(ep.x - 2, ep.y - 2, ep.x + 69, sp.y + 9);
_compositeSurface->frameRect(r, kHypnoColorGreen);
@@ -792,7 +792,7 @@ void WetEngine::drawAmmo() {
return;
Common::Point p(entry->ammoPos[0], entry->ammoPos[1]);
Common::Rect r;
- if (_arcadeMode == "Y1" || _arcadeMode == "Y3") {
+ if (_arcadeMode == "Y1" || _arcadeMode == "Y3" || _arcadeMode == "Y4") {
r = Common::Rect(p.x - 1, p.y - 1, p.x + 16, p.y + 14);
_compositeSurface->frameRect(r, kHypnoColorGreen);
}
diff --git a/engines/hypno/wet/wet.cpp b/engines/hypno/wet/wet.cpp
index 44a76d95557..669fc520c5b 100644
--- a/engines/hypno/wet/wet.cpp
+++ b/engines/hypno/wet/wet.cpp
@@ -38,11 +38,11 @@ static const chapterEntry rawChapterTable[] = {
{32, {70, 160}, {180, 160}, {220, 185}, {44, 164}, kHypnoColorRed}, // c32
{33, {70, 160}, {180, 160}, {220, 185}, {44, 162}, kHypnoColorRed}, // c33
{30, {19, 3}, {246, 3}, {246, 11}, {2, 2}, kHypnoColorRed}, // c30
- {41, {70, 160}, {180, 160}, {220, 185}, {0, 0}, kHypnoColorRed}, // c41
- {42, {70, 160}, {180, 160}, {220, 185}, {0, 0}, kHypnoColorRed}, // c42
- {43, {70, 160}, {180, 160}, {220, 185}, {0, 0}, kHypnoColorRed}, // c43
- {44, {70, 160}, {180, 160}, {220, 185}, {0, 0}, kHypnoColorRed}, // c44
- {40, {19, 3}, {246, 3}, {246, 11}, {0, 0}, kHypnoColorRed}, // c40
+ {41, {70, 160}, {180, 160}, {220, 185}, {44, 162}, kHypnoColorRed}, // c41
+ {42, {70, 160}, {180, 160}, {220, 185}, {44, 162}, kHypnoColorRed}, // c42
+ {43, {70, 160}, {180, 160}, {220, 185}, {44, 162}, kHypnoColorRed}, // c43
+ {44, {70, 160}, {180, 160}, {220, 185}, {44, 162}, kHypnoColorRed}, // c44
+ {40, {19, 3}, {246, 3}, {246, 11}, {2, 2}, kHypnoColorRed}, // c40
{51, {60, 167}, {190, 167}, {135, 187}, {0, 0}, kHypnoColorRed}, // c51
{52, {60, 167}, {190, 167}, {135, 187}, {0, 0}, kHypnoColorRed}, // c52
{50, {19, 3}, {246, 3}, {246, 11}, {0, 0}, kHypnoColorRed}, // c50 (fixed)
Commit: 7122e42ab2c3c0fae09f08d47103bdb59049d2a1
https://github.com/scummvm/scummvm/commit/7122e42ab2c3c0fae09f08d47103bdb59049d2a1
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-04-23T12:34:24+02:00
Commit Message:
HYPNO: improved ui for levels c5x in wet
Changed paths:
engines/hypno/wet/arcade.cpp
engines/hypno/wet/wet.cpp
diff --git a/engines/hypno/wet/arcade.cpp b/engines/hypno/wet/arcade.cpp
index cd1dd2a5049..6a701a19d97 100644
--- a/engines/hypno/wet/arcade.cpp
+++ b/engines/hypno/wet/arcade.cpp
@@ -758,7 +758,7 @@ void WetEngine::drawHealth() {
Common::Point sp(entry->scorePos[0], entry->scorePos[1]);
Common::Point op(entry->objectivesPos[0], entry->objectivesPos[1]);
- if (_arcadeMode == "Y1" || _arcadeMode == "Y3" || _arcadeMode == "Y4") {
+ if (_arcadeMode == "Y1" || _arcadeMode == "Y3" || _arcadeMode == "Y4" || _arcadeMode == "Y5") {
Common::Rect r;
r = Common::Rect(ep.x - 2, ep.y - 2, ep.x + 69, sp.y + 9);
_compositeSurface->frameRect(r, kHypnoColorGreen);
@@ -792,14 +792,18 @@ void WetEngine::drawAmmo() {
return;
Common::Point p(entry->ammoPos[0], entry->ammoPos[1]);
Common::Rect r;
- if (_arcadeMode == "Y1" || _arcadeMode == "Y3" || _arcadeMode == "Y4") {
+ if (_arcadeMode == "Y1" || _arcadeMode == "Y3" || _arcadeMode == "Y4" || _arcadeMode == "Y5") {
r = Common::Rect(p.x - 1, p.y - 1, p.x + 16, p.y + 14);
_compositeSurface->frameRect(r, kHypnoColorGreen);
}
- r = Common::Rect(p.x, p.y + d, p.x + 15, p.y + 13);
- _compositeSurface->fillRect(r, kHypnoColorWhiteOrBlue); // blue
-
+ if (_levelId / 10 == 5 && _arcadeMode != "Y5") {
+ r = Common::Rect(p.x, p.y + d, p.x + 13, p.y + 13);
+ _compositeSurface->fillRect(r, kHypnoColorWhiteOrBlue); // blue
+ } else {
+ r = Common::Rect(p.x, p.y + d, p.x + 15, p.y + 13);
+ _compositeSurface->fillRect(r, kHypnoColorWhiteOrBlue); // blue
+ }
}
diff --git a/engines/hypno/wet/wet.cpp b/engines/hypno/wet/wet.cpp
index 669fc520c5b..186e8a39739 100644
--- a/engines/hypno/wet/wet.cpp
+++ b/engines/hypno/wet/wet.cpp
@@ -43,9 +43,9 @@ static const chapterEntry rawChapterTable[] = {
{43, {70, 160}, {180, 160}, {220, 185}, {44, 162}, kHypnoColorRed}, // c43
{44, {70, 160}, {180, 160}, {220, 185}, {44, 162}, kHypnoColorRed}, // c44
{40, {19, 3}, {246, 3}, {246, 11}, {2, 2}, kHypnoColorRed}, // c40
- {51, {60, 167}, {190, 167}, {135, 187}, {0, 0}, kHypnoColorRed}, // c51
- {52, {60, 167}, {190, 167}, {135, 187}, {0, 0}, kHypnoColorRed}, // c52
- {50, {19, 3}, {246, 3}, {246, 11}, {0, 0}, kHypnoColorRed}, // c50 (fixed)
+ {51, {60, 167}, {190, 167}, {135, 187}, {136, 163}, kHypnoColorRed}, // c51
+ {52, {60, 167}, {190, 167}, {135, 187}, {136, 163}, kHypnoColorRed}, // c52
+ {50, {19, 3}, {246, 3}, {246, 11}, {2, 2}, kHypnoColorRed}, // c50 (fixed)
{61, {63, 167}, {187, 167}, {192, 188}, {152, 185}, kHypnoColorRed}, // c61
{60, {63, 167}, {187, 167}, {192, 188}, {152, 185}, kHypnoColorRed}, // c60
{0, {0, 0}, {0, 0}, {0, 0}, {0, 0}, kHypnoColorRed} // NULL
More information about the Scummvm-git-logs
mailing list