TITANIC: Implement remaining PET Remote glyphs

1 files changed, 56 insertions, 11 deletions

diff --git a/engines/titanic/pet_control/pet_remote_glyphs.h b/engines/titanic/pet_control/pet_remote_glyphs.h
index e6dfc115c0..d3541d6a94 100644
--- a/engines/titanic/pet_control/pet_remote_glyphs.h
+++ b/engines/titanic/pet_control/pet_remote_glyphs.h
@@ -38,7 +38,10 @@ enum RemoteGlyph {
 	GLYPH_DEPLOY_WORK_SURFACE = 12, GLYPH_DEPLOY_MINOR_RELAXATION = 13,
 	GLYPH_DEPLOY_SINK = 14, GLYPH_DEPLOY_MAJOR_STORAGE = 15,
 	GLYPH_SUCCUBUS_DELIVERY = 16, GLYPH_NAVIGATION_CONTROLLER = 17,
-	GLYPH_BOTTOM_OF_WELL = 18
+	GLYPH_GOTO_BOTTOM_OF_WELL = 18, GLYPH_GOTO_TOP_OF_WELL = 19,
+	GLYPH_GOTO_STATEROOM = 20, GLYPH_GOTO_BAR = 21,
+	GLYPH_GOTO_PROMENADE = 22, GLYPH_GOTO_ARBORETUM = 23,
+	GLYPH_GOTO_MUSIC_ROOM = 24, GLYPH_GOTO_RESTAURANT = 25
 };
 
 enum RemoteMessage {
@@ -148,8 +151,12 @@ class CRemoteGotoGlyph : public CPetRemoteGlyph {
 protected:
 	int _roomIndex;
 	CPetGfxElement *_gfxElement;
+	CString _gfxName, _tooltip;
 public:
 	CRemoteGotoGlyph() : CPetRemoteGlyph(), _gfxElement(nullptr), _roomIndex(21) {}
+	CRemoteGotoGlyph(const CString &gfxName, const CString &tooltip) : 
+		CPetRemoteGlyph(), _gfxElement(nullptr), _roomIndex(21),
+		_gfxName(gfxName), _tooltip(tooltip) {}
 
 	/**
 	 * Setup the glyph
@@ -170,6 +177,11 @@ public:
 	 * Handles mouse button up messages
 	 */
 	virtual bool MouseButtonUpMsg(const Point &pt);
+	
+	/**
+	 * Returns the tooltip text for when the glyph is selected
+	 */
+	virtual void getTooltip(CPetText *text);
 };
 
 class CSummonElevatorGlyph : public CBasicRemoteGlyph {
@@ -650,19 +662,52 @@ public:
 	virtual void getTooltip(CPetText *text);
 };
 
-class CBottomOfWellGlyph : public CRemoteGotoGlyph {
+class CGotoBottomOfWellGlyph : public CRemoteGotoGlyph {
 public:
-	CBottomOfWellGlyph() : CRemoteGotoGlyph() {}
+	CGotoBottomOfWellGlyph() : CRemoteGotoGlyph("3PetBotOfWell",
+		"Go to the Bottom of the Well") {}
+};
 
-	/**
-	 * Setup the glyph
-	 */
-	virtual bool setup(CPetControl *petControl, CPetGlyphs *owner);
+class CGotoTopOfWellGlyph : public CRemoteGotoGlyph {
+public:
+	CGotoTopOfWellGlyph() : CRemoteGotoGlyph("3PetTopOfWell",
+		"Go to the Top of the Well") {}
+};
 
-	/**
-	 * Returns the tooltip text for when the glyph is selected
-	 */
-	virtual void getTooltip(CPetText *text);
+class CGotoStateroomGlyph : public CRemoteGotoGlyph {
+public:
+	CGotoStateroomGlyph() : CRemoteGotoGlyph("3PetRoom",
+		"Go to your stateroom") {}
+};
+
+class CGotoBarGlyph : public CRemoteGotoGlyph {
+public:
+	CGotoBarGlyph() : CRemoteGotoGlyph("3PetBar",
+		"Go to the Bar") {}
+};
+
+class CGotoPromenadeDeckGlyph : public CRemoteGotoGlyph {
+public:
+	CGotoPromenadeDeckGlyph() : CRemoteGotoGlyph("3PetPromDeck",
+		"Go to the Promenade Deck") {}
+};
+
+class CGotoArboretumGlyph : public CRemoteGotoGlyph {
+public:
+	CGotoArboretumGlyph() : CRemoteGotoGlyph("3PetArboretum",
+		"Go to the Arboretum") {}
+};
+
+class CGotoMusicRoomGlyph : public CRemoteGotoGlyph {
+public:
+	CGotoMusicRoomGlyph() : CRemoteGotoGlyph("3PetMusicRoom",
+		"Go to the Music Room") {}
+};
+
+class CGotoRestaurantGlyph : public CRemoteGotoGlyph {
+public:
+	CGotoRestaurantGlyph() : CRemoteGotoGlyph("3Pet1stClassRest",
+		"Go to the First Class Restaurant") {}
 };
 
 } // End of namespace Titanic