[Scummvm-git-logs] scummvm master -> 8c52ef42b5a96a4edfdef95174cf02f739287015

dreammaster dreammaster at scummvm.org
Fri Nov 11 03:46:10 CET 2016


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
8c52ef42b5 TITANIC: Fix implementation of CPETTransport class


Commit: 8c52ef42b5a96a4edfdef95174cf02f739287015
    https://github.com/scummvm/scummvm/commit/8c52ef42b5a96a4edfdef95174cf02f739287015
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-11-10T21:46:02-05:00

Commit Message:
TITANIC: Fix implementation of CPETTransport class

Changed paths:
    engines/titanic/game/pet/pet_transport.cpp
    engines/titanic/game/pet/pet_transport.h



diff --git a/engines/titanic/game/pet/pet_transport.cpp b/engines/titanic/game/pet/pet_transport.cpp
index a48e70e..29dce6c 100644
--- a/engines/titanic/game/pet/pet_transport.cpp
+++ b/engines/titanic/game/pet/pet_transport.cpp
@@ -26,6 +26,7 @@ namespace Titanic {
 
 BEGIN_MESSAGE_MAP(CPETTransport, CGameObject)
 	ON_MESSAGE(EnterRoomMsg)
+	ON_MESSAGE(LeaveRoomMsg)
 END_MESSAGE_MAP()
 
 void CPETTransport::save(SimpleFile *file, int indent) {
@@ -39,6 +40,11 @@ void CPETTransport::load(SimpleFile *file) {
 }
 
 bool CPETTransport::EnterRoomMsg(CEnterRoomMsg *msg) {
+	petSetRemoteTarget();
+	return true;
+}
+
+bool CPETTransport::LeaveRoomMsg(CLeaveRoomMsg *msg) {
 	petClear();
 	return true;
 }
diff --git a/engines/titanic/game/pet/pet_transport.h b/engines/titanic/game/pet/pet_transport.h
index 58aefe6..6a08c4b 100644
--- a/engines/titanic/game/pet/pet_transport.h
+++ b/engines/titanic/game/pet/pet_transport.h
@@ -31,6 +31,7 @@ namespace Titanic {
 class CPETTransport : public CGameObject {
 	DECLARE_MESSAGE_MAP;
 	virtual bool EnterRoomMsg(CEnterRoomMsg *msg);
+	virtual bool LeaveRoomMsg(CLeaveRoomMsg *msg);
 public:
 	CLASSDEF;
 





More information about the Scummvm-git-logs mailing list