[Scummvm-git-logs] scummvm master -> 960ad3623f8ff735f77791026f3d4a38b8b1dd3e
dreammaster
dreammaster at scummvm.org
Sat Aug 26 18:40:18 CEST 2017
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
a929c5aabc TITANIC: Add further strings to create_titanic tool
003331c44c DEVTOOLS: Corrections to newly added German strings
6291eb75d0 TITANIC: Fix German strings in create_titanic, regenerate titanic.dat
960ad3623f TITANIC: Fix error setting correct PET buttons for a given area
Commit: a929c5aabc7093ce14126e9ae040c8260acf26a5
https://github.com/scummvm/scummvm/commit/a929c5aabc7093ce14126e9ae040c8260acf26a5
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-08-26T11:13:34-04:00
Commit Message:
TITANIC: Add further strings to create_titanic tool
Changed paths:
devtools/create_titanic/create_titanic_dat.cpp
engines/titanic/pet_control/pet_load.cpp
engines/titanic/pet_control/pet_load_save.cpp
engines/titanic/pet_control/pet_quit.cpp
engines/titanic/pet_control/pet_save.cpp
engines/titanic/pet_control/pet_sound.cpp
engines/titanic/support/files_manager.cpp
engines/titanic/support/strings.h
diff --git a/devtools/create_titanic/create_titanic_dat.cpp b/devtools/create_titanic/create_titanic_dat.cpp
index 3d5e447..5750db6 100644
--- a/devtools/create_titanic/create_titanic_dat.cpp
+++ b/devtools/create_titanic/create_titanic_dat.cpp
@@ -615,7 +615,7 @@ static const BedheadEntry OFF_RESTING_D_WRONG[1] = {
{ "Any", "Any", "Any", "ClosedWrong", 59, 70 }
};
-static const char *const STRINGS_EN[141] = {
+static const char *const STRINGS_EN[151] = {
"",
"You are standing outside the Pellerator.",
"I'm sorry, you cannot enter this pellerator at present as a bot is in the way.",
@@ -761,10 +761,20 @@ static const char *const STRINGS_EN[141] = {
"Saved Chevron: ",
"Current location: ",
"A hot",
- "A cold"
+ "A cold",
+ "Load the game.",
+ "Save the game.",
+ "Empty",
+ "Quit the game.",
+ "Are you sure you want to quit?",
+ "Change the volume settings",
+ "Master volume",
+ "Music volume",
+ "Parrot volume",
+ "Speech volume"
};
-static const char *const STRINGS_DE[186] = {
+static const char *const STRINGS_DE[196] = {
"",
"Sie befinden sich vor dem Pellerator.",
"Wir bedauern, da ein Bot den Weg versperrt, ist Ihnen der "
@@ -928,6 +938,16 @@ static const char *const STRINGS_DE[186] = {
"Derzeitige Position: ",
"Eine hei\xDF""e",
"Eine kalte",
+ "Laden Sie das Spiel.",
+ "Rette das Spiel.",
+ "Leer",
+ "Beenden Sie das Spiel.",
+ "Sind Sie sicher, dass Sie aufhören wollen?",
+ "Ändern der Lautstärkeeinstellungen",
+ "Master Volumen",
+ "Musiklautstärke",
+ "Papageienvolumen",
+ "Sprechband",
"Sommer",
"Herbst",
@@ -1550,8 +1570,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, 141);
- writeStringArray("TEXT/STRINGS/DE", STRINGS_DE, 186);
+ writeStringArray("TEXT/STRINGS", STRINGS_EN, 151);
+ writeStringArray("TEXT/STRINGS/DE", STRINGS_DE, 196);
const int TEXT_PHRASES[3] = { 0x61D3C8, 0x618340, 0x61B1E0 };
const int TEXT_REPLACEMENTS1[3] = { 0x61D9B0, 0x61C788, 0x61B7C8 };
const int TEXT_REPLACEMENTS2[3] = { 0x61DD20, 0x61CAF8, 0x61BB38 };
diff --git a/engines/titanic/pet_control/pet_load.cpp b/engines/titanic/pet_control/pet_load.cpp
index 1d81435..6c24c57 100644
--- a/engines/titanic/pet_control/pet_load.cpp
+++ b/engines/titanic/pet_control/pet_load.cpp
@@ -52,7 +52,7 @@ bool CPetLoad::MouseButtonUpMsg(const Point &pt) {
}
void CPetLoad::getTooltip(CTextControl *text) {
- text->setText("Load the game.");
+ text->setText(LOAD_THE_GAME);
}
void CPetLoad::execute() {
diff --git a/engines/titanic/pet_control/pet_load_save.cpp b/engines/titanic/pet_control/pet_load_save.cpp
index aa438c0..d918478 100644
--- a/engines/titanic/pet_control/pet_load_save.cpp
+++ b/engines/titanic/pet_control/pet_load_save.cpp
@@ -117,7 +117,7 @@ Rect CPetLoadSave::getSlotBounds(int index) {
void CPetLoadSave::resetSlots() {
for (int idx = 0; idx < SAVEGAME_SLOTS_COUNT; ++idx) {
- _slotNames[idx].setText("Empty");
+ _slotNames[idx].setText(EMPTY);
_slotInUse[idx] = false;
// Try and open up the savegame for access
diff --git a/engines/titanic/pet_control/pet_quit.cpp b/engines/titanic/pet_control/pet_quit.cpp
index 0d94474..b180bf8 100644
--- a/engines/titanic/pet_control/pet_quit.cpp
+++ b/engines/titanic/pet_control/pet_quit.cpp
@@ -53,7 +53,7 @@ bool CPetQuit::reset() {
setName("PetExit", pet);
uint col = getPetSection()->getColor(0);
- _text.setText("Are you sure you want to quit?");
+ _text.setText(SURE_YOU_WANT_TO_QUIT);
_text.setLineColor(0, col);
_btnYes.reset("PetQuitOut", pet, MODE_UNSELECTED);
@@ -84,7 +84,7 @@ bool CPetQuit::MouseButtonUpMsg(const Point &pt) {
}
void CPetQuit::getTooltip(CTextControl *text) {
- text->setText("Quit the game.");
+ text->setText(QUIT_THE_GAME);
}
} // End of namespace Titanic
diff --git a/engines/titanic/pet_control/pet_save.cpp b/engines/titanic/pet_control/pet_save.cpp
index 00dbfa6..16fe092 100644
--- a/engines/titanic/pet_control/pet_save.cpp
+++ b/engines/titanic/pet_control/pet_save.cpp
@@ -65,7 +65,7 @@ void CPetSave::highlightCurrent(const Point &pt) {
}
void CPetSave::getTooltip(CTextControl *text) {
- text->setText("Save the game.");
+ text->setText(SAVE_THE_GAME);
}
void CPetSave::highlightSave(int index) {
diff --git a/engines/titanic/pet_control/pet_sound.cpp b/engines/titanic/pet_control/pet_sound.cpp
index 1ba557a..085ee64 100644
--- a/engines/titanic/pet_control/pet_sound.cpp
+++ b/engines/titanic/pet_control/pet_sound.cpp
@@ -65,25 +65,25 @@ bool CPetSound::setup(CPetControl *petControl, CPetGlyphs *owner) {
_textMasterVolume.setBounds(rect);
_textMasterVolume.resize(3);
_textMasterVolume.setHasBorder(false);
- _textMasterVolume.setText("Master volume");
+ _textMasterVolume.setText(MASTER_VOLUME);
rect.translate(0, 20);
_textMusicVolume.setBounds(rect);
_textMusicVolume.resize(3);
_textMusicVolume.setHasBorder(false);
- _textMusicVolume.setText("Music volume");
+ _textMusicVolume.setText(MUSIC_VOLUME);
rect.translate(0, 20);
_textParrotVolume.setBounds(rect);
_textParrotVolume.resize(3);
_textParrotVolume.setHasBorder(false);
- _textParrotVolume.setText("Parrot volume");
+ _textParrotVolume.setText(PARROT_VOLUME);
rect.translate(0, 20);
_textSpeechVolume.setBounds(rect);
_textSpeechVolume.resize(3);
_textSpeechVolume.setHasBorder(false);
- _textSpeechVolume.setText("Speech volume");
+ _textSpeechVolume.setText(SPEECH_VOLUME);
return true;
}
@@ -276,7 +276,7 @@ bool CPetSound::MouseButtonUpMsg(const Point &pt) {
}
void CPetSound::getTooltip(CTextControl *text) {
- text->setText("Change the volume settings.");
+ text->setText(CHANGE_VOLUME_SETTINGS);
}
} // End of namespace Titanic
diff --git a/engines/titanic/support/files_manager.cpp b/engines/titanic/support/files_manager.cpp
index eebd56c..f50a71a 100644
--- a/engines/titanic/support/files_manager.cpp
+++ b/engines/titanic/support/files_manager.cpp
@@ -45,11 +45,16 @@ bool CFilesManager::loadResourceIndex() {
uint headerId = _datFile.readUint32BE();
_version = _datFile.readUint16LE();
- if (headerId != MKTAG('S', 'V', 'T', 'N') || _version < 1) {
+ if (headerId != MKTAG('S', 'V', 'T', 'N')) {
g_vm->GUIError("titanic.dat has invalid contents");
return false;
}
+ if (_version < 2) {
+ g_vm->GUIError("titanic.dat is out of date");
+ return false;
+ }
+
// Read in entries
uint offset, size, flags;
char c;
diff --git a/engines/titanic/support/strings.h b/engines/titanic/support/strings.h
index 65d6550..b7a775c 100644
--- a/engines/titanic/support/strings.h
+++ b/engines/titanic/support/strings.h
@@ -170,6 +170,16 @@ enum StringId {
CURRENT_LOCATION,
A_HOT,
A_COLD,
+ LOAD_THE_GAME,
+ SAVE_THE_GAME,
+ EMPTY,
+ QUIT_THE_GAME,
+ SURE_YOU_WANT_TO_QUIT,
+ CHANGE_VOLUME_SETTINGS,
+ MASTER_VOLUME,
+ MUSIC_VOLUME,
+ PARROT_VOLUME,
+ SPEECH_VOLUME,
// German version only
DE_SUMMER,
Commit: 003331c44c34b65db41aaee38d31e499cf4153f1
https://github.com/scummvm/scummvm/commit/003331c44c34b65db41aaee38d31e499cf4153f1
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-08-26T11:22:43-04:00
Commit Message:
DEVTOOLS: Corrections to newly added German strings
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 5750db6..9e65e3b 100644
--- a/devtools/create_titanic/create_titanic_dat.cpp
+++ b/devtools/create_titanic/create_titanic_dat.cpp
@@ -56,7 +56,7 @@
* ASCIIZ - name of the resource
*/
-#define VERSION_NUMBER 2
+#define VERSION_NUMBER 3
#define HEADER_SIZE 0x1380
Common::File inputFile, outputFile;
@@ -939,15 +939,15 @@ static const char *const STRINGS_DE[196] = {
"Eine hei\xDF""e",
"Eine kalte",
"Laden Sie das Spiel.",
- "Rette das Spiel.",
+ "Speichern Sie das Spiel.",
"Leer",
"Beenden Sie das Spiel.",
- "Sind Sie sicher, dass Sie aufhören wollen?",
- "Ändern der Lautstärkeeinstellungen",
- "Master Volumen",
- "Musiklautstärke",
- "Papageienvolumen",
- "Sprechband",
+ "Sind Sie sicher, dass Sie aufh\xF6""ren wollen?",
+ "\xC4""ndern der Lautst\xE4""rkeeinstellungen",
+ "Grundlautst\xE4""rke",
+ "Musiklautst\xE4""rke",
+ "Papageienlautst\xE4""rke",
+ "Sprachlautst\xE4""rke",
"Sommer",
"Herbst",
Commit: 6291eb75d0690c1e3c88434b6e1720f051341969
https://github.com/scummvm/scummvm/commit/6291eb75d0690c1e3c88434b6e1720f051341969
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-08-26T12:39:34-04:00
Commit Message:
TITANIC: Fix German strings in create_titanic, regenerate titanic.dat
Changed paths:
devtools/create_titanic/create_titanic_dat.cpp
dists/engine-data/titanic.dat
engines/titanic/support/files_manager.cpp
diff --git a/devtools/create_titanic/create_titanic_dat.cpp b/devtools/create_titanic/create_titanic_dat.cpp
index 9e65e3b..b9d21d7 100644
--- a/devtools/create_titanic/create_titanic_dat.cpp
+++ b/devtools/create_titanic/create_titanic_dat.cpp
@@ -774,7 +774,7 @@ static const char *const STRINGS_EN[151] = {
"Speech volume"
};
-static const char *const STRINGS_DE[196] = {
+static const char *const STRINGS_DE[197] = {
"",
"Sie befinden sich vor dem Pellerator.",
"Wir bedauern, da ein Bot den Weg versperrt, ist Ihnen der "
@@ -858,7 +858,6 @@ static const char *const STRINGS_DE[196] = {
"Leider ist es nicht m\xF6""glich den T\xFC""r-Bot von diesem Ort aus herbeizurufen.",
"Leider ist es nicht m\xF6""glich den Klingel-Bot von diesem Ort aus herbeizurufen.",
"Es ist niemand hier mit dem du sprechen k\xF6""nntest",
- "Spricht mit ",
"Im Gespr\xE4""ch mit ",
"der T\xFC""r-Bot",
"der Empfangs-Bot",
@@ -901,7 +900,7 @@ static const char *const STRINGS_DE[196] = {
"Rufe Pellerator",
"Gehe zum Grund des Brunnens",
"Gehe zur Oberfl\xE4""che des Brunnens",
- "Gehe zu deiner Kabine"
+ "Gehe zu deiner Kabine",
"Gehe zur Bar",
"Gehe zum Promenadendeck",
"Gehe zum Baumgarten",
@@ -910,11 +909,11 @@ static const char *const STRINGS_DE[196] = {
"Die Papagei-Lobby",
"Das Zimmer des Erschaffers",
"Die Br\xFC""cke",
- "Der Kielraum"
+ "Der Kielraum",
"Das Skulpturenzimmer",
"Der Baumgarten",
"Der Grund des Brunnens",
- "Das Promenadendeck"
+ "Das Promenadendeck",
"Das First-Class-Restaurant",
"Titanias Zimmer",
"Die Bar",
@@ -942,7 +941,7 @@ static const char *const STRINGS_DE[196] = {
"Speichern Sie das Spiel.",
"Leer",
"Beenden Sie das Spiel.",
- "Sind Sie sicher, dass Sie aufh\xF6""ren wollen?",
+ "Sind Sie sicher, da\xDF"" Sie das Spiel verlassen m\XF6""chten?",
"\xC4""ndern der Lautst\xE4""rkeeinstellungen",
"Grundlautst\xE4""rke",
"Musiklautst\xE4""rke",
@@ -1571,7 +1570,7 @@ void writeData() {
writeStringArray("TEXT/ITEM_IDS", ITEM_IDS, 40);
writeStringArray("TEXT/ROOM_NAMES", ROOM_NAMES, 34);
writeStringArray("TEXT/STRINGS", STRINGS_EN, 151);
- writeStringArray("TEXT/STRINGS/DE", STRINGS_DE, 196);
+ writeStringArray("TEXT/STRINGS/DE", STRINGS_DE, 197);
const int TEXT_PHRASES[3] = { 0x61D3C8, 0x618340, 0x61B1E0 };
const int TEXT_REPLACEMENTS1[3] = { 0x61D9B0, 0x61C788, 0x61B7C8 };
const int TEXT_REPLACEMENTS2[3] = { 0x61DD20, 0x61CAF8, 0x61BB38 };
diff --git a/dists/engine-data/titanic.dat b/dists/engine-data/titanic.dat
index 2a9d601..2d5ea73 100644
Binary files a/dists/engine-data/titanic.dat and b/dists/engine-data/titanic.dat differ
diff --git a/engines/titanic/support/files_manager.cpp b/engines/titanic/support/files_manager.cpp
index f50a71a..fbfb7e0 100644
--- a/engines/titanic/support/files_manager.cpp
+++ b/engines/titanic/support/files_manager.cpp
@@ -50,7 +50,7 @@ bool CFilesManager::loadResourceIndex() {
return false;
}
- if (_version < 2) {
+ if (_version != 3) {
g_vm->GUIError("titanic.dat is out of date");
return false;
}
Commit: 960ad3623f8ff735f77791026f3d4a38b8b1dd3e
https://github.com/scummvm/scummvm/commit/960ad3623f8ff735f77791026f3d4a38b8b1dd3e
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-08-26T12:40:08-04:00
Commit Message:
TITANIC: Fix error setting correct PET buttons for a given area
Changed paths:
engines/titanic/pet_control/pet_frame.cpp
diff --git a/engines/titanic/pet_control/pet_frame.cpp b/engines/titanic/pet_control/pet_frame.cpp
index 9088cfe..738116e 100644
--- a/engines/titanic/pet_control/pet_frame.cpp
+++ b/engines/titanic/pet_control/pet_frame.cpp
@@ -143,8 +143,11 @@ bool CPetFrame::setPetControl(CPetControl *petControl) {
void CPetFrame::setArea(PetArea newArea) {
resetArea();
- if ((uint)newArea < _petAreas.size())
- _modeButtons[_petAreas[newArea]].setMode(MODE_SELECTED);
+
+ for (uint idx = 0; idx < _modeButtons.size(); ++idx) {
+ if (_petAreas[idx] == newArea)
+ _modeButtons[idx].setMode(MODE_SELECTED);
+ }
}
void CPetFrame::resetArea() {
More information about the Scummvm-git-logs
mailing list