FULLPIPE: Implement lift_getButtonIdH()

3 files changed, 67 insertions, 20 deletions

diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index dfc2146332..408f765fce 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -219,25 +219,35 @@ namespace Fullpipe {
 #define SND_INTR_019 5220
 #define ST_EGTR_SLIMSORROW 340
 #define ST_FLY_FLY 4918
+#define ST_LBN_0H 2835
+#define ST_LBN_1H 2791
+#define ST_LBN_2H 2793
+#define ST_LBN_3H 2795
+#define ST_LBN_4H 2797
+#define ST_LBN_5H 2799
+#define ST_LBN_6H 2801
+#define ST_LBN_7H 2803
+#define ST_LBN_8H 2805
+#define ST_LBN_9H 2807
 #define ST_LBN_0N 2832
-#define ST_LBN_0P 2833
 #define ST_LBN_1N 2753
-#define ST_LBN_1P 2754
 #define ST_LBN_2N 2756
-#define ST_LBN_2P 2757
 #define ST_LBN_3N 2759
-#define ST_LBN_3P 2760
 #define ST_LBN_4N 2762
-#define ST_LBN_4P 2763
 #define ST_LBN_5N 2765
-#define ST_LBN_5P 2766
 #define ST_LBN_6N 2768
-#define ST_LBN_6P 2769
 #define ST_LBN_7N 2771
-#define ST_LBN_7P 2772
 #define ST_LBN_8N 2774
-#define ST_LBN_8P 2775
 #define ST_LBN_9N 2777
+#define ST_LBN_0P 2833
+#define ST_LBN_1P 2754
+#define ST_LBN_2P 2757
+#define ST_LBN_3P 2760
+#define ST_LBN_4P 2763
+#define ST_LBN_5P 2766
+#define ST_LBN_6P 2769
+#define ST_LBN_7P 2772
+#define ST_LBN_8P 2775
 #define ST_LBN_9P 2778
 #define ST_MAN_EMPTY 476
 #define ST_MAN_GOU 459
diff --git a/engines/fullpipe/fullpipe.h b/engines/fullpipe/fullpipe.h
index 2e071b11f6..c41cc92451 100644
--- a/engines/fullpipe/fullpipe.h
+++ b/engines/fullpipe/fullpipe.h
@@ -272,6 +272,7 @@ public:
 	StaticANIObject *_lastLiftButton;
 
 	int lift_getButtonIdP(int objid);
+	int lift_getButtonIdH(int objid);
 	void lift_setButton(const char *name, int state);
 	void lift_sub5(Scene *sc, int qu1, int qu2);
 	void lift_sub7(Scene *sc, int buttonId);
diff --git a/engines/fullpipe/lift.cpp b/engines/fullpipe/lift.cpp
index c8434fabde..97f6547176 100644
--- a/engines/fullpipe/lift.cpp
+++ b/engines/fullpipe/lift.cpp
@@ -32,37 +32,73 @@ int FullpipeEngine::lift_getButtonIdP(int objid) {
 	switch (objid) {
 	case ST_LBN_0N:
 		return ST_LBN_0P;
-		break;
+
 	case ST_LBN_1N:
 		return ST_LBN_1P;
-		break;
+
 	case ST_LBN_2N:
 		return ST_LBN_2P;
-		break;
+
 	case ST_LBN_3N:
 		return ST_LBN_3P;
-		break;
+
 	case ST_LBN_4N:
 		return ST_LBN_4P;
-		break;
+
 	case ST_LBN_5N:
 		return ST_LBN_5P;
-		break;
+
 	case ST_LBN_6N:
 		return ST_LBN_6P;
-		break;
+
 	case ST_LBN_7N:
 		return ST_LBN_7P;
-		break;
+
 	case ST_LBN_8N:
 		return ST_LBN_8P;
-		break;
+
 	case ST_LBN_9N:
 		return ST_LBN_9P;
-		break;
+
+	default:
+		return 0;
+	}
+}
+
+int FullpipeEngine::lift_getButtonIdH(int objid) {
+	switch (objid) {
+	case ST_LBN_0P:
+		return ST_LBN_0H;
+
+	case ST_LBN_1P:
+		return ST_LBN_1H;
+
+	case ST_LBN_2P:
+		return ST_LBN_2H;
+
+	case ST_LBN_3P:
+		return ST_LBN_3H;
+
+	case ST_LBN_4P:
+		return ST_LBN_4H;
+
+	case ST_LBN_5P:
+		return ST_LBN_5H;
+
+	case ST_LBN_6P:
+		return ST_LBN_6H;
+
+	case ST_LBN_7P:
+		return ST_LBN_7H;
+
+	case ST_LBN_8P:
+		return ST_LBN_8H;
+
+	case ST_LBN_9P:
+		return ST_LBN_9H;
+
 	default:
 		return 0;
-		break;
 	}
 }