[Scummvm-git-logs] scummvm master -> f9a86a699566c2248810e5ea5379c328c0192be7
dreammaster
dreammaster at scummvm.org
Tue Sep 19 02:17:43 CEST 2017
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:
f9a86a6995 TITANIC: DE: Fixes for checking in
Commit: f9a86a699566c2248810e5ea5379c328c0192be7
https://github.com/scummvm/scummvm/commit/f9a86a699566c2248810e5ea5379c328c0192be7
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-09-18T20:17:36-04:00
Commit Message:
TITANIC: DE: Fixes for checking in
Changed paths:
engines/titanic/npcs/bellbot.cpp
engines/titanic/npcs/deskbot.cpp
diff --git a/engines/titanic/npcs/bellbot.cpp b/engines/titanic/npcs/bellbot.cpp
index d38004c..80c1121 100644
--- a/engines/titanic/npcs/bellbot.cpp
+++ b/engines/titanic/npcs/bellbot.cpp
@@ -23,8 +23,9 @@
#include "titanic/npcs/bellbot.h"
#include "titanic/carry/carry.h"
#include "titanic/core/room_item.h"
-#include "titanic/game_manager.h"
#include "titanic/pet_control/pet_control.h"
+#include "titanic/game_manager.h"
+#include "titanic/translation.h"
namespace Titanic {
@@ -66,26 +67,31 @@ bool CBellBot::OnSummonBotMsg(COnSummonBotMsg *msg) {
if (msg->_value == 1) {
_npcFlags |= NPCFLAG_MOVE_LOOP;
} else {
- static const char *const ROOM_WAVES[8][2] = {
- { "EmbLobby", "z#193.wav" },
- { "PromenadeDeck", "z#191.wav" },
- { "Arboretum", "z#195.wav" },
- { "Frozen Arboretum", "z#195.wav" },
- { "Bar", "z#194.wav" },
- { "MusicRoom", "z#192.wav" },
- { "MusicRoomLobby", "z#192.wav" },
- { "1stClassRestaurant", "z#190.wav" }
+ struct RoomWave {
+ const char *_room;
+ const char *_enSound;
+ const char *_deSound;
+ };
+ static const RoomWave ROOM_WAVES[8] = {
+ { "EmbLobby", "z#193.wav", "z#723.wav" },
+ { "PromenadeDeck", "z#191.wav", "z#721.wav" },
+ { "Arboretum", "z#195.wav", "z#725.wav" },
+ { "Frozen Arboretum", "z#195.wav", "z#725.wav" },
+ { "Bar", "z#194.wav", "z#724.wav" },
+ { "MusicRoom", "z#192.wav", "z#722.wav" },
+ { "MusicRoomLobby", "z#192.wav", "z#722.wav" },
+ { "1stClassRestaurant", "z#190.wav", "z#720.wav" }
};
int idx;
for (idx = 0; idx < 8; ++idx) {
- if (compareRoomNameTo(ROOM_WAVES[idx][0])) {
- playSound(ROOM_WAVES[idx][1]);
+ if (compareRoomNameTo(ROOM_WAVES[idx]._room)) {
+ playSound(TRANSLATE(ROOM_WAVES[idx]._enSound, ROOM_WAVES[idx]._deSound));
break;
}
}
if (idx == 8)
- playSound("z#147.wav");
+ playSound(TRANSLATE("z#147.wav", "z#703.wav"));
sleep(2000);
_npcFlags &= ~NPCFLAG_MOVE_LOOP;
@@ -285,7 +291,7 @@ bool CBellBot::TrueTalkGetStateValueMsg(CTrueTalkGetStateValueMsg *msg) {
bool CBellBot::TrueTalkNotifySpeechEndedMsg(CTrueTalkNotifySpeechEndedMsg *msg) {
CTrueTalkNPC::TrueTalkNotifySpeechEndedMsg(msg);
- if (msg->_dialogueId == 20991) {
+ if (msg->_dialogueId == TRANSLATE(20991, 20997)) {
petDismissBot("DoorBot");
getGameManager()->unlockInputHandler();
}
diff --git a/engines/titanic/npcs/deskbot.cpp b/engines/titanic/npcs/deskbot.cpp
index aeba3ba..aa9ec7e 100644
--- a/engines/titanic/npcs/deskbot.cpp
+++ b/engines/titanic/npcs/deskbot.cpp
@@ -120,7 +120,7 @@ bool CDeskbot::MovieEndMsg(CMovieEndMsg *msg) {
petSetArea(PET_ROOMS);
decTransitions();
unlockMouse();
- playSound("z#47.wav");
+ playSound(TRANSLATE("z#47.wav", "z#578.wav"));
_classNum = NO_CLASS;
}
@@ -260,16 +260,31 @@ bool CDeskbot::TrueTalkNotifySpeechStartedMsg(CTrueTalkNotifySpeechStartedMsg *m
return true;
CTrueTalkNPC::TrueTalkNotifySpeechStartedMsg(msg);
- switch (msg->_dialogueId) {
- case 41684:
- case 41686:
- case 41787:
- case 41788:
- case 41789:
- lockMouse();
- break;
- default:
- break;
+
+ if (g_language == Common::DE_DEU) {
+ switch (msg->_dialogueId) {
+ case 41701:
+ case 41703:
+ case 41804:
+ case 41805:
+ case 41806:
+ lockMouse();
+ break;
+ default:
+ break;
+ }
+ } else {
+ switch (msg->_dialogueId) {
+ case 41684:
+ case 41686:
+ case 41787:
+ case 41788:
+ case 41789:
+ lockMouse();
+ break;
+ default:
+ break;
+ }
}
return true;
@@ -281,23 +296,43 @@ bool CDeskbot::TrueTalkNotifySpeechEndedMsg(CTrueTalkNotifySpeechEndedMsg *msg)
CTurnOff turnOff;
CTrueTalkNPC::TrueTalkNotifySpeechEndedMsg(msg);
+
+ if (g_language == Common::DE_DEU) {
+ switch (msg->_dialogueId) {
+ case 41701:
+ case 41804:
+ case 41805:
+ case 41806:
+ _npcFlags |= NPCFLAG_MOVE_FINISH;
+ turnOff.execute(this);
+ break;
- switch (msg->_dialogueId) {
- case 41684:
- case 41787:
- case 41788:
- case 41789:
- _npcFlags |= NPCFLAG_MOVE_FINISH;
- turnOff.execute(this);
- break;
+ case 41703:
+ _npcFlags |= NPCFLAG_MOVE_LEFT;
+ turnOff.execute(this);
+ break;
- case 41686:
- _npcFlags |= NPCFLAG_MOVE_LEFT;
- turnOff.execute(this);
- break;
+ default:
+ break;
+ }
+ } else {
+ switch (msg->_dialogueId) {
+ case 41684:
+ case 41787:
+ case 41788:
+ case 41789:
+ _npcFlags |= NPCFLAG_MOVE_FINISH;
+ turnOff.execute(this);
+ break;
- default:
- break;
+ case 41686:
+ _npcFlags |= NPCFLAG_MOVE_LEFT;
+ turnOff.execute(this);
+ break;
+
+ default:
+ break;
+ }
}
return true;
More information about the Scummvm-git-logs
mailing list