From efaa86bee4f0183365309056d43b3aa3801f3ddf Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 1 May 2016 23:48:22 -0400
Subject: TITANIC: Implement Television Control glyph

---
 engines/titanic/pet_control/pet_remote.cpp | 82 ++++++++++++++++++------------
 1 file changed, 50 insertions(+), 32 deletions(-)

(limited to 'engines/titanic/pet_control/pet_remote.cpp')

diff --git a/engines/titanic/pet_control/pet_remote.cpp b/engines/titanic/pet_control/pet_remote.cpp
index fb9178b13b..9149ed851e 100644
--- a/engines/titanic/pet_control/pet_remote.cpp
+++ b/engines/titanic/pet_control/pet_remote.cpp
@@ -32,40 +32,52 @@ namespace Titanic {
 static const byte REMOTE_DATA[] = {
 	0x00, 0x02, 
 		GLYPH_SUMMON_ELEVATOR, 0x10,
-	0x01,	0x02, 0x01, 0x10,
-	0x02,	0x03, 0x02, 0x04, 0x10,
+	0x01, 0x02,
+		GLYPH_SUMMON_PELLERATOR, 0x10,
+	0x02, 0x03,
+		GLYPH_TELEVISION_CONTROL, 0x04, 0x10,
 	0x03, 0x02,
 		GLYPH_SUMMON_ELEVATOR, 0x10,
-	0x04,	0x02, 0x02, 0x10,
-	0x05,	0x02, 0x01, 0x10,
-	0x06,	0x02, 0x01, 0x10,
-	0x07,	0x03, 0x02, 0x01, 0x10,
-	0x08,	0x01, 0x10,
-	0x09,	0x01, 0x10,
-	0x0A,	0x02, GLYPH_SUMMON_ELEVATOR, 0x10,
-	0x0B,	0x01, 0x11,
-	0x0C,	0x01, 0x10,
-	0x0D,	0x01, 0x10,
-	0x0E,	0x00,
-	0x0F,	0x01, 0x02,
-	0x10,	0x03, 0x12, 0x14, 0x13,
-	0x11,	0x01, 0x10,
-	0x12,	0x00,
-	0x13,	0x02, 0x01, 0x10,
-	0x14,	0x00,
-	0x15,	0x02, 0x10, 0x02,
-	0x16,	0x00,
-	0x17,	0x02, 0x01, 0x10,
-	0x18,	0x01, 0x10,
-	0x19,	0x00,
-	0x1A,	0x00,
-	0x1B,	0x00,
-	0x1C,	0x00,
-	0x1D,	0x02, GLYPH_SUMMON_ELEVATOR, 0x10,
-	0x1E,	0x0C, 0x05, 0x06, 0x07, 0x08, 0x03, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
-	0x1F,	0x01, 0x10,
-	0x20,	0x02, GLYPH_SUMMON_ELEVATOR, 0x01,
-	0x21,	0x00
+	0x04, 0x02,
+		GLYPH_TELEVISION_CONTROL, 0x10,
+	0x05, 0x02,
+		GLYPH_SUMMON_PELLERATOR, 0x10,
+	0x06, 0x02,
+		GLYPH_SUMMON_PELLERATOR, 0x10,
+	0x07, 0x03,
+		GLYPH_TELEVISION_CONTROL, GLYPH_SUMMON_PELLERATOR, 0x10,
+	0x08, 0x01, 0x10,
+	0x09, 0x01, 0x10,
+	0x0A, 0x02, GLYPH_SUMMON_ELEVATOR, 0x10,
+	0x0B, 0x01, 0x11,
+	0x0C, 0x01, 0x10,
+	0x0D, 0x01, 0x10,
+	0x0E, 0x00,
+	0x0F, 0x01,
+		GLYPH_TELEVISION_CONTROL,
+	0x10, 0x03, 0x12, 0x14, 0x13,
+	0x11, 0x01, 0x10,
+	0x12, 0x00,
+	0x13, 0x02,
+		GLYPH_SUMMON_PELLERATOR, 0x10,
+	0x14, 0x00,
+	0x15, 0x02,
+		0x10, GLYPH_TELEVISION_CONTROL,
+	0x16, 0x00,
+	0x17, 0x02,
+		GLYPH_SUMMON_PELLERATOR, 0x10,
+	0x18, 0x01, 0x10,
+	0x19, 0x00,
+	0x1A, 0x00,
+	0x1B, 0x00,
+	0x1C, 0x00,
+	0x1D, 0x02, GLYPH_SUMMON_ELEVATOR, 0x10,
+	0x1E, 0x0C,
+		0x05, 0x06, 0x07, 0x08, 0x03, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
+	0x1F, 0x01, 0x10,
+	0x20, 0x02,
+		GLYPH_SUMMON_ELEVATOR, GLYPH_SUMMON_PELLERATOR,
+	0x21, 0x00
 };
 
 CPetRemote::CPetRemote() : CPetSection() {
@@ -301,6 +313,12 @@ bool CPetRemote::loadGlyph(int glyphIndex) {
 		glyph = new CSummonElevatorGlyph();
 		break;
 
+	case GLYPH_SUMMON_PELLERATOR:
+		glyph = new CSummonPelleratorGlyph();
+		break;
+
+	case GLYPH_TELEVISION_CONTROL:
+
 	default:
 		break;
 	}
-- 
cgit v1.2.3