[Scummvm-git-logs] scummvm master -> ca489896c1c1b7507281ef48ee85ef4318c48856
dreammaster
noreply at scummvm.org
Sun Feb 2 01:23:10 UTC 2025
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:
ab98ce8de5 M4: RIDDLE: Glass jar fixes
030923e053 M4: RIDDLE: Fix lever on pivot
ca489896c1 M4: RIDDLE: Field renamings for room 407
Commit: ab98ce8de522cd3b010d839ef9d0bdb936c71215
https://github.com/scummvm/scummvm/commit/ab98ce8de522cd3b010d839ef9d0bdb936c71215
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-02-01T17:23:06-08:00
Commit Message:
M4: RIDDLE: Glass jar fixes
Changed paths:
engines/m4/riddle/rooms/section4/room407.cpp
engines/m4/riddle/rooms/section4/room407.h
diff --git a/engines/m4/riddle/rooms/section4/room407.cpp b/engines/m4/riddle/rooms/section4/room407.cpp
index 85f1fda3035..8633f296374 100644
--- a/engines/m4/riddle/rooms/section4/room407.cpp
+++ b/engines/m4/riddle/rooms/section4/room407.cpp
@@ -141,7 +141,7 @@ void Room407::init() {
hotspot_set_active(" ", true);
} else if (_glassTopState == 1030) {
- _glassTopPopup = series_place_sprite("407 GLASS TOP POPUP", 0, 0, 0, 100, 0x200);
+ _glassJarPopup = series_place_sprite("407 GLASS TOP POPUP", 0, 0, 0, 100, 0x200);
if (_val6 == 1010)
_glassTopPopupWithItems1 = series_place_sprite(
@@ -154,7 +154,7 @@ void Room407::init() {
hotspot_set_active(" ", true);
} else if (_glassBottomState == 1030) {
- _glassTopPopup = series_place_sprite("407 GLASS BOTTOM POPUP", 0, 0, 0, 100, 0x200);
+ _glassJarPopup = series_place_sprite("407 GLASS BOTTOM POPUP", 0, 0, 0, 100, 0x200);
if (_periodicTableState == 1116)
_glassTopPopupWithItems2 = series_place_sprite(
@@ -176,7 +176,7 @@ void Room407::init() {
hotspot_set_active(" ", true);
} else if (_fullGlassState == 1030) {
- _glassTopPopup = series_place_sprite("407 FULL GLASS POPUP",
+ _glassJarPopup = series_place_sprite("407 FULL GLASS POPUP",
0, 0, 0, 100, 0x200);
if (_periodicTableState == 1116)
@@ -1002,12 +1002,12 @@ void Room407::daemon() {
case 204:
player_set_commands_allowed(false);
digi_stop(1);
- terminateMachineAndNull(_glassTopPopup);
+ terminateMachineAndNull(_glassJarPopup);
if (_periodicTableState == 1116)
- terminateMachineAndNull(_tabletopPopupWithItems2);
+ terminateMachineAndNull(_glassTopPopupWithItems2);
if (_val6 == 1010)
- terminateMachineAndNull(_tabletopPopupWithItems1);
+ terminateMachineAndNull(_glassTopPopupWithItems1);
setHotspots();
player_set_commands_allowed(true);
@@ -1016,7 +1016,7 @@ void Room407::daemon() {
case 206:
player_set_commands_allowed(false);
digi_stop(1);
- terminateMachineAndNull(_glassTopPopup);
+ terminateMachineAndNull(_glassJarPopup);
if (_periodicTableState == 1116)
terminateMachineAndNull(_tabletopPopupWithItems2);
@@ -1032,7 +1032,7 @@ void Room407::daemon() {
case 208:
player_set_commands_allowed(false);
digi_stop(1);
- terminateMachineAndNull(_glassTopPopup);
+ terminateMachineAndNull(_glassJarPopup);
if (_periodicTableState == 1116)
terminateMachineAndNull(_glassTopPopupWithItems2);
@@ -2807,7 +2807,7 @@ void Room407::roofPistonPopup() {
void Room407::glassBottomPopup() {
if (_G(kernel).trigger == -1) {
_glassBottomState = 1030;
- _glassTopPopup = series_place_sprite(
+ _glassJarPopup = series_place_sprite(
"407 GLASS BOTTOM POPUP", 0, 0, 0, 100, 0x200);
if (_periodicTableState == 1116)
@@ -2834,7 +2834,7 @@ void Room407::glassBottomPopup() {
void Room407::glassTopPopup() {
if (_G(kernel).trigger == -1) {
_glassTopState = 1030;
- _glassTopPopup = series_place_sprite("407 GLASS TOP POPUP",
+ _glassJarPopup = series_place_sprite("407 GLASS TOP POPUP",
0, 0, 0, 100, 0x200);
if (_val6 == 1010) {
@@ -2855,6 +2855,10 @@ void Room407::glassTopPopup() {
if (!player_said("SMALL GEAR WHEEL"))
digi_play("407r19", 1);
}
+
+ disableHotspots();
+ hotspot_set_active(" ", true);
+ player_set_commands_allowed(true);
}
}
@@ -2914,7 +2918,7 @@ bool Room407::lookGlassJar() {
if (_xyzzy7 == 1112) {
switch (_G(kernel).trigger) {
case -1:
- lookGlassJar();
+ glassJarPopup();
if (!inv_object_is_here("EMERALD/CORK")) {
digi_play("407r99a", 1);
@@ -2940,10 +2944,10 @@ bool Room407::lookGlassJar() {
return false;
}
-void Room407::fullglassPopup() {
+void Room407::glassJarPopup() {
if (_G(kernel).trigger == -1) {
_fullGlassState = 1030;
- _glassTopPopup = series_place_sprite("407 FULL GLASS POPUP",
+ _glassJarPopup = series_place_sprite("407 FULL GLASS POPUP",
0, 0, 0, 100, 0x200);
if (_periodicTableState == 1116)
diff --git a/engines/m4/riddle/rooms/section4/room407.h b/engines/m4/riddle/rooms/section4/room407.h
index 27edfae2bd3..3884d18b05e 100644
--- a/engines/m4/riddle/rooms/section4/room407.h
+++ b/engines/m4/riddle/rooms/section4/room407.h
@@ -104,7 +104,7 @@ private:
machine *_tabletopPopupWithItems2 = nullptr;
machine *_tabletopPopupWithItems3 = nullptr;
machine *_pivotPopup = nullptr;
- machine *_glassTopPopup = nullptr;
+ machine *_glassJarPopup = nullptr;
machine *_glassTopPopupWithItems1 = nullptr;
machine *_glassTopPopupWithItems2 = nullptr;
machine *_glassBottomWithItems1 = nullptr;
@@ -173,7 +173,7 @@ private:
void pivotPopup();
void tabletopPopup();
bool lookGlassJar();
- void fullglassPopup();
+ void glassJarPopup();
bool lookEmeraldCork();
void periodicTablePopup();
bool lookLeverKey();
Commit: 030923e05300352c38df4c6be36990a123cf1ea7
https://github.com/scummvm/scummvm/commit/030923e05300352c38df4c6be36990a123cf1ea7
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-02-01T17:23:06-08:00
Commit Message:
M4: RIDDLE: Fix lever on pivot
Changed paths:
engines/m4/riddle/rooms/section4/room407.cpp
diff --git a/engines/m4/riddle/rooms/section4/room407.cpp b/engines/m4/riddle/rooms/section4/room407.cpp
index 8633f296374..a15e460cb68 100644
--- a/engines/m4/riddle/rooms/section4/room407.cpp
+++ b/engines/m4/riddle/rooms/section4/room407.cpp
@@ -424,7 +424,7 @@ void Room407::init() {
_lever = series_place_sprite("407LEVRW", 0, 0, -53, 100, 0xa00);
break;
case 1113:
- _lever = series_place_sprite("407LEVRW", 0, 0, -53, 100, 0xb00);
+ _lever = series_place_sprite("407LEVRW", 2, 0, -53, 100, 0xb00);
break;
case 1114:
if (!_frotz2)
Commit: ca489896c1c1b7507281ef48ee85ef4318c48856
https://github.com/scummvm/scummvm/commit/ca489896c1c1b7507281ef48ee85ef4318c48856
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-02-01T17:23:06-08:00
Commit Message:
M4: RIDDLE: Field renamings for room 407
Changed paths:
engines/m4/riddle/rooms/section4/room407.cpp
engines/m4/riddle/rooms/section4/room407.h
diff --git a/engines/m4/riddle/rooms/section4/room407.cpp b/engines/m4/riddle/rooms/section4/room407.cpp
index a15e460cb68..7f7ca3984f6 100644
--- a/engines/m4/riddle/rooms/section4/room407.cpp
+++ b/engines/m4/riddle/rooms/section4/room407.cpp
@@ -318,7 +318,7 @@ void Room407::init() {
_cpist = series_place_sprite("407CPIST", 0, 0, -53, 100, 0xf00);
_drawer = series_place_sprite("407DRAWR", 0, 0, -53, 100, 0xf00);
_escape = series_place_sprite("407ESCAP", 0, 0, -53, 100, 0xd00);
- _faucet1 = series_place_sprite("407FAUC", 0, 0, -53, 100, 0xe00);
+ _faucetPipe = series_place_sprite("407FAUC", 0, 0, -53, 100, 0xe00);
_airValve = series_place_sprite("407FAUC", 0, 0, -53, 100, 0xe00);
_lever = series_place_sprite("407LEVRW", 0, 0, -53, 100, 0xf00);
_niche = series_place_sprite("407NICH", 0, 0, -53, 100, 0xf00);
@@ -473,14 +473,14 @@ void Room407::init() {
switch (_faucetPipeState) {
case 1100:
- _faucet1 = series_place_sprite("407FAUC", 2, 0, 0, 100, 0xb00);
+ _faucetPipe = series_place_sprite("407FAUC", 2, 0, 0, 100, 0xb00);
break;
case 1116:
case 1140:
- _faucet1 = series_place_sprite("407BITSR", 1, 0, -53, 100, 0xb00);
+ _faucetPipe = series_place_sprite("407BITSR", 1, 0, -53, 100, 0xb00);
break;
case 1130:
- _faucet1 = series_place_sprite("407 FAUCET IN SINK", 0, 0, 0, 100, 0xb00);
+ _faucetPipe = series_place_sprite("407 FAUCET IN SINK", 0, 0, 0, 100, 0xb00);
break;
default:
break;
@@ -529,7 +529,7 @@ void Room407::init() {
_ripEnters, 27, 27, 0);
} else {
- terminateMachineAndNull(_faucet1);
+ terminateMachineAndNull(_faucetPipe);
terminateMachineAndNull(_tubeInDrawer);
terminateMachineAndNull(_drawerPopupHose);
terminateMachineAndNull(_bottle);
@@ -1115,7 +1115,7 @@ void Room407::daemon() {
case 303:
terminateMachineAndNull(_tubeInDrawer);
terminateMachineAndNull(_drawerPopupHose);
- terminateMachineAndNull(_faucet1);
+ terminateMachineAndNull(_faucetPipe);
hotspot_set_active("GARDEN HOSE ", false);
hotspot_set_active("GARDEN HOSE ", false);
@@ -1131,7 +1131,7 @@ void Room407::daemon() {
_xyzzy7 = 1140;
_drawerPopupHose = series_place_sprite("407 TUBE AND HOSE TO JAR",
0, 0, 0, 100, 0xb00);
- _faucet1 = series_place_sprite("407BITSR", 1, 0, -53, 100, 0xb00);
+ _faucetPipe = series_place_sprite("407BITSR", 1, 0, -53, 100, 0xb00);
sendWSMessage_120000(304);
break;
@@ -1158,7 +1158,7 @@ void Room407::daemon() {
case 313:
terminateMachineAndNull(_tubeInDrawer);
terminateMachineAndNull(_drawerPopupHose);
- terminateMachineAndNull(_faucet1);
+ terminateMachineAndNull(_faucetPipe);
hotspot_set_active("GARDEN HOSE ", false);
hotspot_set_active("GARDEN HOSE ", false);
@@ -1194,7 +1194,7 @@ void Room407::daemon() {
case 317:
_drawerPopupHose = series_place_sprite("407 TUBE AND HOSE TO JAR",
0, 0, 0, 100, 0xb00);
- _faucet1 = series_place_sprite("407BITSR", 1, 0, -53, 100, 0xb00);
+ _faucetPipe = series_place_sprite("407BITSR", 1, 0, -53, 100, 0xb00);
sendWSMessage_120000(318);
break;
@@ -1216,7 +1216,7 @@ void Room407::daemon() {
case 322:
if (_stopperState == 1116 && _xyzzy9 == 1116 && _pumpState == 1116) {
- terminateMachineAndNull(_faucet1);
+ terminateMachineAndNull(_faucetPipe);
terminateMachineAndNull(_tubeInDrawer);
terminateMachineAndNull(_drawerPopupHose);
terminateMachineAndNull(_bottle);
@@ -2143,9 +2143,9 @@ take:
} else if (takeFlag && player_said("NOZZLES/TUBE")) {
takeNozzlesTube();
} else if (takeFlag && player_said("LEVER KEY") && _leverKeyState == 1112) {
- takeLeverKey1();
+ takeLeverKeyFromWall();
} else if (takeFlag && player_said("LEVER KEY ")) {
- takeLeverKey2();
+ takeLeverKeyFromBench();
} else if (takeFlag && player_said("AIR VALVE/HANDLE") && _airValveState == 1110) {
takeAirValveHandle();
} else if (takeFlag && player_said("FAUCET HANDLE") && _airValveState == 1100) {
@@ -3088,7 +3088,7 @@ void Room407::gardenHoseSurgicalTube2() {
if (_hoseState == 1061) {
inv_move_object("GARDEN HOSE", 407);
} else {
- _faucet1 = series_place_sprite("407 FAUCET IN SINK",
+ _faucetPipe = series_place_sprite("407 FAUCET IN SINK",
0, 0, 0, 100, 0xe00);
hotspot_set_active("FAUCET PIPE ", true);
inv_move_object("FAUCET PIPE/HOSE", 407);
@@ -3188,7 +3188,7 @@ void Room407::surgicalTubeStem() {
_drawerPopupHose = series_place_sprite(
"407 TUBE AND HOSE INTO SINK", 0, 0, 0, 100, 0xe00);
hotspot_set_active("GARDEN HOSE ", true);
- _faucet1 = series_place_sprite("407 FAUCET IN SINK", 0, 0, 0, 100, 0xe00);
+ _faucetPipe = series_place_sprite("407 FAUCET IN SINK", 0, 0, 0, 100, 0xe00);
hotspot_set_active("FAUCET PIPE ", true);
inv_move_object("FAUCET PIPE/HOSE/TUBE", 407);
_faucetPipeState = 1130;
@@ -3343,7 +3343,7 @@ void Room407::faucetPipeGardenHose() {
break;
case 1:
- _faucet1 = series_place_sprite("407 FAUCET IN SINK",
+ _faucetPipe = series_place_sprite("407 FAUCET IN SINK",
0, 0, 0, 100, 0xe00);
hotspot_set_active("FAUCET PIPE ", true);
inv_move_object("FAUCET PIPE", 407);
@@ -3388,7 +3388,7 @@ void Room407::faucetPipeGlassJar() {
_hoseState = 1116;
}
- _faucet1 = series_place_sprite("407BITSR", 1, 0, -53, 100, 0xb00);
+ _faucetPipe = series_place_sprite("407BITSR", 1, 0, -53, 100, 0xb00);
hotspot_set_active("FAUCET PIPE ", true);
sendWSMessage_120000(3);
break;
@@ -4029,7 +4029,7 @@ void Room407::faucetPipeFaucetHandle2() {
break;
case 1:
- _faucet1 = series_place_sprite("407FAUC", 2, 0, 0, 100, 0xe00);
+ _faucetPipe = series_place_sprite("407FAUC", 2, 0, 0, 100, 0xe00);
inv_move_object("FAUCET PIPE", 407);
hotspot_set_active("FAUCET PIPE", true);
@@ -4632,7 +4632,7 @@ void Room407::takeFaucetPipe1() {
break;
case 1:
- terminateMachineAndNull(_faucet1);
+ terminateMachineAndNull(_faucetPipe);
inv_give_to_player("FAUCET PIPE");
hotspot_set_active("FAUCET PIPE ", false);
kernel_examine_inventory_object("PING FAUCET PIPE",
@@ -4668,7 +4668,7 @@ void Room407::takeFaucetPipe2() {
break;
case 1:
- terminateMachineAndNull(_faucet1);
+ terminateMachineAndNull(_faucetPipe);
hotspot_set_active("FAUCET PIPE ", false);
inv_give_to_player("FAUCET PIPE");
@@ -4728,12 +4728,12 @@ void Room407::takeFaucetPipe3() {
break;
case 1:
- terminateMachineAndNull(_faucet1);
+ terminateMachineAndNull(_faucetPipe);
inv_give_to_player("FAUCET PIPE");
hotspot_set_active("FAUCET PIPE", false);
if (_hoseState == 1100) {
- terminateMachineAndNull(_tubeInDrawer);
+ terminateMachineAndNull(_drawerPopupHose);
inv_give_to_player("GARDEN HOSE");
hotspot_set_active("GARDEN HOSE ", false);
_hoseState = 1000;
@@ -4768,7 +4768,7 @@ void Room407::takeFaucetPipe3() {
break;
case 4:
- series_unload(_ripHiHand1);
+ series_unload(_ripMedHand1);
_faucetPipeState = 1000;
player_set_commands_allowed(true);
break;
@@ -4844,7 +4844,7 @@ void Room407::takeSurgicalTube2() {
inv_give_to_player("SURGICAL TUBE");
if (_faucetPipeState == 1130) {
- terminateMachineAndNull(_faucet1);
+ terminateMachineAndNull(_faucetPipe);
hotspot_set_active("GARDEN HOSE ", false);
inv_give_to_player("FAUCET PIPE");
_faucetPipeState = 1000;
@@ -4973,7 +4973,7 @@ void Room407::takeGardenHose2() {
hotspot_set_active("GARDEN HOSE ", false);
if (_faucetPipeState == 1130) {
- terminateMachineAndNull(_faucet1);
+ terminateMachineAndNull(_faucetPipe);
hotspot_set_active("FAUCET PIPE ", false);
inv_give_to_player("FAUCET PIPE");
_faucetPipeState = 1000;
@@ -5475,7 +5475,7 @@ void Room407::takeNozzlesTube() {
}
}
-void Room407::takeLeverKey1() {
+void Room407::takeLeverKeyFromWall() {
switch (_G(kernel).trigger) {
case -1:
player_set_commands_allowed(false);
@@ -5511,7 +5511,7 @@ void Room407::takeLeverKey1() {
}
}
-void Room407::takeLeverKey2() {
+void Room407::takeLeverKeyFromBench() {
switch (_G(kernel).trigger) {
case -1:
reachHand(10);
@@ -5521,8 +5521,7 @@ void Room407::takeLeverKey2() {
terminateMachineAndNull(_lever);
inv_give_to_player("LEVER KEY");
hotspot_set_active("LEVER KEY ", false);
- kernel_examine_inventory_object("PING LEVER KEY",
- _G(master_palette), 5, 1, 175, 200, 2, "407_s07a", -1);
+ kernel_examine_inventory_object("PING LEVER KEY", 5, 1, 175, 200, 2, "407_s07a");
break;
case 2:
@@ -5534,7 +5533,7 @@ void Room407::takeLeverKey2() {
break;
case 4:
- series_unload(_ripMedReach);
+ series_unload(_ripMedHand1);
_leverKeyState = 1000;
player_set_commands_allowed(true);
break;
diff --git a/engines/m4/riddle/rooms/section4/room407.h b/engines/m4/riddle/rooms/section4/room407.h
index 3884d18b05e..5eda6296ff2 100644
--- a/engines/m4/riddle/rooms/section4/room407.h
+++ b/engines/m4/riddle/rooms/section4/room407.h
@@ -83,7 +83,7 @@ private:
machine *_cpist = nullptr;
machine *_drawer = nullptr;
machine *_escape = nullptr;
- machine *_faucet1 = nullptr;
+ machine *_faucetPipe = nullptr;
machine *_airValve = nullptr;
machine *_lever = nullptr;
machine *_niche = nullptr;
@@ -237,8 +237,8 @@ private:
void takeJarRubberPlug1();
void takeJarRubberPlug2();
void takeNozzlesTube();
- void takeLeverKey1();
- void takeLeverKey2();
+ void takeLeverKeyFromWall();
+ void takeLeverKeyFromBench();
void takeLeverKey3();
void takeAirValveHandle();
void takeFaucetHandle();
More information about the Scummvm-git-logs
mailing list