TITANIC: Implemented more game classes

2 files changed, 26 insertions, 0 deletions

diff --git a/engines/titanic/carry/hammer.cpp b/engines/titanic/carry/hammer.cpp
index d3b912184c..88c766d564 100644
--- a/engines/titanic/carry/hammer.cpp
+++ b/engines/titanic/carry/hammer.cpp
@@ -24,6 +24,11 @@
 
 namespace Titanic {
 
+BEGIN_MESSAGE_MAP(CHammer, CCarry)
+	ON_MESSAGE(PuzzleSolvedMsg)
+	ON_MESSAGE(UseWithOtherMsg)
+END_MESSAGE_MAP()
+
 CHammer::CHammer() : CCarry() {
 }
 
@@ -37,4 +42,22 @@ void CHammer::load(SimpleFile *file) {
 	CCarry::load(file);
 }
 
+bool CHammer::PuzzleSolvedMsg(CPuzzleSolvedMsg *msg) {
+	_fieldE0 = 1;
+	return true;
+}
+
+bool CHammer::UseWithOtherMsg(CUseWithOtherMsg *msg) {
+	CString name = msg->_other->getName();
+	if (name == "LongStickDispenser") {
+		CPuzzleSolvedMsg solvedMsg;
+		solvedMsg.execute("LongStickDispenser");
+	} else if (name == "Bomb") {
+		CActMsg actMsg("Hit");
+		actMsg.execute("Bomb");
+	}
+
+	return CCarry::UseWithOtherMsg(msg);
+}
+
 } // End of namespace Titanic
diff --git a/engines/titanic/carry/hammer.h b/engines/titanic/carry/hammer.h
index a455d71434..8cc86f3db1 100644
--- a/engines/titanic/carry/hammer.h
+++ b/engines/titanic/carry/hammer.h
@@ -28,6 +28,9 @@
 namespace Titanic {
 
 class CHammer : public CCarry {
+	DECLARE_MESSAGE_MAP;
+	bool PuzzleSolvedMsg(CPuzzleSolvedMsg *msg);
+	bool UseWithOtherMsg(CUseWithOtherMsg *msg);
 public:
 	CLASSDEF;
 	CHammer();