TITANIC: Implemented some stubbed methods

scummvm · Aug 28, 2016 · f114f9e · f114f9e
1 parent 01327b5
commit f114f9e
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 12 deletions.
diff --git a/engines/titanic/carry/carry.h b/engines/titanic/carry/carry.h
@@ -44,7 +44,6 @@ class CCarry : public CGameObject {
 	bool EnterViewMsg(CEnterViewMsg *msg);
 	bool PassOnDragStartMsg(CPassOnDragStartMsg *msg);
 protected:
-	CString _string1;
 	int _fieldDC;
 	CString _string3;
 	CString _string4;
@@ -59,6 +58,7 @@ class CCarry : public CGameObject {
 	bool _enterFrameSet;
 	int _visibleFrame;
 public:
+	CString _string1;
 	int _fieldE0;
 	Point _origPos;
 	CString _fullViewName;

diff --git a/engines/titanic/npcs/bellbot.cpp b/engines/titanic/npcs/bellbot.cpp
@@ -135,8 +135,7 @@ bool CBellBot::MovieEndMsg(CMovieEndMsg *msg) {
 }
 
 bool CBellBot::Use(CUse *msg) {
-	error("TODO: Figure out what msg->_item points to");
-	//	msg->_item = "Bellbot";
+	dynamic_cast<CCarry *>(msg->_item)->_string1 = "Bellbot";
 	return true;
 }
 

diff --git a/engines/titanic/pet_control/pet_control.cpp b/engines/titanic/pet_control/pet_control.cpp
@@ -359,7 +359,8 @@ bool CPetControl::VirtualKeyCharMsg(CVirtualKeyCharMsg *msg) {
 }
 
 bool CPetControl::TimerMsg(CTimerMsg *msg) {
-	warning("TODO: CPetControl::CTimerMsg");
+	if (_timers[msg->_actionVal]._target)
+		_timers[msg->_actionVal]._target->timerExpired(msg->_actionVal);
 	return true;
 }
 

diff --git a/engines/titanic/pet_control/pet_load_save.h b/engines/titanic/pet_control/pet_load_save.h
@@ -37,11 +37,6 @@ class CPetLoadSave : public CPetGlyph {
 	 */
 	Rect getSlotBounds(int index);
 
-	/**
-	 * Highlight one of the slots
-	 */
-	void highlightSlot(int index);
-
 	/**
 	 * Called when savegame slot highlight changes or the view is reset
 	 */
@@ -67,6 +62,11 @@ class CPetLoadSave : public CPetGlyph {
 	 * Reset the slot names list
 	 */
 	void resetSlots();
+
+	/**
+	 * Highlight one of the slots
+	 */
+	void highlightSlot(int index);
 public:
 	/**
 	 * Setup the glyph

diff --git a/engines/titanic/pet_control/pet_save.cpp b/engines/titanic/pet_control/pet_save.cpp
@@ -22,6 +22,7 @@
 
 #include "titanic/pet_control/pet_save.h"
 #include "titanic/pet_control/pet_control.h"
+#include "titanic/core/project_item.h"
 
 namespace Titanic {
 
@@ -58,15 +59,28 @@ void CPetSave::getTooltip(CPetText *text) {
 }
 
 void CPetSave::highlightSave(int index) {
-	warning("TODO: CPetSave::highlightSave");
+	if (index >= 0)
+		_slotNames[index].showCursor(-2);
 }
 
 void CPetSave::unhighlightSave(int index) {
-	warning("TODO: CPetSave::unhighlightSave");
+	if (index >= 0)
+		_slotNames[index].hideCursor();
 }
 
 void CPetSave::execute() {
-	warning("TODO: CPetSave::execute");
+	CPetControl *pet = getPetControl();
+	if (_savegameSlotNum >= 0) {
+		highlightSlot(-1);
+		CProjectItem *project = pet ? pet->getRoot() : nullptr;
+
+		if (project) {
+			project->saveGame(_savegameSlotNum, _slotNames[_savegameSlotNum].getText());
+			pet->displayMessage("");
+		}
+	} else if (pet) {
+		pet->displayMessage("You must select a game to save first.");
+	}
 }
 
 } // End of namespace Titanic