[Scummvm-git-logs] scummvm master -> 81bf4476cd6237050caf4d6f8a5a1685cb77fa2a

dreammaster dreammaster at scummvm.org
Sat Dec 17 16:36:50 CET 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:
81bf4476cd TITANIC: Revert incorrect change to category check in processEntries


Commit: 81bf4476cd6237050caf4d6f8a5a1685cb77fa2a
    https://github.com/scummvm/scummvm/commit/81bf4476cd6237050caf4d6f8a5a1685cb77fa2a
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-12-17T10:36:47-05:00

Commit Message:
TITANIC: Revert incorrect change to category check in processEntries

Changed paths:
    engines/titanic/true_talk/tt_npc_script.cpp


diff --git a/engines/titanic/true_talk/tt_npc_script.cpp b/engines/titanic/true_talk/tt_npc_script.cpp
index 2a5c155..7540a73 100644
--- a/engines/titanic/true_talk/tt_npc_script.cpp
+++ b/engines/titanic/true_talk/tt_npc_script.cpp
@@ -707,7 +707,7 @@ int TTnpcScript::processEntries(const TTsentenceEntries *entries, uint entryCoun
 	for (uint loopCtr = 0; loopCtr < 2; ++loopCtr) {
 		for (uint entryCtr = 0; entryCtr < entryCount; ++entryCtr) {
 			const TTsentenceEntry &entry = (*entries)[entryCtr];
-			if (entry._category == categoryNum && (loopCtr == 0 || entry._category))
+			if (entry._category != categoryNum && (loopCtr == 0 || entry._category))
 				continue;
 
 			bool flag;





More information about the Scummvm-git-logs mailing list