[Scummvm-git-logs] scummvm master -> d0b5a35785a01bca5d9ba0bd3bb284cb6ea72ff4
neuromancer
noreply at scummvm.org
Thu Jun 9 11:00:42 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:
b9759b054c HYPNO: implement start new mission button in boyz
b7ef272277 HYPNO: show minefield map during level c42 in boyz
033a12e578 HYPNO: use state variables to track down info collected in boyz
d0b5a35785 HYPNO: only show minemap if GS_MINEMAP is enabled in boyz
Commit: b9759b054cb69a104c7ebd57bd6c4d0f857569e7
https://github.com/scummvm/scummvm/commit/b9759b054cb69a104c7ebd57bd6c4d0f857569e7
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-06-09T13:01:12+02:00
Commit Message:
HYPNO: implement start new mission button in boyz
Changed paths:
engines/hypno/boyz/hard.cpp
diff --git a/engines/hypno/boyz/hard.cpp b/engines/hypno/boyz/hard.cpp
index ad3278505f0..fe33ab80781 100644
--- a/engines/hypno/boyz/hard.cpp
+++ b/engines/hypno/boyz/hard.cpp
@@ -211,6 +211,7 @@ void BoyzEngine::runRetryMenu(Code *code) {
Common::Rect retryMissionBox(73, 62, 245, 77);
Common::Rect restartTerritoryBox(73, 81, 245, 96);
+ Common::Rect restartMissionBox(73, 100, 245, 114);
Common::Rect quitBox(73, 119, 245, 133);
Common::Event event;
@@ -240,6 +241,9 @@ void BoyzEngine::runRetryMenu(Code *code) {
_health = _maxHealth;
_nextLevel = firstLevelTerritory(_checkpoint);
cont = false;
+ } else if (restartMissionBox.contains(mousePos)) {
+ _nextLevel = "<main_menu>";
+ cont = false;
} else if (quitBox.contains(mousePos))
quitGame();
break;
@@ -248,6 +252,9 @@ void BoyzEngine::runRetryMenu(Code *code) {
if (event.kbd.keycode == Common::KEYCODE_s) {
_nextLevel = _checkpoint;
cont = false;
+ } else if (event.kbd.keycode == Common::KEYCODE_n) {
+ _nextLevel = "<main_menu>";
+ cont = false;
} else if (event.kbd.keycode == Common::KEYCODE_t) {
// Restore initial health for the team
_health = _maxHealth;
Commit: b7ef2722772d24b5c16cec30936e2456fe5de445
https://github.com/scummvm/scummvm/commit/b7ef2722772d24b5c16cec30936e2456fe5de445
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-06-09T13:01:12+02:00
Commit Message:
HYPNO: show minefield map during level c42 in boyz
Changed paths:
engines/hypno/boyz/arcade.cpp
diff --git a/engines/hypno/boyz/arcade.cpp b/engines/hypno/boyz/arcade.cpp
index 20eb1123f63..f4621756dfa 100644
--- a/engines/hypno/boyz/arcade.cpp
+++ b/engines/hypno/boyz/arcade.cpp
@@ -331,6 +331,10 @@ int BoyzEngine::detectTarget(const Common::Point &mousePos) {
char BoyzEngine::selectDirection() {
Common::Event event;
Common::Rect button(252, 158, 315, 195);
+ Graphics::Surface *screen = _compositeSurface->convertTo(_compositeSurface->format, _background->decoder->getPalette());
+ Frames mapFrames = decodeFrames("c4/minemap.smk");
+ drawImage(*mapFrames[0], 0, 0, true);
+ bool viewingMap = false;
while (!shouldQuit()) {
while (g_system->getEventManager()->pollEvent(event)) {
Common::Point mousePos = g_system->getEventManager()->getMousePos();
@@ -338,20 +342,26 @@ char BoyzEngine::selectDirection() {
case Common::EVENT_MOUSEMOVE:
if (button.contains(mousePos))
defaultCursor();
- else if (mousePos.x <= _screenW / 3)
+ else if (!viewingMap && mousePos.x <= _screenW / 3)
changeCursor(_leftArrowPointer, _crosshairsPalette, true);
- else if (mousePos.x >= 2 * _screenW / 3)
+ else if (!viewingMap && mousePos.x >= 2 * _screenW / 3)
changeCursor(_rightArrowPointer, _crosshairsPalette, true);
- else
+ else if (!viewingMap)
changeCursor(_crossPointer, _crosshairsPalette, true);
break;
case Common::EVENT_LBUTTONDOWN:
if (button.contains(mousePos)) {
- // TODO: show map, if available
- } else if (mousePos.x <= _screenH / 2) {
+ if (viewingMap) {
+ drawImage(*screen, 0, 0, false);
+ drawImage(*mapFrames[0], 0, 0, true);
+ } else {
+ drawImage(*mapFrames[1], 0, 0, true);
+ }
+ viewingMap = !viewingMap;
+ } else if (!viewingMap && mousePos.x <= _screenH / 2) {
return 'L';
- } else
+ } else if (!viewingMap)
return 'R';
break;
Commit: 033a12e578d2b7043d8305bcb20b7945c03fb1c8
https://github.com/scummvm/scummvm/commit/033a12e578d2b7043d8305bcb20b7945c03fb1c8
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-06-09T13:01:12+02:00
Commit Message:
HYPNO: use state variables to track down info collected in boyz
Changed paths:
engines/hypno/boyz/arcade.cpp
diff --git a/engines/hypno/boyz/arcade.cpp b/engines/hypno/boyz/arcade.cpp
index f4621756dfa..f8f971bbc03 100644
--- a/engines/hypno/boyz/arcade.cpp
+++ b/engines/hypno/boyz/arcade.cpp
@@ -489,6 +489,11 @@ bool BoyzEngine::shoot(const Common::Point &mousePos, ArcadeShooting *arc, bool
if (_shoots[i].waitForClickAfterInteraction > 0) {
waitForUserClick(_shoots[i].waitForClickAfterInteraction);
+ if (_shoots[i].name == "LILKID")
+ _sceneState["GS_MINEMAP"] = true;
+ else if (_shoots[i].name == "HO3") {
+ _sceneState["GS_C5MAP"] = true;
+ }
}
loadPalette(_currentPalette);
Commit: d0b5a35785a01bca5d9ba0bd3bb284cb6ea72ff4
https://github.com/scummvm/scummvm/commit/d0b5a35785a01bca5d9ba0bd3bb284cb6ea72ff4
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-06-09T13:01:12+02:00
Commit Message:
HYPNO: only show minemap if GS_MINEMAP is enabled in boyz
Changed paths:
engines/hypno/boyz/arcade.cpp
diff --git a/engines/hypno/boyz/arcade.cpp b/engines/hypno/boyz/arcade.cpp
index f8f971bbc03..bf4b34468d4 100644
--- a/engines/hypno/boyz/arcade.cpp
+++ b/engines/hypno/boyz/arcade.cpp
@@ -333,14 +333,17 @@ char BoyzEngine::selectDirection() {
Common::Rect button(252, 158, 315, 195);
Graphics::Surface *screen = _compositeSurface->convertTo(_compositeSurface->format, _background->decoder->getPalette());
Frames mapFrames = decodeFrames("c4/minemap.smk");
- drawImage(*mapFrames[0], 0, 0, true);
+ bool showMap = _sceneState["GS_MINEMAP"];
bool viewingMap = false;
+ if (showMap)
+ drawImage(*mapFrames[0], 0, 0, true);
+
while (!shouldQuit()) {
while (g_system->getEventManager()->pollEvent(event)) {
Common::Point mousePos = g_system->getEventManager()->getMousePos();
switch (event.type) {
case Common::EVENT_MOUSEMOVE:
- if (button.contains(mousePos))
+ if (showMap && button.contains(mousePos))
defaultCursor();
else if (!viewingMap && mousePos.x <= _screenW / 3)
changeCursor(_leftArrowPointer, _crosshairsPalette, true);
@@ -351,7 +354,7 @@ char BoyzEngine::selectDirection() {
break;
case Common::EVENT_LBUTTONDOWN:
- if (button.contains(mousePos)) {
+ if (showMap && button.contains(mousePos)) {
if (viewingMap) {
drawImage(*screen, 0, 0, false);
drawImage(*mapFrames[0], 0, 0, true);
More information about the Scummvm-git-logs
mailing list