[Scummvm-git-logs] scummvm master -> 7f34de03e64a8fb81ddc799c1fbbc6ea0842e0ee
Strangerke
noreply at scummvm.org
Wed Dec 18 21:25:13 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:
7f34de03e6 M4: RIDDLE: Room 709: Implement pre_parser
Commit: 7f34de03e64a8fb81ddc799c1fbbc6ea0842e0ee
https://github.com/scummvm/scummvm/commit/7f34de03e64a8fb81ddc799c1fbbc6ea0842e0ee
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-12-18T22:25:01+01:00
Commit Message:
M4: RIDDLE: Room 709: Implement pre_parser
Changed paths:
engines/m4/riddle/rooms/section7/room709.cpp
engines/m4/riddle/rooms/section7/room709.h
diff --git a/engines/m4/riddle/rooms/section7/room709.cpp b/engines/m4/riddle/rooms/section7/room709.cpp
index 9b504b46aea..4b6e68045a1 100644
--- a/engines/m4/riddle/rooms/section7/room709.cpp
+++ b/engines/m4/riddle/rooms/section7/room709.cpp
@@ -64,14 +64,14 @@ void Room709::init() {
_709rpro5Mach = series_place_sprite("709RPRO5", 0, 0, -53, 100, 512);
for (int i = 0; i < 99; ++i) {
- maze709Arr[i]._field_0 = 0;
- maze709Arr[i]._field_4 = 0;
- maze709Arr[i]._field_8 = 0;
- maze709Arr[i]._field_C = 0;
- maze709Arr[i]._field_10 = 0;
- maze709Arr[i]._field_14 = 0;
- maze709Arr[i]._field_18 = 0;
- maze709Arr[i]._field_1C = 0;
+ _maze709Arr[i]._field_0 = 0;
+ _maze709Arr[i]._field_4 = 0;
+ _maze709Arr[i]._field_8 = 0;
+ _maze709Arr[i]._field_C = 0;
+ _maze709Arr[i]._field_10 = 0;
+ _maze709Arr[i]._field_14 = 0;
+ _maze709Arr[i]._field_18 = 0;
+ _maze709Arr[i]._field_1C = 0;
}
_field44 = 0;
@@ -80,394 +80,394 @@ void Room709::init() {
hotspot_set_active(_G(currentSceneDef).hotspots, "Incense Burner", false);
hotspot_set_active(_G(currentSceneDef).hotspots, "Chisel", false);
- maze709Arr[1]._field_4 = 1;
- maze709Arr[1]._field_14 = 2;
- maze709Arr[1]._field_C = 1;
- maze709Arr[1]._field_1C = 12;
- maze709Arr[2]._field_0 = 1;
- maze709Arr[2]._field_10 = 1;
- maze709Arr[2]._field_C = 1;
- maze709Arr[2]._field_1C = 13;
- maze709Arr[3]._field_4 = 1;
- maze709Arr[3]._field_14 = 4;
- maze709Arr[3]._field_C = 1;
- maze709Arr[3]._field_1C = 14;
- maze709Arr[4]._field_4 = 1;
- maze709Arr[4]._field_14 = 5;
- maze709Arr[4]._field_0 = 1;
- maze709Arr[4]._field_10 = 3;
- maze709Arr[4]._field_C = 1;
- maze709Arr[4]._field_1C = 15;
- maze709Arr[5]._field_4 = 1;
- maze709Arr[5]._field_14 = 6;
- maze709Arr[5]._field_0 = 1;
- maze709Arr[5]._field_10 = 4;
- maze709Arr[6]._field_0 = 1;
- maze709Arr[6]._field_10 = 5;
- maze709Arr[6]._field_4 = 1;
- maze709Arr[6]._field_14 = 7;
- maze709Arr[6]._field_C = 1;
- maze709Arr[6]._field_1C = 17;
- maze709Arr[7]._field_4 = 1;
- maze709Arr[7]._field_14 = 8;
- maze709Arr[7]._field_0 = 1;
- maze709Arr[7]._field_10 = 6;
- maze709Arr[8]._field_4 = 1;
- maze709Arr[8]._field_14 = 9;
- maze709Arr[8]._field_0 = 1;
- maze709Arr[8]._field_10 = 7;
- maze709Arr[9]._field_0 = 1;
- maze709Arr[9]._field_10 = 8;
- maze709Arr[9]._field_C = 1;
- maze709Arr[9]._field_1C = 20;
- maze709Arr[10]._field_4 = 1;
- maze709Arr[10]._field_14 = 11;
- maze709Arr[10]._field_C = 1;
- maze709Arr[10]._field_1C = 21;
- maze709Arr[11]._field_0 = 1;
- maze709Arr[11]._field_10 = 10;
- maze709Arr[11]._field_C = 1;
- maze709Arr[11]._field_1C = 22;
- maze709Arr[12]._field_8 = 1;
- maze709Arr[12]._field_18 = 1;
- maze709Arr[13]._field_8 = 1;
- maze709Arr[13]._field_18 = 2;
- maze709Arr[13]._field_C = 1;
- maze709Arr[13]._field_1C = 24;
- maze709Arr[14]._field_8 = 1;
- maze709Arr[14]._field_18 = 3;
- maze709Arr[14]._field_C = 1;
- maze709Arr[14]._field_1C = 25;
- maze709Arr[15]._field_8 = 1;
- maze709Arr[15]._field_18 = 4;
- maze709Arr[15]._field_4 = 1;
- maze709Arr[15]._field_14 = 16;
- maze709Arr[16]._field_0 = 1;
- maze709Arr[16]._field_10 = 15;
- maze709Arr[17]._field_8 = 1;
- maze709Arr[17]._field_18 = 6;
- maze709Arr[18]._field_4 = 1;
- maze709Arr[18]._field_14 = 19;
- maze709Arr[18]._field_C = 1;
- maze709Arr[18]._field_1C = 29;
- maze709Arr[19]._field_4 = 1;
- maze709Arr[19]._field_14 = 20;
- maze709Arr[19]._field_0 = 1;
- maze709Arr[19]._field_10 = 18;
- maze709Arr[20]._field_8 = 1;
- maze709Arr[20]._field_18 = 9;
- maze709Arr[20]._field_4 = 1;
- maze709Arr[20]._field_14 = 21;
- maze709Arr[20]._field_0 = 1;
- maze709Arr[20]._field_10 = 19;
- maze709Arr[21]._field_8 = 1;
- maze709Arr[21]._field_18 = 10;
- maze709Arr[21]._field_0 = 1;
- maze709Arr[21]._field_10 = 20;
- maze709Arr[22]._field_8 = 1;
- maze709Arr[22]._field_18 = 11;
- maze709Arr[23]._field_4 = 1;
- maze709Arr[23]._field_14 = 24;
- maze709Arr[23]._field_C = 1;
- maze709Arr[23]._field_1C = 34;
- maze709Arr[24]._field_8 = 1;
- maze709Arr[24]._field_18 = 13;
- maze709Arr[24]._field_0 = 1;
- maze709Arr[24]._field_10 = 23;
- maze709Arr[25]._field_8 = 1;
- maze709Arr[25]._field_18 = 14;
- maze709Arr[25]._field_C = 1;
- maze709Arr[25]._field_1C = 36;
- maze709Arr[26]._field_0 = 1;
- maze709Arr[26]._field_10 = 25;
- maze709Arr[26]._field_C = 1;
- maze709Arr[26]._field_1C = 37;
- maze709Arr[27]._field_4 = 1;
- maze709Arr[27]._field_14 = 28;
- maze709Arr[27]._field_C = 1;
- maze709Arr[27]._field_1C = 38;
- maze709Arr[28]._field_0 = 1;
- maze709Arr[28]._field_10 = 27;
- maze709Arr[29]._field_8 = 1;
- maze709Arr[29]._field_18 = 18;
- maze709Arr[29]._field_C = 1;
- maze709Arr[29]._field_1C = 40;
- maze709Arr[30]._field_4 = 1;
- maze709Arr[30]._field_14 = 31;
- maze709Arr[30]._field_C = 1;
- maze709Arr[30]._field_1C = 41;
- maze709Arr[31]._field_4 = 1;
- maze709Arr[31]._field_14 = 32;
- maze709Arr[31]._field_0 = 1;
- maze709Arr[31]._field_10 = 30;
- maze709Arr[31]._field_C = 1;
- maze709Arr[31]._field_1C = 42;
- maze709Arr[32]._field_4 = 1;
- maze709Arr[32]._field_14 = 33;
- maze709Arr[32]._field_0 = 1;
- maze709Arr[32]._field_10 = 31;
- maze709Arr[33]._field_0 = 1;
- maze709Arr[33]._field_10 = 32;
- maze709Arr[33]._field_C = 1;
- maze709Arr[33]._field_1C = 44;
- maze709Arr[34]._field_8 = 1;
- maze709Arr[34]._field_18 = 23;
- maze709Arr[34]._field_C = 1;
- maze709Arr[34]._field_1C = 45;
- maze709Arr[35]._field_4 = 1;
- maze709Arr[35]._field_14 = 36;
- maze709Arr[36]._field_8 = 1;
- maze709Arr[36]._field_18 = 25;
- maze709Arr[36]._field_0 = 1;
- maze709Arr[36]._field_10 = 35;
- maze709Arr[36]._field_C = 1;
- maze709Arr[36]._field_1C = 47;
- maze709Arr[37]._field_8 = 1;
- maze709Arr[37]._field_18 = 26;
- maze709Arr[37]._field_4 = 1;
- maze709Arr[37]._field_14 = 38;
- maze709Arr[38]._field_8 = 1;
- maze709Arr[38]._field_18 = 27;
- maze709Arr[38]._field_0 = 1;
- maze709Arr[38]._field_10 = 37;
- maze709Arr[39]._field_4 = 1;
- maze709Arr[39]._field_14 = 40;
- maze709Arr[39]._field_C = 1;
- maze709Arr[39]._field_1C = 50;
- maze709Arr[40]._field_8 = 1;
- maze709Arr[40]._field_18 = 29;
- maze709Arr[40]._field_0 = 1;
- maze709Arr[40]._field_10 = 39;
- maze709Arr[41]._field_8 = 1;
- maze709Arr[41]._field_18 = 30;
- maze709Arr[41]._field_C = 1;
- maze709Arr[41]._field_1C = 52;
- maze709Arr[42]._field_8 = 1;
- maze709Arr[42]._field_18 = 31;
- maze709Arr[42]._field_C = 1;
- maze709Arr[42]._field_1C = 53;
- maze709Arr[42]._field_4 = 1;
- maze709Arr[42]._field_14 = 43;
- maze709Arr[43]._field_0 = 1;
- maze709Arr[43]._field_10 = 42;
- maze709Arr[43]._field_4 = 1;
- maze709Arr[43]._field_14 = 44;
- maze709Arr[44]._field_8 = 1;
- maze709Arr[44]._field_18 = 33;
- maze709Arr[44]._field_0 = 1;
- maze709Arr[44]._field_10 = 43;
- maze709Arr[45]._field_8 = 1;
- maze709Arr[45]._field_18 = 34;
- maze709Arr[45]._field_4 = 1;
- maze709Arr[45]._field_14 = 46;
- maze709Arr[45]._field_C = 1;
- maze709Arr[45]._field_1C = 56;
- maze709Arr[46]._field_0 = 1;
- maze709Arr[46]._field_10 = 45;
- maze709Arr[46]._field_4 = 1;
- maze709Arr[46]._field_14 = 47;
- maze709Arr[47]._field_8 = 1;
- maze709Arr[47]._field_18 = 36;
- maze709Arr[47]._field_0 = 1;
- maze709Arr[47]._field_10 = 46;
- maze709Arr[48]._field_4 = 1;
- maze709Arr[48]._field_14 = 49;
- maze709Arr[48]._field_C = 1;
- maze709Arr[48]._field_1C = 59;
- maze709Arr[49]._field_0 = 1;
- maze709Arr[49]._field_10 = 48;
- maze709Arr[50]._field_8 = 1;
- maze709Arr[50]._field_18 = 39;
- maze709Arr[51]._field_4 = 1;
- maze709Arr[51]._field_14 = 52;
- maze709Arr[51]._field_C = 1;
- maze709Arr[51]._field_1C = 62;
- maze709Arr[52]._field_8 = 1;
- maze709Arr[52]._field_18 = 41;
- maze709Arr[52]._field_0 = 1;
- maze709Arr[52]._field_10 = 51;
- maze709Arr[53]._field_8 = 1;
- maze709Arr[53]._field_18 = 42;
- maze709Arr[53]._field_4 = 1;
- maze709Arr[53]._field_14 = 54;
- maze709Arr[54]._field_4 = 1;
- maze709Arr[54]._field_14 = 55;
- maze709Arr[54]._field_0 = 1;
- maze709Arr[54]._field_10 = 53;
- maze709Arr[55]._field_0 = 1;
- maze709Arr[55]._field_10 = 54;
- maze709Arr[55]._field_C = 1;
- maze709Arr[55]._field_1C = 66;
- maze709Arr[56]._field_8 = 1;
- maze709Arr[56]._field_18 = 45;
- maze709Arr[56]._field_C = 1;
- maze709Arr[56]._field_1C = 67;
- maze709Arr[57]._field_0 = 1;
- maze709Arr[57]._field_10 = 56;
- maze709Arr[58]._field_4 = 1;
- maze709Arr[58]._field_14 = 59;
- maze709Arr[58]._field_C = 1;
- maze709Arr[58]._field_1C = 69;
- maze709Arr[59]._field_8 = 1;
- maze709Arr[59]._field_18 = 48;
- maze709Arr[59]._field_0 = 1;
- maze709Arr[59]._field_10 = 58;
- maze709Arr[59]._field_C = 1;
- maze709Arr[59]._field_1C = 70;
- maze709Arr[60]._field_4 = 1;
- maze709Arr[60]._field_14 = 61;
- maze709Arr[60]._field_C = 1;
- maze709Arr[60]._field_1C = 71;
- maze709Arr[61]._field_4 = 1;
- maze709Arr[61]._field_14 = 62;
- maze709Arr[61]._field_0 = 1;
- maze709Arr[61]._field_10 = 60;
- maze709Arr[62]._field_8 = 1;
- maze709Arr[62]._field_18 = 51;
- maze709Arr[62]._field_0 = 1;
- maze709Arr[62]._field_10 = 61;
- maze709Arr[63]._field_4 = 1;
- maze709Arr[63]._field_14 = 64;
- maze709Arr[64]._field_4 = 1;
- maze709Arr[64]._field_14 = 65;
- maze709Arr[64]._field_0 = 1;
- maze709Arr[64]._field_10 = 63;
- maze709Arr[64]._field_C = 1;
- maze709Arr[64]._field_1C = 75;
- maze709Arr[65]._field_4 = 1;
- maze709Arr[65]._field_14 = 66;
- maze709Arr[65]._field_0 = 1;
- maze709Arr[65]._field_10 = 64;
- maze709Arr[66]._field_8 = 1;
- maze709Arr[66]._field_18 = 55;
- maze709Arr[66]._field_0 = 1;
- maze709Arr[66]._field_10 = 65;
- maze709Arr[67]._field_8 = 1;
- maze709Arr[67]._field_18 = 56;
- maze709Arr[67]._field_C = 1;
- maze709Arr[67]._field_1C = 78;
- maze709Arr[68]._field_4 = 1;
- maze709Arr[68]._field_14 = 69;
- maze709Arr[68]._field_C = 1;
- maze709Arr[68]._field_1C = 79;
- maze709Arr[69]._field_0 = 1;
- maze709Arr[69]._field_10 = 68;
- maze709Arr[69]._field_8 = 1;
- maze709Arr[69]._field_18 = 58;
- maze709Arr[70]._field_8 = 1;
- maze709Arr[70]._field_18 = 59;
- maze709Arr[70]._field_4 = 1;
- maze709Arr[70]._field_14 = 71;
- maze709Arr[71]._field_8 = 1;
- maze709Arr[71]._field_18 = 60;
- maze709Arr[71]._field_0 = 1;
- maze709Arr[71]._field_10 = 70;
- maze709Arr[72]._field_4 = 1;
- maze709Arr[72]._field_14 = 73;
- maze709Arr[72]._field_C = 1;
- maze709Arr[72]._field_1C = 83;
- maze709Arr[73]._field_0 = 1;
- maze709Arr[73]._field_10 = 72;
- maze709Arr[73]._field_4 = 1;
- maze709Arr[73]._field_14 = 74;
- maze709Arr[74]._field_0 = 1;
- maze709Arr[74]._field_10 = 73;
- maze709Arr[74]._field_C = 1;
- maze709Arr[74]._field_1C = 85;
- maze709Arr[75]._field_8 = 1;
- maze709Arr[75]._field_18 = 64;
- maze709Arr[75]._field_4 = 1;
- maze709Arr[75]._field_14 = 76;
- maze709Arr[76]._field_0 = 1;
- maze709Arr[76]._field_10 = 75;
- maze709Arr[76]._field_4 = 1;
- maze709Arr[76]._field_14 = 77;
- maze709Arr[77]._field_0 = 1;
- maze709Arr[77]._field_10 = 76;
- maze709Arr[77]._field_C = 1;
- maze709Arr[77]._field_1C = 88;
- maze709Arr[78]._field_8 = 1;
- maze709Arr[78]._field_18 = 67;
- maze709Arr[78]._field_C = 1;
- maze709Arr[78]._field_1C = 89;
- maze709Arr[79]._field_8 = 1;
- maze709Arr[79]._field_18 = 68;
- maze709Arr[79]._field_4 = 1;
- maze709Arr[79]._field_14 = 80;
- maze709Arr[80]._field_4 = 1;
- maze709Arr[80]._field_14 = 81;
- maze709Arr[80]._field_0 = 1;
- maze709Arr[80]._field_10 = 79;
- maze709Arr[80]._field_C = 1;
- maze709Arr[80]._field_1C = 91;
- maze709Arr[81]._field_0 = 1;
- maze709Arr[81]._field_10 = 80;
- maze709Arr[81]._field_C = 1;
- maze709Arr[81]._field_1C = 92;
- maze709Arr[82]._field_4 = 1;
- maze709Arr[82]._field_14 = 83;
- maze709Arr[83]._field_8 = 1;
- maze709Arr[83]._field_18 = 72;
- maze709Arr[83]._field_0 = 1;
- maze709Arr[83]._field_10 = 82;
- maze709Arr[83]._field_C = 1;
- maze709Arr[83]._field_1C = 94;
- maze709Arr[84]._field_4 = 1;
- maze709Arr[84]._field_14 = 85;
- maze709Arr[84]._field_C = 1;
- maze709Arr[84]._field_1C = 95;
- maze709Arr[85]._field_8 = 1;
- maze709Arr[85]._field_18 = 74;
- maze709Arr[85]._field_0 = 1;
- maze709Arr[85]._field_10 = 84;
- maze709Arr[85]._field_4 = 1;
- maze709Arr[85]._field_14 = 86;
- maze709Arr[86]._field_0 = 1;
- maze709Arr[86]._field_10 = 85;
- maze709Arr[86]._field_4 = 1;
- maze709Arr[86]._field_14 = 87;
- maze709Arr[87]._field_0 = 1;
- maze709Arr[87]._field_10 = 86;
- maze709Arr[87]._field_C = 1;
- maze709Arr[87]._field_1C = 98;
- maze709Arr[88]._field_8 = 1;
- maze709Arr[88]._field_18 = 77;
- maze709Arr[88]._field_C = 1;
- maze709Arr[88]._field_1C = 99;
- maze709Arr[89]._field_8 = 1;
- maze709Arr[89]._field_18 = 78;
- maze709Arr[89]._field_4 = 1;
- maze709Arr[89]._field_14 = 90;
- maze709Arr[90]._field_4 = 1;
- maze709Arr[90]._field_14 = 91;
- maze709Arr[90]._field_0 = 1;
- maze709Arr[90]._field_10 = 89;
- maze709Arr[91]._field_8 = 1;
- maze709Arr[91]._field_18 = 80;
- maze709Arr[91]._field_0 = 1;
- maze709Arr[91]._field_10 = 90;
- maze709Arr[92]._field_8 = 1;
- maze709Arr[92]._field_18 = 81;
- maze709Arr[92]._field_4 = 1;
- maze709Arr[92]._field_14 = 93;
- maze709Arr[93]._field_0 = 1;
- maze709Arr[93]._field_10 = 92;
- maze709Arr[94]._field_8 = 1;
- maze709Arr[94]._field_18 = 83;
- maze709Arr[95]._field_8 = 1;
- maze709Arr[95]._field_18 = 84;
- maze709Arr[95]._field_4 = 1;
- maze709Arr[95]._field_14 = 96;
- maze709Arr[96]._field_0 = 1;
- maze709Arr[96]._field_10 = 95;
- maze709Arr[96]._field_4 = 1;
- maze709Arr[96]._field_14 = 97;
- maze709Arr[97]._field_0 = 1;
- maze709Arr[97]._field_10 = 96;
- maze709Arr[98]._field_8 = 1;
- maze709Arr[98]._field_18 = 87;
- maze709Arr[98]._field_4 = 1;
- maze709Arr[98]._field_14 = 99;
+ _maze709Arr[1]._field_4 = 1;
+ _maze709Arr[1]._field_14 = 2;
+ _maze709Arr[1]._field_C = 1;
+ _maze709Arr[1]._field_1C = 12;
+ _maze709Arr[2]._field_0 = 1;
+ _maze709Arr[2]._field_10 = 1;
+ _maze709Arr[2]._field_C = 1;
+ _maze709Arr[2]._field_1C = 13;
+ _maze709Arr[3]._field_4 = 1;
+ _maze709Arr[3]._field_14 = 4;
+ _maze709Arr[3]._field_C = 1;
+ _maze709Arr[3]._field_1C = 14;
+ _maze709Arr[4]._field_4 = 1;
+ _maze709Arr[4]._field_14 = 5;
+ _maze709Arr[4]._field_0 = 1;
+ _maze709Arr[4]._field_10 = 3;
+ _maze709Arr[4]._field_C = 1;
+ _maze709Arr[4]._field_1C = 15;
+ _maze709Arr[5]._field_4 = 1;
+ _maze709Arr[5]._field_14 = 6;
+ _maze709Arr[5]._field_0 = 1;
+ _maze709Arr[5]._field_10 = 4;
+ _maze709Arr[6]._field_0 = 1;
+ _maze709Arr[6]._field_10 = 5;
+ _maze709Arr[6]._field_4 = 1;
+ _maze709Arr[6]._field_14 = 7;
+ _maze709Arr[6]._field_C = 1;
+ _maze709Arr[6]._field_1C = 17;
+ _maze709Arr[7]._field_4 = 1;
+ _maze709Arr[7]._field_14 = 8;
+ _maze709Arr[7]._field_0 = 1;
+ _maze709Arr[7]._field_10 = 6;
+ _maze709Arr[8]._field_4 = 1;
+ _maze709Arr[8]._field_14 = 9;
+ _maze709Arr[8]._field_0 = 1;
+ _maze709Arr[8]._field_10 = 7;
+ _maze709Arr[9]._field_0 = 1;
+ _maze709Arr[9]._field_10 = 8;
+ _maze709Arr[9]._field_C = 1;
+ _maze709Arr[9]._field_1C = 20;
+ _maze709Arr[10]._field_4 = 1;
+ _maze709Arr[10]._field_14 = 11;
+ _maze709Arr[10]._field_C = 1;
+ _maze709Arr[10]._field_1C = 21;
+ _maze709Arr[11]._field_0 = 1;
+ _maze709Arr[11]._field_10 = 10;
+ _maze709Arr[11]._field_C = 1;
+ _maze709Arr[11]._field_1C = 22;
+ _maze709Arr[12]._field_8 = 1;
+ _maze709Arr[12]._field_18 = 1;
+ _maze709Arr[13]._field_8 = 1;
+ _maze709Arr[13]._field_18 = 2;
+ _maze709Arr[13]._field_C = 1;
+ _maze709Arr[13]._field_1C = 24;
+ _maze709Arr[14]._field_8 = 1;
+ _maze709Arr[14]._field_18 = 3;
+ _maze709Arr[14]._field_C = 1;
+ _maze709Arr[14]._field_1C = 25;
+ _maze709Arr[15]._field_8 = 1;
+ _maze709Arr[15]._field_18 = 4;
+ _maze709Arr[15]._field_4 = 1;
+ _maze709Arr[15]._field_14 = 16;
+ _maze709Arr[16]._field_0 = 1;
+ _maze709Arr[16]._field_10 = 15;
+ _maze709Arr[17]._field_8 = 1;
+ _maze709Arr[17]._field_18 = 6;
+ _maze709Arr[18]._field_4 = 1;
+ _maze709Arr[18]._field_14 = 19;
+ _maze709Arr[18]._field_C = 1;
+ _maze709Arr[18]._field_1C = 29;
+ _maze709Arr[19]._field_4 = 1;
+ _maze709Arr[19]._field_14 = 20;
+ _maze709Arr[19]._field_0 = 1;
+ _maze709Arr[19]._field_10 = 18;
+ _maze709Arr[20]._field_8 = 1;
+ _maze709Arr[20]._field_18 = 9;
+ _maze709Arr[20]._field_4 = 1;
+ _maze709Arr[20]._field_14 = 21;
+ _maze709Arr[20]._field_0 = 1;
+ _maze709Arr[20]._field_10 = 19;
+ _maze709Arr[21]._field_8 = 1;
+ _maze709Arr[21]._field_18 = 10;
+ _maze709Arr[21]._field_0 = 1;
+ _maze709Arr[21]._field_10 = 20;
+ _maze709Arr[22]._field_8 = 1;
+ _maze709Arr[22]._field_18 = 11;
+ _maze709Arr[23]._field_4 = 1;
+ _maze709Arr[23]._field_14 = 24;
+ _maze709Arr[23]._field_C = 1;
+ _maze709Arr[23]._field_1C = 34;
+ _maze709Arr[24]._field_8 = 1;
+ _maze709Arr[24]._field_18 = 13;
+ _maze709Arr[24]._field_0 = 1;
+ _maze709Arr[24]._field_10 = 23;
+ _maze709Arr[25]._field_8 = 1;
+ _maze709Arr[25]._field_18 = 14;
+ _maze709Arr[25]._field_C = 1;
+ _maze709Arr[25]._field_1C = 36;
+ _maze709Arr[26]._field_0 = 1;
+ _maze709Arr[26]._field_10 = 25;
+ _maze709Arr[26]._field_C = 1;
+ _maze709Arr[26]._field_1C = 37;
+ _maze709Arr[27]._field_4 = 1;
+ _maze709Arr[27]._field_14 = 28;
+ _maze709Arr[27]._field_C = 1;
+ _maze709Arr[27]._field_1C = 38;
+ _maze709Arr[28]._field_0 = 1;
+ _maze709Arr[28]._field_10 = 27;
+ _maze709Arr[29]._field_8 = 1;
+ _maze709Arr[29]._field_18 = 18;
+ _maze709Arr[29]._field_C = 1;
+ _maze709Arr[29]._field_1C = 40;
+ _maze709Arr[30]._field_4 = 1;
+ _maze709Arr[30]._field_14 = 31;
+ _maze709Arr[30]._field_C = 1;
+ _maze709Arr[30]._field_1C = 41;
+ _maze709Arr[31]._field_4 = 1;
+ _maze709Arr[31]._field_14 = 32;
+ _maze709Arr[31]._field_0 = 1;
+ _maze709Arr[31]._field_10 = 30;
+ _maze709Arr[31]._field_C = 1;
+ _maze709Arr[31]._field_1C = 42;
+ _maze709Arr[32]._field_4 = 1;
+ _maze709Arr[32]._field_14 = 33;
+ _maze709Arr[32]._field_0 = 1;
+ _maze709Arr[32]._field_10 = 31;
+ _maze709Arr[33]._field_0 = 1;
+ _maze709Arr[33]._field_10 = 32;
+ _maze709Arr[33]._field_C = 1;
+ _maze709Arr[33]._field_1C = 44;
+ _maze709Arr[34]._field_8 = 1;
+ _maze709Arr[34]._field_18 = 23;
+ _maze709Arr[34]._field_C = 1;
+ _maze709Arr[34]._field_1C = 45;
+ _maze709Arr[35]._field_4 = 1;
+ _maze709Arr[35]._field_14 = 36;
+ _maze709Arr[36]._field_8 = 1;
+ _maze709Arr[36]._field_18 = 25;
+ _maze709Arr[36]._field_0 = 1;
+ _maze709Arr[36]._field_10 = 35;
+ _maze709Arr[36]._field_C = 1;
+ _maze709Arr[36]._field_1C = 47;
+ _maze709Arr[37]._field_8 = 1;
+ _maze709Arr[37]._field_18 = 26;
+ _maze709Arr[37]._field_4 = 1;
+ _maze709Arr[37]._field_14 = 38;
+ _maze709Arr[38]._field_8 = 1;
+ _maze709Arr[38]._field_18 = 27;
+ _maze709Arr[38]._field_0 = 1;
+ _maze709Arr[38]._field_10 = 37;
+ _maze709Arr[39]._field_4 = 1;
+ _maze709Arr[39]._field_14 = 40;
+ _maze709Arr[39]._field_C = 1;
+ _maze709Arr[39]._field_1C = 50;
+ _maze709Arr[40]._field_8 = 1;
+ _maze709Arr[40]._field_18 = 29;
+ _maze709Arr[40]._field_0 = 1;
+ _maze709Arr[40]._field_10 = 39;
+ _maze709Arr[41]._field_8 = 1;
+ _maze709Arr[41]._field_18 = 30;
+ _maze709Arr[41]._field_C = 1;
+ _maze709Arr[41]._field_1C = 52;
+ _maze709Arr[42]._field_8 = 1;
+ _maze709Arr[42]._field_18 = 31;
+ _maze709Arr[42]._field_C = 1;
+ _maze709Arr[42]._field_1C = 53;
+ _maze709Arr[42]._field_4 = 1;
+ _maze709Arr[42]._field_14 = 43;
+ _maze709Arr[43]._field_0 = 1;
+ _maze709Arr[43]._field_10 = 42;
+ _maze709Arr[43]._field_4 = 1;
+ _maze709Arr[43]._field_14 = 44;
+ _maze709Arr[44]._field_8 = 1;
+ _maze709Arr[44]._field_18 = 33;
+ _maze709Arr[44]._field_0 = 1;
+ _maze709Arr[44]._field_10 = 43;
+ _maze709Arr[45]._field_8 = 1;
+ _maze709Arr[45]._field_18 = 34;
+ _maze709Arr[45]._field_4 = 1;
+ _maze709Arr[45]._field_14 = 46;
+ _maze709Arr[45]._field_C = 1;
+ _maze709Arr[45]._field_1C = 56;
+ _maze709Arr[46]._field_0 = 1;
+ _maze709Arr[46]._field_10 = 45;
+ _maze709Arr[46]._field_4 = 1;
+ _maze709Arr[46]._field_14 = 47;
+ _maze709Arr[47]._field_8 = 1;
+ _maze709Arr[47]._field_18 = 36;
+ _maze709Arr[47]._field_0 = 1;
+ _maze709Arr[47]._field_10 = 46;
+ _maze709Arr[48]._field_4 = 1;
+ _maze709Arr[48]._field_14 = 49;
+ _maze709Arr[48]._field_C = 1;
+ _maze709Arr[48]._field_1C = 59;
+ _maze709Arr[49]._field_0 = 1;
+ _maze709Arr[49]._field_10 = 48;
+ _maze709Arr[50]._field_8 = 1;
+ _maze709Arr[50]._field_18 = 39;
+ _maze709Arr[51]._field_4 = 1;
+ _maze709Arr[51]._field_14 = 52;
+ _maze709Arr[51]._field_C = 1;
+ _maze709Arr[51]._field_1C = 62;
+ _maze709Arr[52]._field_8 = 1;
+ _maze709Arr[52]._field_18 = 41;
+ _maze709Arr[52]._field_0 = 1;
+ _maze709Arr[52]._field_10 = 51;
+ _maze709Arr[53]._field_8 = 1;
+ _maze709Arr[53]._field_18 = 42;
+ _maze709Arr[53]._field_4 = 1;
+ _maze709Arr[53]._field_14 = 54;
+ _maze709Arr[54]._field_4 = 1;
+ _maze709Arr[54]._field_14 = 55;
+ _maze709Arr[54]._field_0 = 1;
+ _maze709Arr[54]._field_10 = 53;
+ _maze709Arr[55]._field_0 = 1;
+ _maze709Arr[55]._field_10 = 54;
+ _maze709Arr[55]._field_C = 1;
+ _maze709Arr[55]._field_1C = 66;
+ _maze709Arr[56]._field_8 = 1;
+ _maze709Arr[56]._field_18 = 45;
+ _maze709Arr[56]._field_C = 1;
+ _maze709Arr[56]._field_1C = 67;
+ _maze709Arr[57]._field_0 = 1;
+ _maze709Arr[57]._field_10 = 56;
+ _maze709Arr[58]._field_4 = 1;
+ _maze709Arr[58]._field_14 = 59;
+ _maze709Arr[58]._field_C = 1;
+ _maze709Arr[58]._field_1C = 69;
+ _maze709Arr[59]._field_8 = 1;
+ _maze709Arr[59]._field_18 = 48;
+ _maze709Arr[59]._field_0 = 1;
+ _maze709Arr[59]._field_10 = 58;
+ _maze709Arr[59]._field_C = 1;
+ _maze709Arr[59]._field_1C = 70;
+ _maze709Arr[60]._field_4 = 1;
+ _maze709Arr[60]._field_14 = 61;
+ _maze709Arr[60]._field_C = 1;
+ _maze709Arr[60]._field_1C = 71;
+ _maze709Arr[61]._field_4 = 1;
+ _maze709Arr[61]._field_14 = 62;
+ _maze709Arr[61]._field_0 = 1;
+ _maze709Arr[61]._field_10 = 60;
+ _maze709Arr[62]._field_8 = 1;
+ _maze709Arr[62]._field_18 = 51;
+ _maze709Arr[62]._field_0 = 1;
+ _maze709Arr[62]._field_10 = 61;
+ _maze709Arr[63]._field_4 = 1;
+ _maze709Arr[63]._field_14 = 64;
+ _maze709Arr[64]._field_4 = 1;
+ _maze709Arr[64]._field_14 = 65;
+ _maze709Arr[64]._field_0 = 1;
+ _maze709Arr[64]._field_10 = 63;
+ _maze709Arr[64]._field_C = 1;
+ _maze709Arr[64]._field_1C = 75;
+ _maze709Arr[65]._field_4 = 1;
+ _maze709Arr[65]._field_14 = 66;
+ _maze709Arr[65]._field_0 = 1;
+ _maze709Arr[65]._field_10 = 64;
+ _maze709Arr[66]._field_8 = 1;
+ _maze709Arr[66]._field_18 = 55;
+ _maze709Arr[66]._field_0 = 1;
+ _maze709Arr[66]._field_10 = 65;
+ _maze709Arr[67]._field_8 = 1;
+ _maze709Arr[67]._field_18 = 56;
+ _maze709Arr[67]._field_C = 1;
+ _maze709Arr[67]._field_1C = 78;
+ _maze709Arr[68]._field_4 = 1;
+ _maze709Arr[68]._field_14 = 69;
+ _maze709Arr[68]._field_C = 1;
+ _maze709Arr[68]._field_1C = 79;
+ _maze709Arr[69]._field_0 = 1;
+ _maze709Arr[69]._field_10 = 68;
+ _maze709Arr[69]._field_8 = 1;
+ _maze709Arr[69]._field_18 = 58;
+ _maze709Arr[70]._field_8 = 1;
+ _maze709Arr[70]._field_18 = 59;
+ _maze709Arr[70]._field_4 = 1;
+ _maze709Arr[70]._field_14 = 71;
+ _maze709Arr[71]._field_8 = 1;
+ _maze709Arr[71]._field_18 = 60;
+ _maze709Arr[71]._field_0 = 1;
+ _maze709Arr[71]._field_10 = 70;
+ _maze709Arr[72]._field_4 = 1;
+ _maze709Arr[72]._field_14 = 73;
+ _maze709Arr[72]._field_C = 1;
+ _maze709Arr[72]._field_1C = 83;
+ _maze709Arr[73]._field_0 = 1;
+ _maze709Arr[73]._field_10 = 72;
+ _maze709Arr[73]._field_4 = 1;
+ _maze709Arr[73]._field_14 = 74;
+ _maze709Arr[74]._field_0 = 1;
+ _maze709Arr[74]._field_10 = 73;
+ _maze709Arr[74]._field_C = 1;
+ _maze709Arr[74]._field_1C = 85;
+ _maze709Arr[75]._field_8 = 1;
+ _maze709Arr[75]._field_18 = 64;
+ _maze709Arr[75]._field_4 = 1;
+ _maze709Arr[75]._field_14 = 76;
+ _maze709Arr[76]._field_0 = 1;
+ _maze709Arr[76]._field_10 = 75;
+ _maze709Arr[76]._field_4 = 1;
+ _maze709Arr[76]._field_14 = 77;
+ _maze709Arr[77]._field_0 = 1;
+ _maze709Arr[77]._field_10 = 76;
+ _maze709Arr[77]._field_C = 1;
+ _maze709Arr[77]._field_1C = 88;
+ _maze709Arr[78]._field_8 = 1;
+ _maze709Arr[78]._field_18 = 67;
+ _maze709Arr[78]._field_C = 1;
+ _maze709Arr[78]._field_1C = 89;
+ _maze709Arr[79]._field_8 = 1;
+ _maze709Arr[79]._field_18 = 68;
+ _maze709Arr[79]._field_4 = 1;
+ _maze709Arr[79]._field_14 = 80;
+ _maze709Arr[80]._field_4 = 1;
+ _maze709Arr[80]._field_14 = 81;
+ _maze709Arr[80]._field_0 = 1;
+ _maze709Arr[80]._field_10 = 79;
+ _maze709Arr[80]._field_C = 1;
+ _maze709Arr[80]._field_1C = 91;
+ _maze709Arr[81]._field_0 = 1;
+ _maze709Arr[81]._field_10 = 80;
+ _maze709Arr[81]._field_C = 1;
+ _maze709Arr[81]._field_1C = 92;
+ _maze709Arr[82]._field_4 = 1;
+ _maze709Arr[82]._field_14 = 83;
+ _maze709Arr[83]._field_8 = 1;
+ _maze709Arr[83]._field_18 = 72;
+ _maze709Arr[83]._field_0 = 1;
+ _maze709Arr[83]._field_10 = 82;
+ _maze709Arr[83]._field_C = 1;
+ _maze709Arr[83]._field_1C = 94;
+ _maze709Arr[84]._field_4 = 1;
+ _maze709Arr[84]._field_14 = 85;
+ _maze709Arr[84]._field_C = 1;
+ _maze709Arr[84]._field_1C = 95;
+ _maze709Arr[85]._field_8 = 1;
+ _maze709Arr[85]._field_18 = 74;
+ _maze709Arr[85]._field_0 = 1;
+ _maze709Arr[85]._field_10 = 84;
+ _maze709Arr[85]._field_4 = 1;
+ _maze709Arr[85]._field_14 = 86;
+ _maze709Arr[86]._field_0 = 1;
+ _maze709Arr[86]._field_10 = 85;
+ _maze709Arr[86]._field_4 = 1;
+ _maze709Arr[86]._field_14 = 87;
+ _maze709Arr[87]._field_0 = 1;
+ _maze709Arr[87]._field_10 = 86;
+ _maze709Arr[87]._field_C = 1;
+ _maze709Arr[87]._field_1C = 98;
+ _maze709Arr[88]._field_8 = 1;
+ _maze709Arr[88]._field_18 = 77;
+ _maze709Arr[88]._field_C = 1;
+ _maze709Arr[88]._field_1C = 99;
+ _maze709Arr[89]._field_8 = 1;
+ _maze709Arr[89]._field_18 = 78;
+ _maze709Arr[89]._field_4 = 1;
+ _maze709Arr[89]._field_14 = 90;
+ _maze709Arr[90]._field_4 = 1;
+ _maze709Arr[90]._field_14 = 91;
+ _maze709Arr[90]._field_0 = 1;
+ _maze709Arr[90]._field_10 = 89;
+ _maze709Arr[91]._field_8 = 1;
+ _maze709Arr[91]._field_18 = 80;
+ _maze709Arr[91]._field_0 = 1;
+ _maze709Arr[91]._field_10 = 90;
+ _maze709Arr[92]._field_8 = 1;
+ _maze709Arr[92]._field_18 = 81;
+ _maze709Arr[92]._field_4 = 1;
+ _maze709Arr[92]._field_14 = 93;
+ _maze709Arr[93]._field_0 = 1;
+ _maze709Arr[93]._field_10 = 92;
+ _maze709Arr[94]._field_8 = 1;
+ _maze709Arr[94]._field_18 = 83;
+ _maze709Arr[95]._field_8 = 1;
+ _maze709Arr[95]._field_18 = 84;
+ _maze709Arr[95]._field_4 = 1;
+ _maze709Arr[95]._field_14 = 96;
+ _maze709Arr[96]._field_0 = 1;
+ _maze709Arr[96]._field_10 = 95;
+ _maze709Arr[96]._field_4 = 1;
+ _maze709Arr[96]._field_14 = 97;
+ _maze709Arr[97]._field_0 = 1;
+ _maze709Arr[97]._field_10 = 96;
+ _maze709Arr[98]._field_8 = 1;
+ _maze709Arr[98]._field_18 = 87;
+ _maze709Arr[98]._field_4 = 1;
+ _maze709Arr[98]._field_14 = 99;
_btnFlag = 1;
switch (_G(game).previous_room) {
@@ -523,7 +523,71 @@ void Room709::init() {
}
void Room709::pre_parser() {
- // TODO Not implemented yet
+ 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", "RopeS", "RopeL", "RopeR", "RopeB");
+
+ if (player_said("Right")) {
+ if (_maze709Arr[_field80_save]._field_4 == 0 || _field74 == 0 || lookFl || talkFl || gearFl) {
+ _G(player).need_to_walk = false;
+ _G(player).ready_to_walk = true;
+ _G(player).waiting_for_walk = false;
+ }
+ }
+
+ if (player_said("Left")) {
+ if (_maze709Arr[_field80_save]._field_0 == 0 || _field70 == 0 || lookFl || talkFl || gearFl) {
+ _G(player).need_to_walk = false;
+ _G(player).ready_to_walk = true;
+ _G(player).waiting_for_walk = false;
+ }
+
+ if (_field80_save == 82) {
+ _G(player).need_to_walk = false;
+ _G(player).ready_to_walk = true;
+ _G(player).waiting_for_walk = false;
+ }
+ }
+
+ if (player_said("Straight")) {
+ if (_maze709Arr[_field80_save]._field_8 == 0 || _field78 == 0 || lookFl || talkFl || gearFl) {
+ _G(player).need_to_walk = false;
+ _G(player).ready_to_walk = true;
+ _G(player).waiting_for_walk = false;
+ }
+ }
+
+ if (player_said("Back")) {
+ if (_maze709Arr[_field80_save]._field_C == 0 || _field7C == 0 || lookFl || talkFl || gearFl) {
+ _G(player).need_to_walk = false;
+ _G(player).ready_to_walk = true;
+ _G(player).waiting_for_walk = false;
+ }
+ }
+
+ if ((lookFl || talkFl || gearFl) && player_said_any(" ", " ")) {
+ _G(player).need_to_walk = false;
+ _G(player).ready_to_walk = true;
+ _G(player).waiting_for_walk = false;
+ }
+
+ if (talkFl && player_said("Incense Burner") && inv_object_is_here("Incense Burner")) {
+ _G(player).need_to_walk = false;
+ _G(player).ready_to_walk = true;
+ _G(player).waiting_for_walk = false;
+ }
+
+ if (talkFl && player_said("Chisel") && inv_object_is_here("Chisel")) {
+ _G(player).need_to_walk = false;
+ _G(player).ready_to_walk = true;
+ _G(player).waiting_for_walk = false;
+ }
+
+ if (!lookFl && !talkFl && player_said_any("LIGHTER", "LIT LIGHTER")) {
+ _G(player).need_to_walk = false;
+ _G(player).ready_to_walk = true;
+ _G(player).waiting_for_walk = false;
+ }
}
void Room709::parser() {
diff --git a/engines/m4/riddle/rooms/section7/room709.h b/engines/m4/riddle/rooms/section7/room709.h
index cef87dd83e9..bdfad010527 100644
--- a/engines/m4/riddle/rooms/section7/room709.h
+++ b/engines/m4/riddle/rooms/section7/room709.h
@@ -80,7 +80,7 @@ private:
machine *_709ChiselMach = nullptr;
machine *_ripPullMach = nullptr;
- Maze709Struc maze709Arr[99];
+ Maze709Struc _maze709Arr[99];
static void clearPressed(void *, void *);
};
More information about the Scummvm-git-logs
mailing list