aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorPaul Gilbert2016-10-13 23:10:10 -0400
committerPaul Gilbert2016-10-13 23:10:10 -0400
commita8dd2856b71bbb452cb122f9fca117b40314f17f (patch)
tree1f9112f8b96f0ed961c371b9e02c1f0ad82e8ff6 /engines
parenta350cc8fd090e20da69045cffda0bfd7bacc8d69 (diff)
downloadscummvm-rg350-a8dd2856b71bbb452cb122f9fca117b40314f17f.tar.gz
scummvm-rg350-a8dd2856b71bbb452cb122f9fca117b40314f17f.tar.bz2
scummvm-rg350-a8dd2856b71bbb452cb122f9fca117b40314f17f.zip
TITANIC: Fix getting NPC animation name lists
Diffstat (limited to 'engines')
-rw-r--r--engines/titanic/npcs/doorbot.cpp8
-rw-r--r--engines/titanic/npcs/liftbot.cpp2
-rw-r--r--engines/titanic/npcs/parrot.cpp6
-rw-r--r--engines/titanic/npcs/true_talk_npc.cpp2
4 files changed, 9 insertions, 9 deletions
diff --git a/engines/titanic/npcs/doorbot.cpp b/engines/titanic/npcs/doorbot.cpp
index 41ef2b2366..b9a46426bc 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 272617ee62..64bc7c4989 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 358a86686f..97a1944fef 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 c677687b27..ab0401a705 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) {