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

[dreammaster]

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:
ede1cbc4ca TITANIC: Removed dead code from CParrot::ActMsg


Commit: ede1cbc4cadbdb56d28e0c67d0eb69c81a66971f
    https://github.com/scummvm/scummvm/commit/ede1cbc4cadbdb56d28e0c67d0eb69c81a66971f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-08-15T19:42:41-04:00

Commit Message:
TITANIC: Removed dead code from CParrot::ActMsg

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


diff --git a/engines/titanic/npcs/parrot.cpp b/engines/titanic/npcs/parrot.cpp
index 60d11c0..a0f80ca 100644
--- a/engines/titanic/npcs/parrot.cpp
+++ b/engines/titanic/npcs/parrot.cpp
@@ -119,10 +119,7 @@ void CParrot::load(SimpleFile *file) {
 }
 
 bool CParrot::ActMsg(CActMsg *msg) {
-	if (msg->_action == "PistaccioEaten") {
-		CActMsg actMsg("NutsEaten");
-		actMsg.execute("Ear2");
-	} else if (msg->_action == "Chicken") {
+	if (msg->_action == "Chicken") {
 		// Nothing to do
 	} else if (msg->_action == "CarryParrotLeftView") {
 		if (!_takeOff) {