[Scummvm-git-logs] scummvm master -> 99bc212ccc4b241c490deaa598a0303bdca16a1b
dreammaster
dreammaster at scummvm.org
Sat Jan 21 05:58:06 CET 2017
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:
99bc212ccc TITANIC: Excite Parrot when we come bearing chicken
Commit: 99bc212ccc4b241c490deaa598a0303bdca16a1b
https://github.com/scummvm/scummvm/commit/99bc212ccc4b241c490deaa598a0303bdca16a1b
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-01-20T23:57:59-05:00
Commit Message:
TITANIC: Excite Parrot when we come bearing chicken
Changed paths:
engines/titanic/true_talk/parrot_script.cpp
diff --git a/engines/titanic/true_talk/parrot_script.cpp b/engines/titanic/true_talk/parrot_script.cpp
index 25b54f0..f44b9d3 100644
--- a/engines/titanic/true_talk/parrot_script.cpp
+++ b/engines/titanic/true_talk/parrot_script.cpp
@@ -76,7 +76,7 @@ ScriptChangedResult ParrotScript::scriptChanged(const TTroomScript *roomScript,
} else {
if ((id == 280146 || id == 280147) && CTrueTalkManager::_currentNPC) {
CGameObject *chicken;
- if (CTrueTalkManager::_currentNPC->find("Chicken", &chicken, FIND_PET))
+ if (!CTrueTalkManager::_currentNPC->find("Chicken", &chicken, FIND_PET))
id = 280142;
}
@@ -90,7 +90,7 @@ ScriptChangedResult ParrotScript::scriptChanged(const TTroomScript *roomScript,
if (id >= 80000 && id <= 80244) {
if ((id == 80155 || id == 80156) && CTrueTalkManager::_currentNPC) {
CGameObject *chicken;
- if (CTrueTalkManager::_currentNPC->find("Chicken", &chicken, FIND_PET))
+ if (!CTrueTalkManager::_currentNPC->find("Chicken", &chicken, FIND_PET))
id = 80151;
}
More information about the Scummvm-git-logs
mailing list