[Scummvm-git-logs] scummvm master -> e36c9c6084d42b41346757c0e5bb6048f5d1e525
bluegr
noreply at scummvm.org
Sun Nov 10 22:22:43 UTC 2024
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
cb0e71df0b CHEWY: Renaming and get rid of a superfluous flag
3eef09363b CHEWY: Fix movement of Chewy's boat after the chief's boat is sunk
e36c9c6084 NEWS: Mention Chewy fixes
Commit: cb0e71df0bd408e617ed6515371ceff056f2dba5
https://github.com/scummvm/scummvm/commit/cb0e71df0bd408e617ed6515371ceff056f2dba5
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-11-11T00:15:56+02:00
Commit Message:
CHEWY: Renaming and get rid of a superfluous flag
Changed paths:
engines/chewy/rooms/room77.cpp
engines/chewy/rooms/room77.h
engines/chewy/rooms/room78.cpp
engines/chewy/t_event.cpp
diff --git a/engines/chewy/rooms/room77.cpp b/engines/chewy/rooms/room77.cpp
index acd4047a137..4c17d5122f6 100644
--- a/engines/chewy/rooms/room77.cpp
+++ b/engines/chewy/rooms/room77.cpp
@@ -66,7 +66,7 @@ void Room77::xit() {
_G(gameState).ScrollxStep = 1;
}
-int Room77::proc1() {
+int Room77::procOpenBoatHoleWithCorkscrew() {
if (_G(gameState).flags29_4 || !isCurInventory(103))
return 0;
@@ -95,7 +95,7 @@ int Room77::proc1() {
return 1;
}
-int Room77::proc2() {
+int Room77::procPlugBoatHoleWithRubber() {
if (_G(gameState).flags29_4 || !isCurInventory(100))
return 0;
diff --git a/engines/chewy/rooms/room77.h b/engines/chewy/rooms/room77.h
index d82ff1fdfbc..162815e2d4b 100644
--- a/engines/chewy/rooms/room77.h
+++ b/engines/chewy/rooms/room77.h
@@ -29,8 +29,8 @@ class Room77 {
public:
static void entry();
static void xit();
- static int proc1();
- static int proc2();
+ static int procOpenBoatHoleWithCorkscrew();
+ static int procPlugBoatHoleWithRubber();
};
} // namespace Rooms
diff --git a/engines/chewy/rooms/room78.cpp b/engines/chewy/rooms/room78.cpp
index 3b6b68819e0..bb766c99cfb 100644
--- a/engines/chewy/rooms/room78.cpp
+++ b/engines/chewy/rooms/room78.cpp
@@ -61,59 +61,61 @@ void Room78::entry() {
flic_cut(FCUT_101);
destRoom = 79;
} else {
+ // Boat race - Chewy vs Chief
_G(det)->startDetail(0, 255, false);
_G(det)->startDetail(4, 255, false);
- int det0DestX = 608;
- int det4DestX = 570;
- bool exitLoopFlag = false;
- bool flag1 = false;
- bool flag2 = false;
+ int chewysBoatX = 608;
+ int chiefsBoatX = 570;
+ bool chewysBoatFinished = false;
+ bool chiefsBoatFinished = false;
- while (exitLoopFlag == 0) {
- _G(det)->setDetailPos(0, det0DestX, 93);
- _G(det)->setDetailPos(4, det4DestX, 57);
+ while (!(chewysBoatFinished && chiefsBoatFinished)) {
+ _G(det)->setDetailPos(0, chewysBoatX, 93);
+ _G(det)->setDetailPos(4, chiefsBoatX, 57);
if (delay)
--delay;
else {
- det0DestX -= 4;
- if (det0DestX <= 276 && flag1 == 0) {
+ chewysBoatX -= 4;
+ if (chewysBoatX <= 276 && !chewysBoatFinished) {
if (_G(gameState).flags29_20) {
- if (det0DestX > 0)
- flag1 = true;
+ // Chewy's boat has a plugged hole
+ if (chewysBoatX > 0)
+ chewysBoatFinished = true;
} else {
- flag1 = true;
+ // Chewy's boat has a hole
+ chewysBoatFinished = true;
_G(det)->stopDetail(0);
_G(det)->startDetail(1, 1, false);
}
}
- det4DestX -= 4;
+ chiefsBoatX -= 4;
- if (det4DestX <= 222 && flag2 == 0) {
+ if (chiefsBoatX <= 222 && !chiefsBoatFinished) {
if (_G(gameState).flags29_10) {
- flag2 = true;
+ // Chief's boat has a hole
+ chiefsBoatFinished = true;
_G(det)->stopDetail(4);
- if (flag1 == 0) {
+ if (!chewysBoatFinished) {
_G(det)->startDetail(5, 1, false);
} else {
startSetAILWait(5, 1, ANI_FRONT);
}
} else {
- if (det4DestX <= 0)
- flag2 = true;
+ // Chief's boat has no hole
+ if (chiefsBoatX <= 0)
+ chiefsBoatFinished = true;
}
}
delay = _G(gameState).DelaySpeed / 3;
}
- if (flag1 && flag2)
- exitLoopFlag = true;
-
setupScreen(DO_SETUP);
}
+ // Race over. Check for plugged hole and opened hole flags
if (_G(gameState).flags29_10 && _G(gameState).flags29_20) {
_G(gameState).r76State = 1;
destRoom = 77;
diff --git a/engines/chewy/t_event.cpp b/engines/chewy/t_event.cpp
index 224364e5694..4d3e6acaec4 100644
--- a/engines/chewy/t_event.cpp
+++ b/engines/chewy/t_event.cpp
@@ -635,11 +635,11 @@ int16 atsAction(int16 txtNr, int16 txtMode, int16 mode) {
break;
case 463:
- retValue = Room77::proc1();
+ retValue = Room77::procOpenBoatHoleWithCorkscrew();
break;
case 464:
- retValue = Room77::proc2();
+ retValue = Room77::procPlugBoatHoleWithRubber();
break;
case 467:
Commit: 3eef09363bb0a9d2480f54cbca463b8ea32e5625
https://github.com/scummvm/scummvm/commit/3eef09363bb0a9d2480f54cbca463b8ea32e5625
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-11-11T00:15:57+02:00
Commit Message:
CHEWY: Fix movement of Chewy's boat after the chief's boat is sunk
Fixes bug #13696
Changed paths:
engines/chewy/rooms/room78.cpp
diff --git a/engines/chewy/rooms/room78.cpp b/engines/chewy/rooms/room78.cpp
index bb766c99cfb..d1fbc8b825f 100644
--- a/engines/chewy/rooms/room78.cpp
+++ b/engines/chewy/rooms/room78.cpp
@@ -77,7 +77,7 @@ void Room78::entry() {
--delay;
else {
chewysBoatX -= 4;
- if (chewysBoatX <= 276 && !chewysBoatFinished) {
+ if (chewysBoatX <= 76 && !chewysBoatFinished) {
if (_G(gameState).flags29_20) {
// Chewy's boat has a plugged hole
if (chewysBoatX > 0)
Commit: e36c9c6084d42b41346757c0e5bb6048f5d1e525
https://github.com/scummvm/scummvm/commit/e36c9c6084d42b41346757c0e5bb6048f5d1e525
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-11-11T00:21:47+02:00
Commit Message:
NEWS: Mention Chewy fixes
Changed paths:
NEWS.md
diff --git a/NEWS.md b/NEWS.md
index 034b5b83f90..f5901794d5c 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -58,6 +58,14 @@ For a more comprehensive changelog of the latest experimental code, see:
- The "Designers cut" setting can be set in advance and persist for a new game.
- Improved, reliable application of custom random seeds.
+ Chewy:
+ - Fixed cyber crown state before Surimy attack.
+ - Fixed changing hotspot subtexts.
+ - Fixed keyboard handling in the inventory screen.
+ - Fixed unlocked cutscenes in cinema screen.
+ - Fixed music in harbor during the second visit.
+ - Fixed movement of Chewy's boat during the boat race.
+
Cine:
- Added keymapper support.
More information about the Scummvm-git-logs
mailing list