[Scummvm-git-logs] scummvm master -> aefbd436eb138caac623e16bdef6d34714b55eb3

[dreammaster]

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

Summary:
0b64923b82 TITANIC: Fix succubus registering mail receipt
aefbd436eb TITANIC: Field renaming for CSuccubusDeliveryGlyph


Commit: 0b64923b827bd05b14e56aa58f742726c33390f3
    https://github.com/scummvm/scummvm/commit/0b64923b827bd05b14e56aa58f742726c33390f3
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-12-01T21:49:15-05:00

Commit Message:
TITANIC: Fix succubus registering mail receipt

Changed paths:
    engines/titanic/npcs/succubus.cpp


diff --git a/engines/titanic/npcs/succubus.cpp b/engines/titanic/npcs/succubus.cpp
index 806b144..956f2ca 100644
--- a/engines/titanic/npcs/succubus.cpp
+++ b/engines/titanic/npcs/succubus.cpp
@@ -479,8 +479,8 @@ bool CSuccUBus::PETReceiveMsg(CPETReceiveMsg *msg) {
 			break;
 		}
 	} else {
-		CGameObject *mailObject = findMailByFlags(compareRoomNameTo("Titania")
-			? 3 : _field140, petRoomFlags);
+		CGameObject *mailObject = findMailByFlags(
+			_v3 && compareRoomNameTo("Titania") ? 3 : _field140, petRoomFlags);
 		if (!mailObject) {
 			if (getRandomNumber(1) == 0) {
 				startTalking(this, 70104, findView());
@@ -492,6 +492,7 @@ bool CSuccUBus::PETReceiveMsg(CPETReceiveMsg *msg) {
 			playMovie(_startFrame7, _endFrame7, 0);
 			petDisplayMessage(2, NOTHING_TO_DELIVER);
 		} else {
+			_mailP = mailObject;
 			startTalking(this, 230004, findView());
 
 			if (_startFrame4 >= 0) {


Commit: aefbd436eb138caac623e16bdef6d34714b55eb3
    https://github.com/scummvm/scummvm/commit/aefbd436eb138caac623e16bdef6d34714b55eb3
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-12-01T21:49:34-05:00

Commit Message:
TITANIC: Field renaming for CSuccubusDeliveryGlyph

Changed paths:
    engines/titanic/pet_control/pet_remote_glyphs.cpp
    engines/titanic/pet_control/pet_remote_glyphs.h


diff --git a/engines/titanic/pet_control/pet_remote_glyphs.cpp b/engines/titanic/pet_control/pet_remote_glyphs.cpp
index 8e27797..0116aa9 100644
--- a/engines/titanic/pet_control/pet_remote_glyphs.cpp
+++ b/engines/titanic/pet_control/pet_remote_glyphs.cpp
@@ -478,32 +478,32 @@ bool CSuccubusDeliveryGlyph::setup(CPetControl *petControl, CPetGlyphs *owner) {
 	setDefaults("3PetSuccubus", petControl);
 
 	if (owner) {
-		_gfxElement1 = getElement(16);
-		_gfxElement2 = getElement(17);
+		_send = getElement(16);
+		_receive = getElement(17);
 	}
 
 	return true;
 }
 
 void CSuccubusDeliveryGlyph::draw2(CScreenManager *screenManager) {
-	_gfxElement1->draw(screenManager);
-	_gfxElement2->draw(screenManager);
+	_send->draw(screenManager);
+	_receive->draw(screenManager);
 }
 
 bool CSuccubusDeliveryGlyph::MouseButtonDownMsg(const Point &pt) {
-	return _gfxElement1->MouseButtonDownMsg(pt)
-		|| _gfxElement2->MouseButtonDownMsg(pt);
+	return _send->MouseButtonDownMsg(pt)
+		|| _receive->MouseButtonDownMsg(pt);
 }
 
 bool CSuccubusDeliveryGlyph::MouseButtonUpMsg(const Point &pt) {
 	CTreeItem *target = getPetControl()->_remoteTarget;
 
-	if (_gfxElement1 && _gfxElement1->MouseButtonUpMsg(pt)) {
+	if (_send && _send->MouseButtonUpMsg(pt)) {
 		if (target) {
 			CPETDeliverMsg msg;
 			msg.execute(target);
 		}
-	} else if (_gfxElement2 && _gfxElement2->MouseButtonUpMsg(pt)) {
+	} else if (_receive && _receive->MouseButtonUpMsg(pt)) {
 		if (target) {
 			CPETReceiveMsg msg;
 			msg.execute(target);
diff --git a/engines/titanic/pet_control/pet_remote_glyphs.h b/engines/titanic/pet_control/pet_remote_glyphs.h
index d0edd6f..691a70f 100644
--- a/engines/titanic/pet_control/pet_remote_glyphs.h
+++ b/engines/titanic/pet_control/pet_remote_glyphs.h
@@ -595,10 +595,10 @@ public:
 
 class CSuccubusDeliveryGlyph : public CPetRemoteGlyph {
 private:
-	CPetGfxElement *_gfxElement1, *_gfxElement2;
+	CPetGfxElement *_send, *_receive;
 public:
 	CSuccubusDeliveryGlyph() : CPetRemoteGlyph(),
-		_gfxElement1(nullptr), _gfxElement2(nullptr) {}
+		_send(nullptr), _receive(nullptr) {}
 
 	/**
 	 * Setup the glyph