[Scummvm-git-logs] scummvm master -> 5455b81e6ec3cd9853766306bf2002e9358a7527
dreammaster
dreammaster at scummvm.org
Sat Jun 24 02:27:47 CEST 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:
5455b81e6e TITANIC: Fix parrot idle animations
Commit: 5455b81e6ec3cd9853766306bf2002e9358a7527
https://github.com/scummvm/scummvm/commit/5455b81e6ec3cd9853766306bf2002e9358a7527
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-06-23T20:27:40-04:00
Commit Message:
TITANIC: Fix parrot idle animations
Changed paths:
engines/titanic/npcs/parrot.cpp
diff --git a/engines/titanic/npcs/parrot.cpp b/engines/titanic/npcs/parrot.cpp
index e1f113f..b46a9bc 100644
--- a/engines/titanic/npcs/parrot.cpp
+++ b/engines/titanic/npcs/parrot.cpp
@@ -465,10 +465,10 @@ bool CParrot::NPCPlayIdleAnimationMsg(CNPCPlayIdleAnimationMsg *msg) {
if (!(_npcFlags & (NPCFLAG_MOVING | NPCFLAG_MOVE_START | NPCFLAG_MOVE_LOOP | NPCFLAG_MOVE_FINISH
| NPCFLAG_MOVE_LEFT | NPCFLAG_MOVE_RIGHT | NPCFLAG_MOVE_END))
- && _visible && _state == PARROT_IN_CAGE && !compareViewNameTo("ParrotLobby.Node 1.N")) {
+ && _visible && _state == PARROT_IN_CAGE && compareViewNameTo("ParrotLobby.Node 1.N")) {
CGameObject *dragItem = getDraggingObject();
if (!dragItem || dragItem->getName() == "Chicken") {
- if (!_coreReplaced ||getRandomNumber(3) != 0) {
+ if (!_coreReplaced || getRandomNumber(3) != 0) {
if (getRandomNumber(1)) {
startTalking(this, 280267, findView());
} else {
More information about the Scummvm-git-logs
mailing list