aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--devtools/create_titanic/create_titanic_dat.cpp30
-rw-r--r--engines/titanic/pet_control/pet_load.cpp2
-rw-r--r--engines/titanic/pet_control/pet_load_save.cpp2
-rw-r--r--engines/titanic/pet_control/pet_quit.cpp4
-rw-r--r--engines/titanic/pet_control/pet_save.cpp2
-rw-r--r--engines/titanic/pet_control/pet_sound.cpp10
-rw-r--r--engines/titanic/support/files_manager.cpp7
-rw-r--r--engines/titanic/support/strings.h10
8 files changed, 51 insertions, 16 deletions
diff --git a/devtools/create_titanic/create_titanic_dat.cpp b/devtools/create_titanic/create_titanic_dat.cpp
index 3d5e4476c9..5750db63c3 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 1d81435bed..6c24c575c9 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 aa438c06d3..d918478fb1 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 0d94474f99..b180bf8dc8 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 00dbfa6b4a..16fe092b24 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 1ba557ab14..085ee649b2 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 eebd56c1fa..f50a71a3e9 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 65d6550e1e..b7a775cc99 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,
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-20 12:08:32 +0000