[Scummvm-git-logs] scummvm master -> 9d589e2e8e7bce5cf2494d1ee74a235588980dd1
dreammaster
noreply at scummvm.org
Sat Feb 24 04:56:15 UTC 2024
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:
a92d98d6f2 M4: ORIONBURGER: Keep Magnet vibrating when revisiting 602
a9e9ee50a8 M4: ORIONBURGER: Fix door open misaligned in room 602
34493ca7ec M4: ORIONBURGER: Fix shooting the door in room 602
636f688e1d M4: ORIONBURGER: Fix softlock when shooting the kibble in Room 602
929e755078 M4: ORIONBURGER: Fix shooting the waterdish in room 603
94a80f4a35 M4: ORIONBURGER: Fix chute navigation for test 2
9d589e2e8e M4: ORIONBURGER: DEMO: Cliking on teleporter icon leads to main menu
Commit: a92d98d6f2493a0b73b660af2359feb1e9be99df
https://github.com/scummvm/scummvm/commit/a92d98d6f2493a0b73b660af2359feb1e9be99df
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2024-02-23T20:43:02-08:00
Commit Message:
M4: ORIONBURGER: Keep Magnet vibrating when revisiting 602
If the wheel motor is running with the alien hand, then revisiting the 602 room should also show the magnet vibating
This could be an "original" bug / missed detail, since the magnet is not vibrating in this case in the demo.
Changed paths:
engines/m4/burger/rooms/section6/room602.cpp
diff --git a/engines/m4/burger/rooms/section6/room602.cpp b/engines/m4/burger/rooms/section6/room602.cpp
index 5ece86d3809..b17a1873088 100644
--- a/engines/m4/burger/rooms/section6/room602.cpp
+++ b/engines/m4/burger/rooms/section6/room602.cpp
@@ -327,7 +327,7 @@ void Room602::init() {
if (_G(flags)[V277] == 6003 && _G(flags)[V278] == 1) {
_mouseWheel = series_play("612wheel", 0x5ff, 0, -1, 0, -1);
-
+ _series10 = series_play("612magnt", 0x600, 1, -1, 1, -1);
} else if (_G(game).room_id == 602) {
_mouseWheel = series_show("602wheel", 0x6ff, 0, -1, -1, 0);
Commit: a9e9ee50a8df7725b1e30791a8c38fe83aadea5b
https://github.com/scummvm/scummvm/commit/a9e9ee50a8df7725b1e30791a8c38fe83aadea5b
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2024-02-23T20:45:51-08:00
Commit Message:
M4: ORIONBURGER: Fix door open misaligned in room 602
After the cage door opens with the alien hand controlled motor, revisiting the room 602 would show the door misaligned to the left.
Revisiting as in leave the room from the chute (go up one floor) and then return to the bottom floor.
Changed paths:
engines/m4/burger/rooms/section6/room602.cpp
diff --git a/engines/m4/burger/rooms/section6/room602.cpp b/engines/m4/burger/rooms/section6/room602.cpp
index b17a1873088..77ff34f62cc 100644
--- a/engines/m4/burger/rooms/section6/room602.cpp
+++ b/engines/m4/burger/rooms/section6/room602.cpp
@@ -336,7 +336,7 @@ void Room602::init() {
}
_series3 = series_show("602door", 0xf00, 1, -1, -1, 0, 100,
- _G(flags)[V257] / 21, _G(flags)[V257]);
+ -_G(flags)[V257] / 21, _G(flags)[V257]);
if (_G(flags)[kGerbilCageDoor] == 1) {
_doorShould = 63;
Commit: 34493ca7ec347c730977b36c40b654f9992d9d43
https://github.com/scummvm/scummvm/commit/34493ca7ec347c730977b36c40b654f9992d9d43
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2024-02-23T20:46:49-08:00
Commit Message:
M4: ORIONBURGER: Fix shooting the door in room 602
This was resulting in segmentation fault (or animation repeating loop)
Changed paths:
engines/m4/burger/rooms/section6/room602.cpp
diff --git a/engines/m4/burger/rooms/section6/room602.cpp b/engines/m4/burger/rooms/section6/room602.cpp
index 77ff34f62cc..e48a76f9df3 100644
--- a/engines/m4/burger/rooms/section6/room602.cpp
+++ b/engines/m4/burger/rooms/section6/room602.cpp
@@ -130,6 +130,7 @@ const seriesPlayBreak Room602::PLAY6[] = {
const seriesPlayBreak Room602::PLAY7[] = {
{ 0, 17, nullptr, 1, 0, -1, 2048, 0, nullptr, 0 },
{ 18, -1, "602_010", 2, 255, -1, 0, 0, nullptr, 0 },
+ PLAY_BREAK_END
};
const seriesPlayBreak Room602::PLAY8[] = {
Commit: 636f688e1d566125e7e829dad4ac6110d27d53fe
https://github.com/scummvm/scummvm/commit/636f688e1d566125e7e829dad4ac6110d27d53fe
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2024-02-23T20:49:11-08:00
Commit Message:
M4: ORIONBURGER: Fix softlock when shooting the kibble in Room 602
Changed paths:
engines/m4/burger/rooms/section6/room602.cpp
diff --git a/engines/m4/burger/rooms/section6/room602.cpp b/engines/m4/burger/rooms/section6/room602.cpp
index e48a76f9df3..1b13ee8f241 100644
--- a/engines/m4/burger/rooms/section6/room602.cpp
+++ b/engines/m4/burger/rooms/section6/room602.cpp
@@ -1131,7 +1131,7 @@ void Room602::daemon() {
break;
case 31:
- player_set_commands_allowed(false);
+ player_set_commands_allowed(true);
ws_unhide_walker();
_G(wilbur_should) = 10002;
wilbur_speech("602w044");
Commit: 929e755078c6f3993e3f796552dad2be50d6f3f6
https://github.com/scummvm/scummvm/commit/929e755078c6f3993e3f796552dad2be50d6f3f6
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2024-02-23T20:49:41-08:00
Commit Message:
M4: ORIONBURGER: Fix shooting the waterdish in room 603
The hole in the dish should persist and Wilbur should say "hmm" the first time, instead of "I've already zapped a hole in it".
Changed paths:
engines/m4/burger/rooms/section6/room603.cpp
diff --git a/engines/m4/burger/rooms/section6/room603.cpp b/engines/m4/burger/rooms/section6/room603.cpp
index 517fc0e58ce..9dcd7b33227 100644
--- a/engines/m4/burger/rooms/section6/room603.cpp
+++ b/engines/m4/burger/rooms/section6/room603.cpp
@@ -260,6 +260,8 @@ void Room603::daemon() {
_val1 = 24;
series_play_with_breaks(PLAY14, "603hole", 0xfff, -1, 6);
} else {
+ _G(wilbur_should) = 20;
+ _val1 = 27;
series_play_with_breaks(PLAY15, "603hole", 0xfff, kCHANGE_WILBUR_ANIMATION, 2);
}
Commit: 94a80f4a353f45993b522f2bb922d4c1e958fffb
https://github.com/scummvm/scummvm/commit/94a80f4a353f45993b522f2bb922d4c1e958fffb
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2024-02-23T20:51:43-08:00
Commit Message:
M4: ORIONBURGER: Fix chute navigation for test 2
When gerbils are asleep Wilbur should be able to use the chute in the top right of the middle floor to go up or down
Also the chute in the middle of floor of the middle floor should lead to Wilbur fallin from the ceiling of the bottom cage floor.
Changed paths:
engines/m4/burger/rooms/section6/room602.cpp
engines/m4/burger/rooms/section6/room603.cpp
engines/m4/burger/rooms/section6/room604.cpp
diff --git a/engines/m4/burger/rooms/section6/room602.cpp b/engines/m4/burger/rooms/section6/room602.cpp
index 1b13ee8f241..dc732192b29 100644
--- a/engines/m4/burger/rooms/section6/room602.cpp
+++ b/engines/m4/burger/rooms/section6/room602.cpp
@@ -384,6 +384,7 @@ void Room602::init() {
case 603:
ws_hide_walker();
if (_G(roomVal7) == 1) {
+ _G(roomVal7) = 0;
_G(wilbur_should) = 2;
kernel_timing_trigger(30, kCHANGE_WILBUR_ANIMATION);
} else {
diff --git a/engines/m4/burger/rooms/section6/room603.cpp b/engines/m4/burger/rooms/section6/room603.cpp
index 9dcd7b33227..8a8442faa2a 100644
--- a/engines/m4/burger/rooms/section6/room603.cpp
+++ b/engines/m4/burger/rooms/section6/room603.cpp
@@ -404,6 +404,7 @@ void Room603::daemon() {
ws_demand_facing(8);
ws_hide_walker();
Section6::_state2 = 1;
+ _G(roomVal7) = 1;
if (_G(flags)[kHampsterState] == 6007) {
series_play_with_breaks(PLAY4, "603wi01", 0xdff, 6010, 3);
@@ -589,7 +590,7 @@ void Room603::daemon() {
void Room603::pre_parser() {
_G(kernel).trigger_mode = KT_DAEMON;
- if (_G(flags)[kHampsterState] == 6000 && (player_said("TUBE ") || player_said("TUBE "))) {
+ if (_G(flags)[kHampsterState] == 6006 && (player_said("TUBE ") || player_said("TUBE "))) {
term_message("Can't leave through back tube as gerbils are in the way.");
wilbur_speech("600w003");
intr_cancel_sentence();
diff --git a/engines/m4/burger/rooms/section6/room604.cpp b/engines/m4/burger/rooms/section6/room604.cpp
index 34b1907edc6..0baca831669 100644
--- a/engines/m4/burger/rooms/section6/room604.cpp
+++ b/engines/m4/burger/rooms/section6/room604.cpp
@@ -243,7 +243,7 @@ void Room604::init() {
case 603:
case 612:
if (Section6::_state2) {
- _G(wilbur_should) = 2;
+ _G(wilbur_should) = 7;
kernel_trigger_dispatch_now(kCHANGE_WILBUR_ANIMATION);
} else {
_G(wilbur_should) = 6;
Commit: 9d589e2e8e7bce5cf2494d1ee74a235588980dd1
https://github.com/scummvm/scummvm/commit/9d589e2e8e7bce5cf2494d1ee74a235588980dd1
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2024-02-23T20:54:27-08:00
Commit Message:
M4: ORIONBURGER: DEMO: Cliking on teleporter icon leads to main menu
Testing with the original interactive Demo (via DosBox) verifies clicking on that icon leads to main menu
Changed paths:
engines/m4/burger/rooms/section6/section6.cpp
diff --git a/engines/m4/burger/rooms/section6/section6.cpp b/engines/m4/burger/rooms/section6/section6.cpp
index 8ba7d93c771..e482acf450f 100644
--- a/engines/m4/burger/rooms/section6/section6.cpp
+++ b/engines/m4/burger/rooms/section6/section6.cpp
@@ -317,7 +317,6 @@ void Section6::daemon() {
_G(wilbur_should) = 6002;
series_play_with_breaks(PLAY1, "604melt", 0x999, kCHANGE_WILBUR_ANIMATION,
_G(executing) == WHOLE_GAME ? WITH_SHADOW | PRELOAD_SOUNDS : PRELOAD_SOUNDS);
-
}
break;
@@ -344,7 +343,14 @@ void Section6::daemon() {
break;
case 10015:
- _G(game).new_room = 608;
+ if (_G(executing) == INTERACTIVE_DEMO) {
+ // After having clicked the teleporter/"failed normally" button we end up here
+ // In the DEMO this click leads to the main menu (it does not restart the test sequence)
+ _G(game).new_section = 9;
+ _G(game).new_room = 901;
+ } else {
+ _G(game).new_room = 608;
+ }
break;
default:
More information about the Scummvm-git-logs
mailing list