[Scummvm-git-logs] scummvm master -> d4e2697adba99d0c3e309f11c22e78ef2c6f81d7
dreammaster
dreammaster at scummvm.org
Sun Jan 15 18:08:55 CET 2017
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
45a42ec949 DEVTOOLS: Add missing string to create_titanic data
d4e2697adb TITANIC: Don't allow entering Arboretum Pellerator during winter
Commit: 45a42ec949d86098bf44d7e1e7615939d6fa09e2
https://github.com/scummvm/scummvm/commit/45a42ec949d86098bf44d7e1e7615939d6fa09e2
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-01-15T12:08:19-05:00
Commit Message:
DEVTOOLS: Add missing string to create_titanic data
Changed paths:
devtools/create_titanic/create_titanic_dat.cpp
diff --git a/devtools/create_titanic/create_titanic_dat.cpp b/devtools/create_titanic/create_titanic_dat.cpp
index 0454f87..e542c7e 100644
--- a/devtools/create_titanic/create_titanic_dat.cpp
+++ b/devtools/create_titanic/create_titanic_dat.cpp
@@ -416,10 +416,11 @@ static const BedheadEntry OFF_RESTING_D_WRONG[1] = {
{ "Any", "Any", "Any", "ClosedWrong", 59, 70 }
};
-static const char *const STRINGS_EN[137] = {
+static const char *const STRINGS_EN[138] = {
"",
"You are standing outside the Pellerator.",
"I'm sorry, you cannot enter this pellerator at present as a bot is in the way.",
+ "I'm sorry, you cannot enter this pellerator at present as it's frozen shut",
"The Succ-U-Bus is in Standby, or \"Off\" mode at present.",
"There is currently nothing to deliver.",
"There is currently nothing in the tray to send.",
@@ -561,10 +562,12 @@ static const char *const STRINGS_EN[137] = {
"Current location: "
};
-static const char *const STRINGS_DE[182] = {
+static const char *const STRINGS_DE[183] = {
// TODO: Still many strings to translate to German
"",
"Sie befinden sich vor dem Pellerator.",
+ "Wir bedauern, da ein Bot den Weg versperrt, ist Ihnen der "
+ "Zutritt zum Pellerator Ihnen gegenwSrtig verwehrt.",
"Wir bedauern, Zutritt zu diesem Pellerator ist nicht m\0xF6"
"glich, da die T\0xFC" "r zugefroren ist.",
"Der Sukk-U-Bus befindet sich gegenwSrtig im Standby-oder \"AUS\"-Betrieb.",
@@ -1250,8 +1253,8 @@ void writeData() {
writeStringArray("TEXT/ITEM_NAMES", ITEM_NAMES, 46);
writeStringArray("TEXT/ITEM_IDS", ITEM_IDS, 40);
writeStringArray("TEXT/ROOM_NAMES", ROOM_NAMES, 34);
- writeStringArray("TEXT/STRINGS", STRINGS_EN, 137);
- writeStringArray("TEXT/STRINGS/DE", STRINGS_DE, 182);
+ writeStringArray("TEXT/STRINGS", STRINGS_EN, 138);
+ writeStringArray("TEXT/STRINGS/DE", STRINGS_DE, 183);
const int TEXT_PHRASES[3] = { 0x61D3C8, 0x618340, 0x61B1E0 };
const int TEXT_REPLACEMENTS1[3] = { 0x61D9B0, 0x61C788, 0x61B7C8 };
const int TEXT_REPLACEMENTS2[3] = { 0x61DD20, 0x61CAF8, 0x61BB38 };
Commit: d4e2697adba99d0c3e309f11c22e78ef2c6f81d7
https://github.com/scummvm/scummvm/commit/d4e2697adba99d0c3e309f11c22e78ef2c6f81d7
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-01-15T12:08:46-05:00
Commit Message:
TITANIC: Don't allow entering Arboretum Pellerator during winter
Changed paths:
engines/titanic/moves/call_pellerator.cpp
engines/titanic/support/strings.h
diff --git a/engines/titanic/moves/call_pellerator.cpp b/engines/titanic/moves/call_pellerator.cpp
index 75edd50..e894dd8 100644
--- a/engines/titanic/moves/call_pellerator.cpp
+++ b/engines/titanic/moves/call_pellerator.cpp
@@ -65,6 +65,8 @@ bool CCallPellerator::PETActivateMsg(CPETActivateMsg *msg) {
if (msg->_name == "Pellerator") {
if (petDoorOrBellbotPresent()) {
petDisplayMessage(BOT_BLOCKING_PELLERATOR);
+ } else if (name == "FrozenArboretum.Node 4.E") {
+ petDisplayMessage(FROZEN_PELLERATOR);
} else if (name == "Bar.Node 1.S") {
changeView("Pellerator.Node 1.S");
} else {
diff --git a/engines/titanic/support/strings.h b/engines/titanic/support/strings.h
index 97928dc..1f231c4 100644
--- a/engines/titanic/support/strings.h
+++ b/engines/titanic/support/strings.h
@@ -31,6 +31,7 @@ enum StringId {
BLANK,
STANDING_OUTSIDE_PELLERATOR,
BOT_BLOCKING_PELLERATOR,
+ FROZEN_PELLERATOR,
SUCCUBUS_IS_IN_STANDBY,
NOTHING_TO_DELIVER,
NOTHING_IN_SUCCUBUS_TRAY,
More information about the Scummvm-git-logs
mailing list