[Scummvm-git-logs] scummvm master -> a8dd2856b71bbb452cb122f9fca117b40314f17f

[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:
a8dd2856b7 TITANIC: Fix getting NPC animation name lists


Commit: a8dd2856b71bbb452cb122f9fca117b40314f17f
    https://github.com/scummvm/scummvm/commit/a8dd2856b71bbb452cb122f9fca117b40314f17f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-10-13T23:10:10-04:00

Commit Message:
TITANIC: Fix getting NPC animation name lists

Changed paths:
    engines/titanic/npcs/doorbot.cpp
    engines/titanic/npcs/liftbot.cpp
    engines/titanic/npcs/parrot.cpp
    engines/titanic/npcs/true_talk_npc.cpp



diff --git a/engines/titanic/npcs/doorbot.cpp b/engines/titanic/npcs/doorbot.cpp
index 41ef2b2..b9a4642 100644
--- a/engines/titanic/npcs/doorbot.cpp
+++ b/engines/titanic/npcs/doorbot.cpp
@@ -319,16 +319,16 @@ bool CDoorbot::TimerMsg(CTimerMsg *msg) {
 }
 
 bool CDoorbot::NPCPlayTalkingAnimationMsg(CNPCPlayTalkingAnimationMsg *msg) {
-	const char *const NAMES1[] = {
+	static const char *const NAMES1[] = {
 		"Mutter Aside", "Rub Chin", "Drunken Eye Roll", "Drunken Head Move",
 		"Look down and mutter",  "Look side to side", "Gesture forward and around",
 		"Arms behind back", "Look down", "Rolling around", "Hold face",
 		"Touch chin", "Cross hands in front", nullptr
 	};
-	const char *const NAMES2[] = {
+	static const char *const NAMES2[] = {
 		"SE Talking 1", "SE Talking 2", "SE Talking 3", "SE Talking 4"
 	};
-	const char *const NAMES3[] = {
+	static const char *const NAMES3[] = {
 		"SE Ask For Help", nullptr
 	};
 
@@ -349,7 +349,7 @@ bool CDoorbot::NPCPlayTalkingAnimationMsg(CNPCPlayTalkingAnimationMsg *msg) {
 }
 
 bool CDoorbot::NPCPlayIdleAnimationMsg(CNPCPlayIdleAnimationMsg *msg) {
-	const char *const NAMES[] = {
+	static const char *const NAMES[] = {
 		"Hand swivel", "Prompt Push", "Eye Roll", "Say something", nullptr
 	};
 
diff --git a/engines/titanic/npcs/liftbot.cpp b/engines/titanic/npcs/liftbot.cpp
index 272617e..64bc7c4 100644
--- a/engines/titanic/npcs/liftbot.cpp
+++ b/engines/titanic/npcs/liftbot.cpp
@@ -156,7 +156,7 @@ bool CLiftBot::TrueTalkGetStateValueMsg(CTrueTalkGetStateValueMsg *msg) {
 }
 
 bool CLiftBot::NPCPlayTalkingAnimationMsg(CNPCPlayTalkingAnimationMsg *msg) {
-	const char *const NAMES[] = {
+	static const char *const NAMES[] = {
 		"Groaning", "Groaning 2", "Talking 1", "Talking 2", "Talking 3",
 		"Happy Talking", "Complaining", "Aggressive", "Explaining",
 		"Happy Talking 2", "Happy Talking 3", "Happy Talking 4"
diff --git a/engines/titanic/npcs/parrot.cpp b/engines/titanic/npcs/parrot.cpp
index 358a866..97a1944 100644
--- a/engines/titanic/npcs/parrot.cpp
+++ b/engines/titanic/npcs/parrot.cpp
@@ -410,7 +410,7 @@ bool CParrot::LeaveViewMsg(CLeaveViewMsg *msg) {
 }
 
 bool CParrot::ParrotSpeakMsg(CParrotSpeakMsg *msg) {
-	const char *const ROOM_NAMES[] = {
+	static const char *const ROOM_NAMES[] = {
 		"SGTState", "SGTLittleLift", "SecClassLittleLift", "SecClassState",
 		"Lift", "ServiceElevator", "Dome", "Home", "MoonEmbLobby", nullptr
 	};
@@ -477,7 +477,7 @@ bool CParrot::ParrotSpeakMsg(CParrotSpeakMsg *msg) {
 }
 
 bool CParrot::NPCPlayTalkingAnimationMsg(CNPCPlayTalkingAnimationMsg *msg) {
-	const char *const NAMES[] = {
+	static const char *const NAMES[] = {
 		"Talking0", "Talking1", "Talking2", "Talking3", "Talking4",
 		"Talking5", "Talking6", "Talking7", nullptr
 	};
@@ -492,7 +492,7 @@ bool CParrot::NPCPlayTalkingAnimationMsg(CNPCPlayTalkingAnimationMsg *msg) {
 }
 
 bool CParrot::NPCPlayIdleAnimationMsg(CNPCPlayIdleAnimationMsg *msg) {
-	const char *const NAMES[] = {
+	static const char *const NAMES[] = {
 		"Idle0", "Idle1", "Peck At Feet", "Peck At Feet Left"
 		"Peck At Feet Right", nullptr
 	};
diff --git a/engines/titanic/npcs/true_talk_npc.cpp b/engines/titanic/npcs/true_talk_npc.cpp
index c677687..ab0401a 100644
--- a/engines/titanic/npcs/true_talk_npc.cpp
+++ b/engines/titanic/npcs/true_talk_npc.cpp
@@ -109,7 +109,7 @@ bool CTrueTalkNPC::TrueTalkNotifySpeechStartedMsg(CTrueTalkNotifySpeechStartedMs
 			_npcFlags &= ~NPCFLAG_2;
 			stopMovie();
 
-			CNPCPlayTalkingAnimationMsg msg1(_speechDuration, 0, 0);
+			CNPCPlayTalkingAnimationMsg msg1(_speechDuration, 0, nullptr);
 			msg1.execute(this);
 
 			if (msg1._names) {