aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--engines/fullpipe/scenes.cpp330
1 files changed, 166 insertions, 164 deletions
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index 0136ea9487..02fb33b7a8 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -1010,165 +1010,112 @@ void FullpipeEngine::updateMapPiece(int mapId, int update) {
void FullpipeEngine::updateMap(PreloadItem *pre) {
switch (pre->sceneId) {
- case SC_29:
- updateMapPiece(PIC_MAP_S29, 1);
+ case SC_1:
+ updateMapPiece(PIC_MAP_S01, 1);
if (pre->keyCode == TrubaUp)
- updateMapPiece(PIC_MAP_A05, 1);
+ updateMapPiece(PIC_MAP_P01, 1);
+ if (pre->keyCode == TrubaLeft)
+ updateMapPiece(PIC_MAP_A13, 1);
break;
- case SC_30:
- updateMapPiece(PIC_MAP_S30, 1);
+ case SC_2:
+ updateMapPiece(PIC_MAP_S02, 1);
if (pre->keyCode == TrubaLeft)
- updateMapPiece(PIC_MAP_P09, 1);
-
- if (pre->keyCode == TrubaRight)
- updateMapPiece(PIC_MAP_A04, 1);
+ updateMapPiece(PIC_MAP_P01, 1);
break;
- case SC_31:
- updateMapPiece(PIC_MAP_S31_2, 1);
+ case SC_3:
+ updateMapPiece(PIC_MAP_S03, 1);
+ break;
- if (getObjectState("Кактус") == getObjectEnumState("Кактус", "Вырос"))
- updateMapPiece(PIC_MAP_S31_1, 1);
+ case SC_4:
+ updateMapPiece(PIC_MAP_S04, 1);
if (pre->keyCode == TrubaRight)
- updateMapPiece(PIC_MAP_P09, 1);
+ updateMapPiece(PIC_MAP_P04, 1);
break;
- case SC_32:
- updateMapPiece(PIC_MAP_S32_2, 1);
+ case SC_5:
+ updateMapPiece(PIC_MAP_S05, 1);
- if (getObjectState("Кактус") == getObjectEnumState("Кактус", "Вырос"))
- updateMapPiece(PIC_MAP_S32_1, 1);
+ if (pre->keyCode == TrubaLeft) {
+ updateMapPiece(PIC_MAP_P04, 1);
+ }
- break;
+ if (pre->keyCode == TrubaUp) {
+ updateMapPiece(PIC_MAP_P05, 1);
+ updateMapPiece(PIC_MAP_A11, 1);
+ }
- case SC_33:
- updateMapPiece(PIC_MAP_S33, 1);
break;
- case SC_34:
- updateMapPiece(PIC_MAP_S34, 1);
+ case SC_6:
+ updateMapPiece(PIC_MAP_S06, 1);
if (pre->keyCode == TrubaUp)
- updateMapPiece(PIC_MAP_A03, 1);
+ updateMapPiece(PIC_MAP_A12, 1);
break;
- case SC_35:
- updateMapPiece(PIC_MAP_S35, 1);
+ case SC_7:
+ updateMapPiece(PIC_MAP_S07, 1);
if (pre->keyCode == TrubaLeft)
- updateMapPiece(PIC_MAP_A02, 1);
-
- if (pre->keyCode == TrubaDown)
- updateMapPiece(PIC_MAP_A03, 1);
-
- break;
-
- case SC_36:
- updateMapPiece(PIC_MAP_S36, 1);
- break;
+ updateMapPiece(PIC_MAP_P18, 1);
- case SC_37:
- updateMapPiece(PIC_MAP_S37, 1);
- updateMapPiece(PIC_MAP_A01, 1);
break;
- case SC_38:
- updateMapPiece(PIC_MAP_S38, 1);
-
- switch (pre->preloadId1) {
- case SC_15:
- updateMapPiece(PIC_MAP_P16, 1);
- break;
-
- case SC_1:
- updateMapPiece(PIC_MAP_P10, 1);
- break;
-
- case SC_10:
- updateMapPiece(PIC_MAP_P17, 1);
- break;
-
- case SC_19:
- updateMapPiece(PIC_MAP_P12, 1);
- break;
- }
- break;
+ case SC_8:
+ updateMapPiece(PIC_MAP_S08, 1);
- case SC_28:
- updateMapPiece(PIC_MAP_S28, 1);
+ if (pre->keyCode == TrubaUp)
+ updateMapPiece(PIC_MAP_P11, 1);
if (pre->keyCode == TrubaRight)
- updateMapPiece(PIC_MAP_A06, 1);
+ updateMapPiece(PIC_MAP_P18, 1);
- break;
+ return;
- case SC_22:
- updateMapPiece(PIC_MAP_S22, 1);
- break;
+ case SC_9:
+ updateMapPiece(PIC_MAP_S09, 1);
- case SC_23:
- if (getObjectState("Верхний люк_23") == getObjectEnumState("Верхний люк_23", "Открыт")) {
- updateMapPiece(PIC_MAP_S23_1, 0);
- updateMapPiece(PIC_MAP_S23_2, 1);
- updateMapPiece(PIC_MAP_P07, 1);
- } else {
- updateMapPiece(PIC_MAP_S23_1, 1);
- updateMapPiece(PIC_MAP_S23_2, 0);
- }
- break;
+ if (pre->keyCode == TrubaDown)
+ updateMapPiece(PIC_MAP_P11, 1);
- case SC_24:
- updateMapPiece(PIC_MAP_S24, 1);
+ return;
- if (pre->keyCode == TrubaUp)
- updateMapPiece(PIC_MAP_A08, 1);
+ case SC_10:
+ updateMapPiece(PIC_MAP_S10, 1);
- if (pre->keyCode == TrubaDown) {
- updateMapPiece(PIC_MAP_P13, 1);
- updateMapPiece(PIC_MAP_A07, 1);
- }
- break;
+ if (pre->keyCode == TrubaRight)
+ updateMapPiece(PIC_MAP_P02, 1);
- case SC_25:
- updateMapPiece(PIC_MAP_S25, 1);
break;
- case SC_26:
- updateMapPiece(PIC_MAP_S26, 1);
+ case SC_11:
+ updateMapPiece(PIC_MAP_S11, 1);
if (pre->keyCode == TrubaLeft)
- updateMapPiece(PIC_MAP_A06, 1);
-
- if (pre->keyCode == TrubaUp) {
- updateMapPiece(PIC_MAP_P13, 1);
- updateMapPiece(PIC_MAP_A07, 1);
- }
+ updateMapPiece(PIC_MAP_P02, 1);
break;
- case SC_27:
- updateMapPiece(PIC_MAP_S27, 1);
+ case SC_12:
+ updateMapPiece(PIC_MAP_S12, 1);
break;
- case SC_21:
- updateMapPiece(PIC_MAP_S21, 1);
+ case SC_13:
+ updateMapPiece(PIC_MAP_S13, 1);
- if (pre->keyCode == TrubaLeft) {
- updateMapPiece(PIC_MAP_P15, 1);
- updateMapPiece(PIC_MAP_A09, 1);
+ if (pre->keyCode == TrubaUp) {
+ updateMapPiece(PIC_MAP_P06, 1);
+ updateMapPiece(PIC_MAP_A10, 1);
}
-
- if (pre->keyCode == TrubaDown)
- updateMapPiece(PIC_MAP_A08, 1);
-
break;
case SC_14:
@@ -1215,111 +1162,166 @@ void FullpipeEngine::updateMap(PreloadItem *pre) {
updateMapPiece(PIC_MAP_S20, 1);
break;
- case SC_13:
- updateMapPiece(PIC_MAP_S13, 1);
+ case SC_21:
+ updateMapPiece(PIC_MAP_S21, 1);
- if (pre->keyCode == TrubaUp) {
- updateMapPiece(PIC_MAP_P06, 1);
- updateMapPiece(PIC_MAP_A10, 1);
+ if (pre->keyCode == TrubaLeft) {
+ updateMapPiece(PIC_MAP_P15, 1);
+ updateMapPiece(PIC_MAP_A09, 1);
}
- break;
- case SC_7:
- updateMapPiece(PIC_MAP_S07, 1);
+ if (pre->keyCode == TrubaDown)
+ updateMapPiece(PIC_MAP_A08, 1);
- if (pre->keyCode == TrubaLeft)
- updateMapPiece(PIC_MAP_P18, 1);
+ break;
+ case SC_22:
+ updateMapPiece(PIC_MAP_S22, 1);
break;
- case SC_8:
- updateMapPiece(PIC_MAP_S08, 1);
+ case SC_23:
+ if (getObjectState("Верхний люк_23") == getObjectEnumState("Верхний люк_23", "Открыт")) {
+ updateMapPiece(PIC_MAP_S23_1, 0);
+ updateMapPiece(PIC_MAP_S23_2, 1);
+ updateMapPiece(PIC_MAP_P07, 1);
+ } else {
+ updateMapPiece(PIC_MAP_S23_1, 1);
+ updateMapPiece(PIC_MAP_S23_2, 0);
+ }
+ break;
+
+ case SC_24:
+ updateMapPiece(PIC_MAP_S24, 1);
if (pre->keyCode == TrubaUp)
- updateMapPiece(PIC_MAP_P11, 1);
+ updateMapPiece(PIC_MAP_A08, 1);
- if (pre->keyCode == TrubaRight)
- updateMapPiece(PIC_MAP_P18, 1);
+ if (pre->keyCode == TrubaDown) {
+ updateMapPiece(PIC_MAP_P13, 1);
+ updateMapPiece(PIC_MAP_A07, 1);
+ }
+ break;
- return;
+ case SC_25:
+ updateMapPiece(PIC_MAP_S25, 1);
+ break;
- case SC_9:
- updateMapPiece(PIC_MAP_S09, 1);
+ case SC_26:
+ updateMapPiece(PIC_MAP_S26, 1);
- if (pre->keyCode == TrubaDown)
- updateMapPiece(PIC_MAP_P11, 1);
+ if (pre->keyCode == TrubaLeft)
+ updateMapPiece(PIC_MAP_A06, 1);
- return;
+ if (pre->keyCode == TrubaUp) {
+ updateMapPiece(PIC_MAP_P13, 1);
+ updateMapPiece(PIC_MAP_A07, 1);
+ }
- case SC_10:
- updateMapPiece(PIC_MAP_S10, 1);
+ break;
+
+ case SC_27:
+ updateMapPiece(PIC_MAP_S27, 1);
+ break;
+
+ case SC_28:
+ updateMapPiece(PIC_MAP_S28, 1);
if (pre->keyCode == TrubaRight)
- updateMapPiece(PIC_MAP_P02, 1);
+ updateMapPiece(PIC_MAP_A06, 1);
break;
- case SC_11:
- updateMapPiece(PIC_MAP_S11, 1);
+ case SC_29:
+ updateMapPiece(PIC_MAP_S29, 1);
+
+ if (pre->keyCode == TrubaUp)
+ updateMapPiece(PIC_MAP_A05, 1);
+
+ break;
+
+ case SC_30:
+ updateMapPiece(PIC_MAP_S30, 1);
if (pre->keyCode == TrubaLeft)
- updateMapPiece(PIC_MAP_P02, 1);
+ updateMapPiece(PIC_MAP_P09, 1);
+
+ if (pre->keyCode == TrubaRight)
+ updateMapPiece(PIC_MAP_A04, 1);
break;
- case SC_12:
- updateMapPiece(PIC_MAP_S12, 1);
+ case SC_31:
+ updateMapPiece(PIC_MAP_S31_2, 1);
+
+ if (getObjectState("Кактус") == getObjectEnumState("Кактус", "Вырос"))
+ updateMapPiece(PIC_MAP_S31_1, 1);
+
+ if (pre->keyCode == TrubaRight)
+ updateMapPiece(PIC_MAP_P09, 1);
+
break;
- case SC_6:
- updateMapPiece(PIC_MAP_S06, 1);
+ case SC_32:
+ updateMapPiece(PIC_MAP_S32_2, 1);
- if (pre->keyCode == TrubaUp)
- updateMapPiece(PIC_MAP_A12, 1);
+ if (getObjectState("Кактус") == getObjectEnumState("Кактус", "Вырос"))
+ updateMapPiece(PIC_MAP_S32_1, 1);
break;
- case SC_1:
- updateMapPiece(PIC_MAP_S01, 1);
+ case SC_33:
+ updateMapPiece(PIC_MAP_S33, 1);
+ break;
+
+ case SC_34:
+ updateMapPiece(PIC_MAP_S34, 1);
if (pre->keyCode == TrubaUp)
- updateMapPiece(PIC_MAP_P01, 1);
+ updateMapPiece(PIC_MAP_A03, 1);
- if (pre->keyCode == TrubaLeft)
- updateMapPiece(PIC_MAP_A13, 1);
break;
- case SC_2:
- updateMapPiece(PIC_MAP_S02, 1);
+ case SC_35:
+ updateMapPiece(PIC_MAP_S35, 1);
if (pre->keyCode == TrubaLeft)
- updateMapPiece(PIC_MAP_P01, 1);
+ updateMapPiece(PIC_MAP_A02, 1);
+
+ if (pre->keyCode == TrubaDown)
+ updateMapPiece(PIC_MAP_A03, 1);
break;
- case SC_3:
- updateMapPiece(PIC_MAP_S03, 1);
+ case SC_36:
+ updateMapPiece(PIC_MAP_S36, 1);
break;
- case SC_4:
- updateMapPiece(PIC_MAP_S04, 1);
+ case SC_37:
+ updateMapPiece(PIC_MAP_S37, 1);
+ updateMapPiece(PIC_MAP_A01, 1);
+ break;
- if (pre->keyCode == TrubaRight)
- updateMapPiece(PIC_MAP_P04, 1);
+ case SC_38:
+ updateMapPiece(PIC_MAP_S38, 1);
- break;
+ switch (pre->preloadId1) {
+ case SC_15:
+ updateMapPiece(PIC_MAP_P16, 1);
+ break;
- case SC_5:
- updateMapPiece(PIC_MAP_S05, 1);
+ case SC_1:
+ updateMapPiece(PIC_MAP_P10, 1);
+ break;
- if (pre->keyCode == TrubaLeft) {
- updateMapPiece(PIC_MAP_P04, 1);
- }
+ case SC_10:
+ updateMapPiece(PIC_MAP_P17, 1);
+ break;
- if (pre->keyCode == TrubaUp) {
- updateMapPiece(PIC_MAP_P05, 1);
- updateMapPiece(PIC_MAP_A11, 1);
- }
+ case SC_19:
+ updateMapPiece(PIC_MAP_P12, 1);
+ break;
+ }
+ break;
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-16 17:09:30 +0000