[Scummvm-git-logs] scummvm master -> 43dc1c6f954b060e765ab506904781f69d8732f7

dreammaster dreammaster at scummvm.org
Sun Oct 30 00:39:37 CEST 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:
43dc1c6f95 TITANIC: Fix to Doorbot talking animations selection


Commit: 43dc1c6f954b060e765ab506904781f69d8732f7
    https://github.com/scummvm/scummvm/commit/43dc1c6f954b060e765ab506904781f69d8732f7
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-10-29T18:39:30-04:00

Commit Message:
TITANIC: Fix to Doorbot talking animations selection

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



diff --git a/engines/titanic/npcs/doorbot.cpp b/engines/titanic/npcs/doorbot.cpp
index 567f7a5..247a820 100644
--- a/engines/titanic/npcs/doorbot.cpp
+++ b/engines/titanic/npcs/doorbot.cpp
@@ -340,11 +340,17 @@ bool CDoorbot::NPCPlayTalkingAnimationMsg(CNPCPlayTalkingAnimationMsg *msg) {
 
 	if (msg->_value2 != 2) {
 		if (_npcFlags & NPCFLAG_200000) {
-			if (_introMovieNum == 8 || _field110) {
+			switch (_introMovieNum) {
+			case 8:
+			case 10:
 				msg->_names = NAMES2;
-			} else if (_introMovieNum == 9) {
+				break;
+			case 9:
 				msg->_names = NAMES3;
 				_introMovieNum = 10;
+				break;
+			default:
+				break;
 			}
 		} else if (_npcFlags & (NPCFLAG_100000 | NPCFLAG_400000)) {
 			msg->_names = NAMES1;





More information about the Scummvm-git-logs mailing list