[Scummvm-git-logs] scummvm master -> 95864c83487ba22cc8e63d8529c575de513e6ecf

[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:
95864c8348 TITANIC: Simplify TTconceptNode setConcept


Commit: 95864c83487ba22cc8e63d8529c575de513e6ecf
    https://github.com/scummvm/scummvm/commit/95864c83487ba22cc8e63d8529c575de513e6ecf
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-01-25T19:38:55-05:00

Commit Message:
TITANIC: Simplify TTconceptNode setConcept

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


diff --git a/engines/titanic/true_talk/tt_concept_node.cpp b/engines/titanic/true_talk/tt_concept_node.cpp
index 5a79158..4573516 100644
--- a/engines/titanic/true_talk/tt_concept_node.cpp
+++ b/engines/titanic/true_talk/tt_concept_node.cpp
@@ -65,26 +65,8 @@ void TTconceptNode::deleteSiblings() {
 }
 
 TTconcept **TTconceptNode::setConcept(int conceptIndex, TTconcept *src) {
-	TTconcept **conceptPP = &_concept0P;
-	switch (conceptIndex) {
-	case 1:
-		conceptPP = &_concept1P;
-		break;
-	case 2:
-		conceptPP = &_concept2P;
-		break;
-	case 3:
-		conceptPP = &_concept3P;
-		break;
-	case 4:
-		conceptPP = &_concept4P;
-		break;
-	case 5:
-		conceptPP = &_concept5P;
-		break;
-	default:
-		break;
-	}
+	assert(conceptIndex >= 0 && conceptIndex <= 5);
+	TTconcept **conceptPP = &_concepts[conceptIndex];
 
 	if (src) {
 		bool isPronoun = false;