[Scummvm-git-logs] scummvm master -> c8897756785024714e174f27524e952622ca3bc1
dreammaster
noreply at scummvm.org
Fri Oct 11 05:31:39 UTC 2024
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
c889775678 M4: RIDDLE: Further room 304 snake fixes
Commit: c8897756785024714e174f27524e952622ca3bc1
https://github.com/scummvm/scummvm/commit/c8897756785024714e174f27524e952622ca3bc1
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-10-10T22:31:32-07:00
Commit Message:
M4: RIDDLE: Further room 304 snake fixes
Changed paths:
engines/m4/riddle/rooms/section3/room304.cpp
engines/m4/riddle/rooms/section3/room304.h
engines/m4/riddle/triggers.cpp
diff --git a/engines/m4/riddle/rooms/section3/room304.cpp b/engines/m4/riddle/rooms/section3/room304.cpp
index 812428c3393..384045556f3 100644
--- a/engines/m4/riddle/rooms/section3/room304.cpp
+++ b/engines/m4/riddle/rooms/section3/room304.cpp
@@ -101,7 +101,7 @@ void Room304::init() {
_mei3 = series_load("MEI CHEN NY WALKER POS4");
_G(globals)[GLB_TEMP_5] = _mei3 << 24;
- _machine1 = TriggerMachineByHash(32, nullptr, -1, -1, intrMsgNull, false, "MACHINE mc");
+ _mei = TriggerMachineByHash(32, nullptr, -1, -1, intrMsgNull, false, "MACHINE mc");
LoadWSAssets("304 FL SN SCRIPT", _G(master_palette));
AddWSAssetCELS("test3", 2, nullptr);
@@ -415,7 +415,7 @@ void Room304::intrMsg(frac16 myMessage, struct machine *sender) {
digi_play("304_s06", 1);
r->_val4 = 1;
- sendWSMessage(0x200000, 0, r->_machine1, 0, nullptr, 1);
+ sendWSMessage(0x200000, 0, r->_mei, 0, nullptr, 1);
return;
}
@@ -430,7 +430,7 @@ void Room304::intrMsg(frac16 myMessage, struct machine *sender) {
r->_safe3 = series_stream("SNAKE HANDLE", 5, 0, 17);
series_stream_break_on_frame(r->_safe3, 10, 13);
- sendWSMessage(0x200000, 0, r->_machine1, 0, nullptr, 1);
+ sendWSMessage(0x200000, 0, r->_mei, 0, nullptr, 1);
_G(flags)[V084] = 2;
return;
}
@@ -448,7 +448,7 @@ void Room304::intrMsg(frac16 myMessage, struct machine *sender) {
series_ranged_play("CUT SNAKE", 1, 0, 0, 10, 100, 0x200, 4, 11);
_G(kernel).trigger_mode = oldMode;
- sendWSMessage(0x200000, 0, r->_machine1, 0, nullptr, 1);
+ sendWSMessage(0x200000, 0, r->_mei, 0, nullptr, 1);
_G(flags)[V084] = 1;
}
}
@@ -484,13 +484,13 @@ void Room304::handlingStick() {
digi_unload("304_s11");
}
- terminateMachineAndNull(_machine1);
+ terminateMachineAndNull(_mei);
series_unload(_mei1);
series_unload(_mei2);
ws_unhide_walker();
player_update_info();
- ws_demand_location(_G(player_info).x + 28,
+ ws_demand_location(_G(player_info).x - 28,
_G(player_info).y + 9);
ws_walk_load_walker_series(S3_NORMAL_DIRS2, S3_NORMAL_NAMES2);
@@ -499,14 +499,14 @@ void Room304::handlingStick() {
_headUp1 = series_load("fl returns to head up");
_headUp2 = series_ranged_play("fl returns to head up",
1, 0, 0, 0, 100, 0x100, 250, 31);
- _machine1 = triggerMachineByHash_3000(8, 3, *S3_NORMAL_DIRS2, *S3_SHADOW_DIRS2,
+ _mei = triggerMachineByHash_3000(8, 3, *S3_NORMAL_DIRS2, *S3_SHADOW_DIRS2,
464, 283, 8, triggerMachineByHashCallback3000, "mc");
- ws_demand_facing(8);
+ ws_demand_facing(_mei, 8);
kernel_timing_trigger(1, 74);
break;
case 18:
- sendWSMessage_10000(_machine1, 73, 275, 3, 20, 0);
+ sendWSMessage_10000(_mei, 73, 275, 3, 20, 0);
break;
case 19:
@@ -514,7 +514,7 @@ void Room304::handlingStick() {
break;
case 20:
- sendWSMessage_10000(_machine1, 29, 295, 3, 21, 1);
+ sendWSMessage_10000(_mei, 29, 295, 3, 21, 1);
break;
case 21:
@@ -523,7 +523,7 @@ void Room304::handlingStick() {
series_unload(_headUp1);
_headUp1 = series_load("lf talk 1");
- ws_hide_walker(_machine1);
+ ws_hide_walker(_mei);
series_unload(221);
series_unload(222);
@@ -535,13 +535,13 @@ void Room304::handlingStick() {
break;
case 22:
- ws_unhide_walker(_machine1);
+ ws_unhide_walker(_mei);
setGlobals1(_suit1, 1, 15, 15, 15, 1, 16, 19, 20, 23, 1);
sendWSMessage_110000(-1);
_headUp2 = series_ranged_play("MC UNTIES LF", -1, 0, 82, 82, 100, 0x200, 250);
setGlobals3(_suit2, 1, 24);
- sendWSMessage_F0000(_machine1, 23);
+ sendWSMessage_F0000(_mei, 23);
digi_play("304m04", 1);
break;
@@ -614,14 +614,14 @@ void Room304::handlingStick() {
_headUp2 = series_ranged_play("lf talk 1", -1, 0, 0, 0, 100, 0x200, 250);
_suit3 = series_load("mc stand and talk pos3");
setGlobals1(_suit3, 1, 1, 1, 8, 1);
- sendWSMessage_110000(_machine1, 38);
+ sendWSMessage_110000(_mei, 38);
digi_play("304m05", 1, 255, 38);
break;
case 38:
if (_ctr1 >= 1) {
_ctr1 = 0;
- sendWSMessage_140000(_machine1, 39);
+ sendWSMessage_140000(_mei, 39);
} else {
++_ctr1;
}
@@ -761,19 +761,19 @@ void Room304::handlingStick() {
break;
case 64:
- ws_unhide_walker(_machine1);
+ ws_unhide_walker(_mei);
series_unload(_suit3);
break;
case 65:
setGlobals1(_suit3, 1, 10, 11, 16, 1, 17, 24, 1, 1, 1);
- sendWSMessage_110000(_machine1, -1);
+ sendWSMessage_110000(_mei, -1);
digi_play("304m08", 1, 255, 66);
kernel_timing_trigger(60, 69);
break;
case 66:
- sendWSMessage_120000(_machine1, -1);
+ sendWSMessage_120000(_mei, -1);
_G(game).setRoom(303);
break;
@@ -789,7 +789,7 @@ void Room304::handlingStick() {
case 71:
if (_ctr1 >= 1) {
_ctr1 = 0;
- sendWSMessage_140000(72);
+ sendWSMessage_140000(_mei, 72);
} else {
++_ctr1;
}
@@ -801,7 +801,7 @@ void Room304::handlingStick() {
setGlobals1(_suit1, 1, 11, 12, 15, 1);
sendWSMessage_110000(73);
digi_play(_useHandlingStick ? "304r24" : "304r23", 1, 255, 73);
- sendWSMessage_10000(_machine1, 242, 274, 3, 18, 0);
+ sendWSMessage_10000(_mei, 242, 274, 3, 18, 0);
break;
case 73:
@@ -817,7 +817,7 @@ void Room304::handlingStick() {
_ctr1 = 0;
_suit3 = series_load("mei ny hands out talk pos4");
setGlobals1(_suit3, 1, 9, 10, 15, 1);
- sendWSMessage_110000(71);
+ sendWSMessage_110000(_mei, 71);
digi_play(_useHandlingStick ? "304m03" : "304m02", 1, 255, 71);
break;
diff --git a/engines/m4/riddle/rooms/section3/room304.h b/engines/m4/riddle/rooms/section3/room304.h
index a60c13444be..ca109fdba2c 100644
--- a/engines/m4/riddle/rooms/section3/room304.h
+++ b/engines/m4/riddle/rooms/section3/room304.h
@@ -39,7 +39,7 @@ private:
machine *_trunk = nullptr;
machine *_stick = nullptr;
int _smoke = -1;
- machine *_machine1 = nullptr;
+ machine *_mei = nullptr;
machine *_machine2 = nullptr;
machine *_machine3 = nullptr;
machine *_pu = nullptr;
diff --git a/engines/m4/riddle/triggers.cpp b/engines/m4/riddle/triggers.cpp
index 63e470970cd..8c7d83dfc47 100644
--- a/engines/m4/riddle/triggers.cpp
+++ b/engines/m4/riddle/triggers.cpp
@@ -114,7 +114,7 @@ machine *triggerMachineByHash_3000(int myHash, int dataHash, int normalDir, int
* _G(globals)[V006] + _G(globals)[V004];
_G(globals)[GLB_TEMP_7] = NUMS[index] << 16;
- machine *result = TriggerMachineByHash(myHash, nullptr, dataHash, 0,
+ machine *result = TriggerMachineByHash(myHash, nullptr, dataHash + 8, 0,
intrMsg ? intrMsg : &triggerMachineByHashCallback3000,
false, machName);
_G(inverse_pal)->release();
More information about the Scummvm-git-logs
mailing list