[Scummvm-git-logs] scummvm master -> 6992ddc37bd6d36fba98511f634fac1e5f1274c4
dreammaster
noreply at scummvm.org
Sat Feb 24 04:42:21 UTC 2024
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:
054fda8f7b M4: ORIONBURGER: Fix Wilbur throwing Kibble at wood shavings
352de074e2 M4: ORIONBURGER: Stop Wilbur repeating his line when exiting
b15187d39c M4: Field rename in room 602
6992ddc37b M4: ORIONBURGER: Fix sound for running motor wheel
Commit: 054fda8f7be16149c307d6f6f552cad3a93b962b
https://github.com/scummvm/scummvm/commit/054fda8f7be16149c307d6f6f552cad3a93b962b
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2024-02-23T20:42:13-08:00
Commit Message:
M4: ORIONBURGER: Fix Wilbur throwing Kibble at wood shavings
This would crash in the demo and also had some repeating animation issues
The fix includes:
- skipping Wilbur's quote which is missing in the demo (using a new play series "PLAY10Demo").
I can only test in demo, but I'm assuming the spoken quote exists in the full version.
- fix repeating the animation of throwing the kibble (this seems to have been a typing / copy-paste error)
- Removing the kibble from Wilbur's inventory after he throws it (this is an "original" bug since it's not removed in the demo).
- Waking up the Gerbils, after Wilbur throws the kibble at the wood shavings (this is the behavior in the demo).
Changed paths:
engines/m4/burger/rooms/section6/room604.cpp
engines/m4/burger/rooms/section6/room604.h
diff --git a/engines/m4/burger/rooms/section6/room604.cpp b/engines/m4/burger/rooms/section6/room604.cpp
index ca82fe8408a..34b1907edc6 100644
--- a/engines/m4/burger/rooms/section6/room604.cpp
+++ b/engines/m4/burger/rooms/section6/room604.cpp
@@ -125,12 +125,16 @@ const seriesPlayBreak Room604::PLAY9[] = {
PLAY_BREAK_END
};
-const seriesPlayBreak Room604::PLAY10[] = {
+const seriesPlayBreak Room604::PLAY10Demo[] = {
{ 0, 3, nullptr, 1, 0, -1, 2048, 0, nullptr, 0 },
{ 4, 14, nullptr, 0, 0, -1, 0, 0, nullptr, 0 },
- { 15, 23, "604_008", 1, 255, -1, 0, 0, nullptr, 0 },
- { 4, 14, nullptr, 0, 0, -1, 0, 0, nullptr, 0 },
- { 15, 23, "604_008", 1, 255, -1, 0, 0, nullptr, 0 },
+ { 15, 23, nullptr, 1, 255, -1, 0, 0, nullptr, 0 },
+ { 24, -1, nullptr, 0, 0, -1, 0, 0, nullptr, 0 },
+ PLAY_BREAK_END
+};
+
+const seriesPlayBreak Room604::PLAY10[] = {
+ { 0, 3, nullptr, 1, 0, -1, 2048, 0, nullptr, 0 },
{ 4, 14, nullptr, 0, 0, -1, 0, 0, nullptr, 0 },
{ 15, 23, "604_008", 1, 255, -1, 0, 0, nullptr, 0 },
{ 24, -1, nullptr, 0, 0, -1, 0, 0, nullptr, 0 },
@@ -422,7 +426,6 @@ void Room604::daemon() {
case 3:
ws_unhide_walker();
player_set_commands_allowed(true);
-
switch (_G(flags)[V242]) {
case 0:
wilbur_speech("604w001");
@@ -507,9 +510,15 @@ void Room604::daemon() {
ws_hide_walker();
_G(wilbur_should) = 10001;
player_set_commands_allowed(false);
- series_play_with_breaks(PLAY10, "604wi11", 0xa00, kCHANGE_WILBUR_ANIMATION, 3);
+ if (_G(executing) == INTERACTIVE_DEMO) {
+ series_play_with_breaks(PLAY10Demo, "604wi11", 0xa00, kCHANGE_WILBUR_ANIMATION, 3);
+ } else {
+ series_play_with_breaks(PLAY10, "604wi11", 0xa00, kCHANGE_WILBUR_ANIMATION, 3);
+ }
+ // Remove Kibble from inventory
+ kernel_trigger_dispatch_now(2);
- if (_G(flags)[V274] == 0 && _G(flags)[kHampsterState] == 600) {
+ if (_G(flags)[V274] == 0 && _G(flags)[kHampsterState] == 6000) {
_G(flags)[kHampsterState] = 6006;
_G(flags)[V248] = 1;
term_message("The gerbils awaken");
diff --git a/engines/m4/burger/rooms/section6/room604.h b/engines/m4/burger/rooms/section6/room604.h
index aa625801c08..e22d979709a 100644
--- a/engines/m4/burger/rooms/section6/room604.h
+++ b/engines/m4/burger/rooms/section6/room604.h
@@ -40,6 +40,7 @@ private:
static const seriesPlayBreak PLAY8[];
static const seriesPlayBreak PLAY9[];
static const seriesPlayBreak PLAY10[];
+ static const seriesPlayBreak PLAY10Demo[];
static const seriesPlayBreak PLAY11[];
static const seriesPlayBreak PLAY12[];
static int32 _state1;
Commit: 352de074e2537779d23497623963058a7008271c
https://github.com/scummvm/scummvm/commit/352de074e2537779d23497623963058a7008271c
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2024-02-23T20:42:13-08:00
Commit Message:
M4: ORIONBURGER: Stop Wilbur repeating his line when exiting
When finally exiting the cage, Wilbur currently would repeat his "I'm sorry it had to come to this..." cue.
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 abcdaf2550c..a0413331564 100644
--- a/engines/m4/burger/rooms/section6/room602.cpp
+++ b/engines/m4/burger/rooms/section6/room602.cpp
@@ -1200,6 +1200,7 @@ void Room602::daemon() {
break;
case 42:
+ _G(wilbur_should) = 10002;
player_set_commands_allowed(false);
ws_unhide_walker();
wilbur_speech("602w033", 5);
Commit: b15187d39cb428bbd2711519c580d7ce4d000ca9
https://github.com/scummvm/scummvm/commit/b15187d39cb428bbd2711519c580d7ce4d000ca9
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-02-23T20:42:13-08:00
Commit Message:
M4: Field rename in room 602
Changed paths:
engines/m4/burger/rooms/section6/room602.cpp
engines/m4/burger/rooms/section6/room602.h
diff --git a/engines/m4/burger/rooms/section6/room602.cpp b/engines/m4/burger/rooms/section6/room602.cpp
index a0413331564..e9b2be112da 100644
--- a/engines/m4/burger/rooms/section6/room602.cpp
+++ b/engines/m4/burger/rooms/section6/room602.cpp
@@ -270,19 +270,19 @@ void Room602::init() {
switch (_G(flags)[V277]) {
case 6001:
- _val1 = 55;
+ _motorShould = 55;
break;
case 6002:
- _val1 = _G(flags)[V278] ? 56 : 55;
+ _motorShould = _G(flags)[V278] ? 56 : 55;
break;
case 6003:
if (_G(flags)[V278]) {
digi_preload("602_005");
- _val1 = 58;
+ _motorShould = 58;
} else {
- _val1 = 57;
+ _motorShould = 57;
}
break;
@@ -407,7 +407,7 @@ void Room602::init() {
hotspot_set_active("FLOOR ", true);
_series8 = series_play("612mot02", 0x700, 0, -1, 0, -1);
- _val1 = 53;
+ _motorShould = 53;
kernel_trigger_dispatch_now(kCHANGE_MOTOR_ANIMATION);
break;
@@ -421,7 +421,7 @@ void Room602::init() {
_G(flags)[V244] = 6004;
_G(flags)[V245] = 10031;
_G(flags)[V248] = 1;
- _val1 = 53;
+ _motorShould = 53;
kernel_trigger_dispatch_now(kCHANGE_MOTOR_ANIMATION);
}
break;
@@ -440,7 +440,7 @@ void Room602::init() {
void Room602::daemon() {
switch (_G(kernel).trigger) {
case kCHANGE_MOTOR_ANIMATION:
- switch (_val1) {
+ switch (_motorShould) {
case 53:
player_set_commands_allowed(false);
digi_preload("612_001b");
@@ -449,14 +449,14 @@ void Room602::daemon() {
series_play("602mg03", 1);
wilbur_speech("602w004");
terminateMachineAndNull(_series8);
- _val1 = 54;
+ _motorShould = 54;
_series8 = series_play("612mot01", 0x600, 0, 1, 0, 8, 100, 0, 0, 0, 7);
break;
case 54:
_G(flags)[V249] = 1;
digi_play("612_001b", 3, 255, 12, 612);
- _val1 = 55;
+ _motorShould = 55;
wilbur_speech("602w005");
_series8 = series_play("612mot01", 0x400, 0, 1, 0, 0, 100, 0, 0, 8, 18);
_G(wilbur_should) = 10001;
@@ -518,7 +518,7 @@ void Room602::daemon() {
case 59:
_G(flags)[V260] = 1;
_G(flags)[V279] = 2;
- _val1 = 60;
+ _motorShould = 60;
if (_G(flags)[V278]) {
series_play_with_breaks(PLAY11, "612wi17", 0x700, 1, 3, 6, 100, 114, -2);
@@ -530,7 +530,7 @@ void Room602::daemon() {
case 60:
_G(flags)[V280] = 1;
kernel_trigger_dispatch_now(3);
- _val1 = 58;
+ _motorShould = 58;
kernel_trigger_dispatch_now(kCHANGE_MOTOR_ANIMATION);
_G(wilbur_should) = (_G(flags)[V280] == 1) ? 10001 : 35;
@@ -541,7 +541,7 @@ void Room602::daemon() {
_G(flags)[V260] = 1;
_G(flags)[V279] = 2;
_G(wilbur_should) = 10001;
- _val1 = 58;
+ _motorShould = 58;
break;
default:
@@ -749,7 +749,7 @@ void Room602::daemon() {
_G(flags)[V244] = 6004;
_G(flags)[V245] = 10031;
player_set_commands_allowed(false);
- _val1 = 53;
+ _motorShould = 53;
kernel_trigger_dispatch_now(6008);
break;
@@ -1037,7 +1037,7 @@ void Room602::daemon() {
terminateMachineAndNull(_series8);
if (_G(flags)[V278]) {
- _val1 = 59;
+ _motorShould = 59;
series_play_with_breaks(PLAY10, "612wi17", 0x700, 1, 3, 6, 100, 114, -2);
} else {
_G(wilbur_should) = 24;
@@ -1046,7 +1046,7 @@ void Room602::daemon() {
break;
case 24:
- _val1 = 57;
+ _motorShould = 57;
kernel_trigger_dispatch_now(kCHANGE_MOTOR_ANIMATION);
if (_G(flags)[V280] == 1) {
@@ -1099,7 +1099,7 @@ void Room602::daemon() {
if (_G(flags)[V277] == 6003) {
digi_preload("602_004");
digi_preload("602_005");
- _val1 = 58;
+ _motorShould = 58;
_G(wilbur_should) = 29;
series_play_with_breaks(PLAY22, "612wi18", 0x600, kCHANGE_WILBUR_ANIMATION, 3);
} else {
@@ -1110,14 +1110,14 @@ void Room602::daemon() {
case 28:
_G(wilbur_should) = 41;
- _val1 = 56;
+ _motorShould = 56;
kernel_trigger_dispatch_now(kCHANGE_MOTOR_ANIMATION);
kernel_trigger_dispatch_now(kCHANGE_WILBUR_ANIMATION);
break;
case 29:
_G(wilbur_should) = 41;
- _val1 = 58;
+ _motorShould = 58;
kernel_trigger_dispatch_now(kCHANGE_MOTOR_ANIMATION);
kernel_trigger_dispatch_now(kCHANGE_WILBUR_ANIMATION);
break;
diff --git a/engines/m4/burger/rooms/section6/room602.h b/engines/m4/burger/rooms/section6/room602.h
index b44a9947e7b..f8bd59bd980 100644
--- a/engines/m4/burger/rooms/section6/room602.h
+++ b/engines/m4/burger/rooms/section6/room602.h
@@ -67,7 +67,7 @@ private:
machine *_series8 = nullptr;
machine *_series9 = nullptr;
machine *_series10 = nullptr;
- int _val1 = 0;
+ int _motorShould = 0;
int _kibbleOffset = 0;
int _doorShould = 0;
int _magnetState = 0;
Commit: 6992ddc37bd6d36fba98511f634fac1e5f1274c4
https://github.com/scummvm/scummvm/commit/6992ddc37bd6d36fba98511f634fac1e5f1274c4
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2024-02-23T20:42:13-08:00
Commit Message:
M4: ORIONBURGER: Fix sound for running motor wheel
The sound sound have a part of accelerating and then a looping part of running
Currently it kept repeating the first part.
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 e9b2be112da..5ece86d3809 100644
--- a/engines/m4/burger/rooms/section6/room602.cpp
+++ b/engines/m4/burger/rooms/section6/room602.cpp
@@ -500,7 +500,7 @@ void Room602::daemon() {
break;
case 58:
- digi_play_loop("602_004", 3, 255, 6, 602);
+ digi_play("602_004", 3, 255, 6, 602);
term_message("*** Play wheel... 1");
_G(flags)[V279] = 2;
term_message("Run with push.");
More information about the Scummvm-git-logs
mailing list