[Scummvm-git-logs] scummvm master -> 51ccc7c8ae4ed47e5569dfe9525fcdfd7aec58b3
Strangerke
noreply at scummvm.org
Fri Dec 27 22:06:53 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:
e8dcff8e8f M4: RIDDLE: Room 710: Finish the implement of parser
22863a2c1b M4: RIDDLE: Room 710: Rename and constify flags in parser
51ccc7c8ae M4: RIDDLE: Room 710: Turn two variables into boolean, renaming
Commit: e8dcff8e8f6797f2aaa10908b489322f985efb8e
https://github.com/scummvm/scummvm/commit/e8dcff8e8f6797f2aaa10908b489322f985efb8e
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-12-27T23:05:55+01:00
Commit Message:
M4: RIDDLE: Room 710: Finish the implement of parser
Changed paths:
engines/m4/riddle/rooms/section7/room710.cpp
diff --git a/engines/m4/riddle/rooms/section7/room710.cpp b/engines/m4/riddle/rooms/section7/room710.cpp
index e1aca8121b3..0018ea324cf 100644
--- a/engines/m4/riddle/rooms/section7/room710.cpp
+++ b/engines/m4/riddle/rooms/section7/room710.cpp
@@ -386,7 +386,7 @@ void Room710::parser() {
terminateMachine(_710Rprs1Mach);
_ripPullMach02 = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, -53, 100, 512, false, triggerMachineByHashCallback, "rip pull machine");
player_update_info(_G(my_walker), &_G(player_info));
- _safariShadow1Mach = series_place_sprite("SAFARI SHADOW 1", 0, _G(player_info).x, _G(player_info).y, _G(player_info).scale, 3840);
+ _safariShadow1Mach = series_place_sprite("SAFARI SHADOW 3", 0, _G(player_info).x, _G(player_info).y, _G(player_info).scale, 3840);
ws_hide_walker(_G(my_walker));
sendWSMessage_10000(1, _ripPullMach02, _710Rpro1Series, 1, 15, 1, _710Rpro1Series, 15, 15, 0);
@@ -413,8 +413,147 @@ void Room710::parser() {
}
} // esi && player_said("rope ")
+ else if (esi && player_said("rope ")) {
+ switch (_G(kernel).trigger) {
+ case -1:
+ player_set_commands_allowed(false);
+ terminateMachine(_710Rprs2Mach);
+ _ripPullMach02 = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, -53, 100, 1024, false, triggerMachineByHashCallback, "rip pull machine");
+ player_update_info(_G(my_walker), &_G(player_info));
+ _safariShadow1Mach = series_place_sprite("SAFARI SHADOW 3", 0, _G(player_info).x, _G(player_info).y, _G(player_info).scale, 3840);
+ ws_hide_walker(_G(my_walker));
+ sendWSMessage_10000(1, _ripPullMach02, _710Rpro2Series, 1, 16, 1, _710Rpro2Series, 16, 16, 0);
+
+ break;
+
+ case 1:
+ digi_play("950_s42", 2, 255, -1, -1);
+ sendWSMessage_10000(1, _ripPullMach02, _710Rpro2Series, 16, 38, 3, _710Rpro2Series, 1, 1, 0);
+
+ break;
+
+ case 3:
+ terminateMachine(_ripPullMach02);
+ _710Rprs2Mach = series_place_sprite("710RPRS2", 0, 0, -53, 100, 2053);
+ terminateMachine(_safariShadow1Mach);
+ ws_unhide_walker(_G(my_walker));
+
+ player_set_commands_allowed(true);
+
+ break;
+
+ default:
+ break;
+ }
+ } // esi && player_said("rope ")
+
+ else if (esi && player_said("rope ")) {
+ switch (_G(kernel).trigger) {
+ case -1:
+ player_set_commands_allowed(false);
+ terminateMachine(_710Rprs4Mach);
+ _ripPullMach02 = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, -53, 100, 512, false, triggerMachineByHashCallback, "rip pull machine");
+ player_update_info(_G(my_walker), &_G(player_info));
+ _safariShadow1Mach = series_place_sprite("SAFARI SHADOW 3", 0, _G(player_info).x, _G(player_info).y, _G(player_info).scale, 3840);
+ ws_hide_walker(_G(my_walker));
+ sendWSMessage_10000(1, _ripPullMach02, _710Rpro4Series, 1, 17, 1, _710Rpro4Series, 17, 17, 0);
+
+ break;
+
+ case 1:
+ digi_play("950_s42", 2, 255, -1, -1);
+ sendWSMessage_10000(1, _ripPullMach02, _710Rpro4Series, 17, 38, 3, _710Rpro4Series, 1, 1, 0);
+
+ break;
+
+ case 3:
+ terminateMachine(_ripPullMach02);
+ _710Rprs4Mach = series_place_sprite("710RPRS4", 0, 0, -53, 100, 1029);
+ terminateMachine(_safariShadow1Mach);
+ ws_unhide_walker(_G(my_walker));
- // TODO Not implemented yet
+ player_set_commands_allowed(true);
+
+ break;
+
+ default:
+ break;
+ }
+ } // esi && player_said("rope ")
+
+ else if (esi && player_said("LADDER") && _field1C) {
+ switch (_G(kernel).trigger) {
+ case -1:
+ player_set_commands_allowed(false);
+ ws_hide_walker(_G(my_walker));
+ sendWSMessage_10000(1, _ripContraptionMach, _710Rpld2Series, 1, 25, 1, _710Rpld2Series, 25, 25, 0);
+
+ break;
+
+ case 1:
+ sendWSMessage_10000(1, _ripContraptionMach, _710Rpld2Series, 26, 40, 2, _710Rpld2Series, 40, 40, 0);
+ digi_play("710_s02", 2, 255, -1, -1);
+
+ break;
+
+ case 2:
+ sendWSMessage_10000(1, _ripContraptionMach, _710Rpld2Series, 41, 60, 3, _710Rpld2Series, 60, 60, 0);
+ digi_play("710_s02", 2, 255, -1, -1);
+
+ break;
+
+ case 3:
+ sendWSMessage_10000(1, _ripContraptionMach, _710Rpld2Series, 61, 80, -1, _710Rpld2Series, 80, 86, 0);
+ digi_play("710_s02", 2, 255, -1, -1);
+ disable_player_commands_and_fade_init(5);
+
+ break;
+
+ case 5:
+ midi_stop();
+ player_set_commands_allowed(true);
+ _G(game).new_room = 711;
+
+ break;
+
+ default:
+ break;
+ }
+ } // esi && player_said("LADDER") && _field1C
+
+ else if (player_said("rm709")) {
+ if (_field4C == 0)
+ digi_play("708R01", 1, 255, -1, -1);
+ else {
+ switch (_G(kernel).trigger) {
+ case -1:
+ player_set_commands_allowed(false);
+ disable_player_commands_and_fade_init(2);
+
+ break;
+
+ case 2:
+ player_set_commands_allowed(true);
+ adv_kill_digi_between_rooms(false);
+ midi_stop();
+ _G(game).new_room = 709;
+
+ break;
+
+ default:
+ break;
+ }
+ }
+ } // player_said("rm709")
+
+ else if (player_said("nowhere")) {
+ digi_play("708R01", 1, 255, -1, -1);
+ } else if (edi && player_said("MACHINERY")) {
+ digi_play("710R11", 1, 255, -1, -1);
+ } else if (player_said("journal")) {
+ digi_play("710R18", 1, 255, -1, -1);
+ } else
+ return;
_G(player).command_ready = false;
}
Commit: 22863a2c1b02053a1e270fb52082c5757009c15d
https://github.com/scummvm/scummvm/commit/22863a2c1b02053a1e270fb52082c5757009c15d
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-12-27T23:05:55+01:00
Commit Message:
M4: RIDDLE: Room 710: Rename and constify flags in parser
Changed paths:
engines/m4/riddle/rooms/section7/room710.cpp
diff --git a/engines/m4/riddle/rooms/section7/room710.cpp b/engines/m4/riddle/rooms/section7/room710.cpp
index 0018ea324cf..d562243d0d1 100644
--- a/engines/m4/riddle/rooms/section7/room710.cpp
+++ b/engines/m4/riddle/rooms/section7/room710.cpp
@@ -135,17 +135,17 @@ void Room710::pre_parser() {
}
void Room710::parser() {
- bool ecx = player_said_any("look", "look at");
- bool edi = player_said_any("talk", "talk to", "take");
- bool esi = player_said_any("push", "pull", "gear", "open", "close");
+ const bool lookFl = player_said_any("look", "look at");
+ const bool talkFl = player_said_any("talk", "talk to", "take");
+ const bool gearFl = player_said_any("push", "pull", "gear", "open", "close");
- if (edi && player_said("LADDER")) {
+ if (talkFl && player_said("LADDER")) {
digi_play("710R09", 1, 255, -1, -1);
- } else if (edi && player_said("LADDER ")) {
+ } else if (talkFl && player_said("LADDER ")) {
digi_play(_field1C ? "710R09" : "710R10", 1, 255, -1, -1);
- } else if (edi && player_said("ROPE")) {
+ } else if (talkFl && player_said("ROPE")) {
digi_play("710R08", 1, 255, -1, -1);
- } else if (ecx && player_said_any("LADDER", "LADDER ")) {
+ } else if (lookFl && player_said_any("LADDER", "LADDER ")) {
player_set_commands_allowed(false);
if (_field1C) {
@@ -170,11 +170,11 @@ void Room710::parser() {
player_set_commands_allowed(true);
} // ecx && player_said_any("LADDER", "LADDER ")
- else if (ecx && player_said("Rope")) {
+ else if (lookFl && player_said("Rope")) {
player_set_commands_allowed(false);
digi_play("710R04", 1, 255, -1, -1);
player_set_commands_allowed(true);
- } else if (ecx && player_said("Mooring") && _field1C) {
+ } else if (lookFl && player_said("Mooring") && _field1C) {
switch (_G(kernel).trigger) {
case -1:
player_set_commands_allowed(false);
@@ -193,19 +193,19 @@ void Room710::parser() {
}
} // ecx && player_said("Mooring") && _field1C
- else if (ecx && player_said("MOORING")) {
+ else if (lookFl && player_said("MOORING")) {
player_set_commands_allowed(false);
digi_play("710R05", 1, 255, -1, -1);
player_set_commands_allowed(true);
- } else if (ecx && player_said("MACHINERY")) {
+ } else if (lookFl && player_said("MACHINERY")) {
player_set_commands_allowed(false);
digi_play("710R06", 1, 255, -1, -1);
player_set_commands_allowed(true);
- } else if (ecx && player_said(" ")) {
+ } else if (lookFl && player_said(" ")) {
player_set_commands_allowed(false);
digi_play(_field1C ? "710R20" : "710R01", 1, 255, -1, -1);
player_set_commands_allowed(true);
- } else if (esi && player_said("Rope")) {
+ } else if (gearFl && player_said("Rope")) {
if (_G(flags[V223])) {
switch (_G(kernel).trigger) {
case -1:
@@ -332,9 +332,9 @@ void Room710::parser() {
}
} // esi && player_said("Rope")
- else if (ecx && player_said_any("rope ", "rope ", "rope ", "rope "))
+ else if (lookFl && player_said_any("rope ", "rope ", "rope ", "rope "))
digi_play("com110", 1, 255, -1, 997);
- else if (esi && player_said("rope ")) {
+ else if (gearFl && player_said("rope ")) {
switch (_G(kernel).trigger) {
case -1:
player_set_commands_allowed(false);
@@ -379,7 +379,7 @@ void Room710::parser() {
}
} // esi && player_said("rope ")
- else if (esi && player_said("rope ")) {
+ else if (gearFl && player_said("rope ")) {
switch (_G(kernel).trigger) {
case -1:
player_set_commands_allowed(false);
@@ -413,7 +413,7 @@ void Room710::parser() {
}
} // esi && player_said("rope ")
- else if (esi && player_said("rope ")) {
+ else if (gearFl && player_said("rope ")) {
switch (_G(kernel).trigger) {
case -1:
player_set_commands_allowed(false);
@@ -447,7 +447,7 @@ void Room710::parser() {
}
} // esi && player_said("rope ")
- else if (esi && player_said("rope ")) {
+ else if (gearFl && player_said("rope ")) {
switch (_G(kernel).trigger) {
case -1:
player_set_commands_allowed(false);
@@ -481,7 +481,7 @@ void Room710::parser() {
}
} // esi && player_said("rope ")
- else if (esi && player_said("LADDER") && _field1C) {
+ else if (gearFl && player_said("LADDER") && _field1C) {
switch (_G(kernel).trigger) {
case -1:
player_set_commands_allowed(false);
@@ -548,7 +548,7 @@ void Room710::parser() {
else if (player_said("nowhere")) {
digi_play("708R01", 1, 255, -1, -1);
- } else if (edi && player_said("MACHINERY")) {
+ } else if (talkFl && player_said("MACHINERY")) {
digi_play("710R11", 1, 255, -1, -1);
} else if (player_said("journal")) {
digi_play("710R18", 1, 255, -1, -1);
Commit: 51ccc7c8ae4ed47e5569dfe9525fcdfd7aec58b3
https://github.com/scummvm/scummvm/commit/51ccc7c8ae4ed47e5569dfe9525fcdfd7aec58b3
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-12-27T23:05:55+01:00
Commit Message:
M4: RIDDLE: Room 710: Turn two variables into boolean, renaming
Changed paths:
engines/m4/riddle/rooms/section7/room710.cpp
engines/m4/riddle/rooms/section7/room710.h
diff --git a/engines/m4/riddle/rooms/section7/room710.cpp b/engines/m4/riddle/rooms/section7/room710.cpp
index d562243d0d1..fdb59b0b70f 100644
--- a/engines/m4/riddle/rooms/section7/room710.cpp
+++ b/engines/m4/riddle/rooms/section7/room710.cpp
@@ -48,7 +48,7 @@ void Room710::init() {
digi_preload("710_s02", -1);
digi_preload("710_s01", -1);
- _field4C = 0;
+ _centerDoorPullAnimationFl = false;
_ripContraptionMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, -53, 100, 256, false, triggerMachineByHashCallback, "rip contraption machine");
_ripReacherMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, -53, 100, 1792, false, triggerMachineByHashCallback, "rip reacher machine");
@@ -61,11 +61,11 @@ void Room710::init() {
case KERNEL_RESTORING_GAME:
digi_preload("950_s41", -1);
if (_G(flags[V223])) {
- _field1C = 1;
+ _ladderActiveFl = true;
_710Rpld4Mach = series_place_sprite("710rpld4", 0, 0, -53, 100, 1541);
_710Rpld5Mach = series_place_sprite("710rpld5", 0, 0, -53, 100, 3840);
} else {
- _field1C = 0;
+ _ladderActiveFl = false;
_710Rpld4Mach = series_place_sprite("710rpld3", 0, 0, -53, 100, 3840);
_710Rpld5Mach = series_place_sprite("710rpld5", 0, 0, -53, 100, 3840);
hotspot_set_active(_G(currentSceneDef).hotspots, "Ladder", false);
@@ -77,11 +77,11 @@ void Room710::init() {
ws_demand_facing(_G(my_walker), 5);
if (_G(flags[V223])) {
- _field1C = 1;
+ _ladderActiveFl = true;
_710Rpld4Mach = series_place_sprite("710rpld4", 0, 0, -53, 100, 1541);
_710Rpld5Mach = series_place_sprite("710rpld5", 0, 0, -53, 100, 3840);
} else {
- _field1C = 0;
+ _ladderActiveFl = false;
hotspot_set_active(_G(currentSceneDef).hotspots, "Ladder", false);
_710Rpld4Mach = series_place_sprite("710rpld3", 0, 0, -53, 100, 3840);
_710Rpld5Mach = series_place_sprite("710rpld5", 0, 0, -53, 100, 3840);
@@ -99,7 +99,7 @@ void Room710::init() {
_710Rpld4Mach = series_place_sprite("710rpld4", 0, 0, -53, 100, 1541);
_710Rpld5Mach = series_place_sprite("710rpld5", 0, 0, -53, 100, 4095);
- _field1C = 1;
+ _ladderActiveFl = true;
hotspot_set_active(_G(currentSceneDef).hotspots, "Ladder", true);
sendWSMessage_10000(1, _ripContraptionMach, _710Rpld2Series, 86, 83, 30, _710Rpld2Series, 83, 83, 0);
@@ -111,11 +111,11 @@ void Room710::init() {
ws_demand_facing(_G(my_walker), 4);
if (_G(flags[V223])) {
- _field1C = 1;
+ _ladderActiveFl = true;
_710Rpld4Mach = series_place_sprite("710rpld4", 0, 0, -53, 100, 1541);
_710Rpld5Mach = series_place_sprite("710rpld5", 0, 0, -53, 100, 4095);
} else {
- _field1C = 0;
+ _ladderActiveFl = false;
_710Rpld4Mach = series_place_sprite("710rpld3", 0, 0, -53, 100, 3840);
_710Rpld5Mach = series_place_sprite("710rpld5", 0, 0, -53, 100, 4095);
hotspot_set_active(_G(currentSceneDef).hotspots, "Ladder", false);
@@ -142,13 +142,13 @@ void Room710::parser() {
if (talkFl && player_said("LADDER")) {
digi_play("710R09", 1, 255, -1, -1);
} else if (talkFl && player_said("LADDER ")) {
- digi_play(_field1C ? "710R09" : "710R10", 1, 255, -1, -1);
+ digi_play(_ladderActiveFl ? "710R09" : "710R10", 1, 255, -1, -1);
} else if (talkFl && player_said("ROPE")) {
digi_play("710R08", 1, 255, -1, -1);
} else if (lookFl && player_said_any("LADDER", "LADDER ")) {
player_set_commands_allowed(false);
- if (_field1C) {
+ if (_ladderActiveFl) {
digi_play("710R21", 1, 255, -1, -1);
} else if (_G(flags[V030] == 0)) {
digi_play("710R02", 1, 255, -1, -1);
@@ -174,7 +174,7 @@ void Room710::parser() {
player_set_commands_allowed(false);
digi_play("710R04", 1, 255, -1, -1);
player_set_commands_allowed(true);
- } else if (lookFl && player_said("Mooring") && _field1C) {
+ } else if (lookFl && player_said("Mooring") && _ladderActiveFl) {
switch (_G(kernel).trigger) {
case -1:
player_set_commands_allowed(false);
@@ -191,7 +191,7 @@ void Room710::parser() {
default:
break;
}
- } // ecx && player_said("Mooring") && _field1C
+ } // ecx && player_said("Mooring") && _ladderActiveFl
else if (lookFl && player_said("MOORING")) {
player_set_commands_allowed(false);
@@ -203,7 +203,7 @@ void Room710::parser() {
player_set_commands_allowed(true);
} else if (lookFl && player_said(" ")) {
player_set_commands_allowed(false);
- digi_play(_field1C ? "710R20" : "710R01", 1, 255, -1, -1);
+ digi_play(_ladderActiveFl ? "710R20" : "710R01", 1, 255, -1, -1);
player_set_commands_allowed(true);
} else if (gearFl && player_said("Rope")) {
if (_G(flags[V223])) {
@@ -227,7 +227,7 @@ void Room710::parser() {
case 2:
hotspot_set_active(_G(currentSceneDef).hotspots, "Ladder", false);
- _field1C = 0;
+ _ladderActiveFl = false;
terminateMachine(_710Rpld4Mach);
terminateMachine(_710Rpld5Mach);
@@ -267,7 +267,7 @@ void Room710::parser() {
break;
}
} else {
- _field1C = 1;
+ _ladderActiveFl = true;
switch (_G(kernel).trigger) {
case -1:
@@ -354,12 +354,12 @@ void Room710::parser() {
break;
case 2:
- if (_field4C)
+ if (_centerDoorPullAnimationFl)
kernel_timing_trigger(5, 3, nullptr);
else {
_ripPullMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 3845, false, triggerMachineByHashCallback, "rip pull machine");
sendWSMessage_10000(1, _ripPullMach, _mazeCentreDoorLiteSeries, 1, 10, 3, _mazeCentreDoorLiteSeries, 10, 10, 0);
- _field4C = 1;
+ _centerDoorPullAnimationFl = true;
}
break;
@@ -481,7 +481,7 @@ void Room710::parser() {
}
} // esi && player_said("rope ")
- else if (gearFl && player_said("LADDER") && _field1C) {
+ else if (gearFl && player_said("LADDER") && _ladderActiveFl) {
switch (_G(kernel).trigger) {
case -1:
player_set_commands_allowed(false);
@@ -519,10 +519,10 @@ void Room710::parser() {
default:
break;
}
- } // esi && player_said("LADDER") && _field1C
+ } // esi && player_said("LADDER") && _ladderActiveFl
else if (player_said("rm709")) {
- if (_field4C == 0)
+ if (!_centerDoorPullAnimationFl)
digi_play("708R01", 1, 255, -1, -1);
else {
switch (_G(kernel).trigger) {
diff --git a/engines/m4/riddle/rooms/section7/room710.h b/engines/m4/riddle/rooms/section7/room710.h
index 353fbecacc4..5d624d4d46b 100644
--- a/engines/m4/riddle/rooms/section7/room710.h
+++ b/engines/m4/riddle/rooms/section7/room710.h
@@ -40,8 +40,8 @@ public:
void daemon() override;
private:
- int32 _field1C = 0;
- int32 _field4C = 0;
+ bool _centerDoorPullAnimationFl = false;
+ bool _ladderActiveFl = false;
int32 _710Rpld2Series = 0;
int32 _710Rpld3Series = 0;
More information about the Scummvm-git-logs
mailing list