aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Sandulenko2005-08-11 15:28:08 +0000
committerEugene Sandulenko2005-08-11 15:28:08 +0000
commit801bb09bb5d4d5e0b94cc175ad28b34fb66edd2c (patch)
tree6eb6aaa3df77d4e1935c6b9651ca060524ce4462
parent3d4fe0470e663bb966842d06c424f7e46d25947f (diff)
downloadscummvm-rg350-801bb09bb5d4d5e0b94cc175ad28b34fb66edd2c.tar.gz
scummvm-rg350-801bb09bb5d4d5e0b94cc175ad28b34fb66edd2c.tar.bz2
scummvm-rg350-801bb09bb5d4d5e0b94cc175ad28b34fb66edd2c.zip
Translate excuse messages and make them work on floppy versions. Earlier
it just crashed there. svn-id: r18659
-rw-r--r--saga/itedata.cpp17
-rw-r--r--saga/itedata.h2
-rw-r--r--saga/saga.cpp12
-rw-r--r--saga/script.cpp7
4 files changed, 26 insertions, 12 deletions
diff --git a/saga/itedata.cpp b/saga/itedata.cpp
index f75d235628..c6a9327308 100644
--- a/saga/itedata.cpp
+++ b/saga/itedata.cpp
@@ -334,7 +334,7 @@ FxTable ITE_SfxTable[ITE_SFXCOUNT] = {
{ FX_CROWD_17, 64 }
};
-const char *ITEinterfaceTextStrings[][45] = {
+const char *ITEinterfaceTextStrings[][50] = {
{
"Walk to", "Look At", "Pick Up", "Talk to", "Open",
"Close", "Use", "Give", "Options", "Test",
@@ -345,8 +345,12 @@ const char *ITEinterfaceTextStrings[][45] = {
"20%", "30%", "40%", "50%", "60%",
"70%", "80%", "90%", "Max", "Quit the Game?",
"Load Successful!", "Enter Save Game Name", "Give %s to %s", "Use %s with %s",
- "[New Save Game]"
-
+ "[New Save Game]",
+ "I can't pick that up.",
+ "I see nothing special about it.",
+ "There's no place to open it.",
+ "There's no opening to close.",
+ "I don't know how to do that."
},
// German
{
@@ -359,7 +363,12 @@ const char *ITEinterfaceTextStrings[][45] = {
NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, "Spiel beenden?",
"Spielstand geladen!", "Bitte Namen eingeben", "Gib %s zu %s", "Benutze %s mit %s",
- "[Neuer Spielstand]"
+ "[Neuer Spielstand]",
+ "Das kann ich nicht aufnehmen.",
+ "Ich sehe nichts besonderes.",
+ "Das kann man nicht \224ffnen.",
+ "Hier ist keine \231ffnung zum Schlie$en.",
+ "Ich wei$ nicht, wie ich das machen soll."
}
};
diff --git a/saga/itedata.h b/saga/itedata.h
index 9cadb41a39..a06127dffc 100644
--- a/saga/itedata.h
+++ b/saga/itedata.h
@@ -87,7 +87,7 @@ struct FxTable {
extern ObjectTableData ITE_ObjectTable[ITE_OBJECTCOUNT];
extern FxTable ITE_SfxTable[ITE_SFXCOUNT];
-extern const char *ITEinterfaceTextStrings[][45];
+extern const char *ITEinterfaceTextStrings[][50];
} // End of namespace Saga
diff --git a/saga/saga.cpp b/saga/saga.cpp
index 9677754518..2d2b655939 100644
--- a/saga/saga.cpp
+++ b/saga/saga.cpp
@@ -402,26 +402,26 @@ const char *SagaEngine::getTextString(int textStringId) {
}
void SagaEngine::getExcuseInfo(int verb, const char *&textString, int &soundResourceId) {
- textString = NULL; // TODO: i18n it !
+ textString = NULL;
switch (verb) {
case kVerbPickUp:
- textString = "I can't pick that up.";
+ textString = getTextString(45);
soundResourceId = RID_BOAR_VOICE_007;
break;
case kVerbLookAt:
- textString = "I see nothing special about it.";
+ textString = getTextString(46);
soundResourceId = RID_BOAR_VOICE_006;
break;
case kVerbOpen:
- textString = "There's no place to open it.";
+ textString = getTextString(47);
soundResourceId = RID_BOAR_VOICE_000;
break;
case kVerbClose:
- textString = "There's no opening to close.";
+ textString = getTextString(48);
soundResourceId = RID_BOAR_VOICE_002;
break;
case kVerbUse:
- textString = "I don't know how to do that.";
+ textString = getTextString(49);
soundResourceId = RID_BOAR_VOICE_005;
break;
}
diff --git a/saga/script.cpp b/saga/script.cpp
index ed70a4b7a7..299c869219 100644
--- a/saga/script.cpp
+++ b/saga/script.cpp
@@ -431,8 +431,13 @@ void Script::doVerb() {
} else {
_vm->getExcuseInfo(_pendingVerb, excuseText, excuseSampleResourceId);
- if (excuseText)
+ if (excuseText) {
+ // In Floppy versions we don't have excuse texts
+ if (!(_vm->getFeatures() & GF_CD_FX))
+ excuseSampleResourceId = -1;
+
_vm->_actor->actorSpeech(ID_PROTAG, &excuseText, 1, excuseSampleResourceId, 0);
+ }
}
if ((_currentVerb == kVerbWalkTo) || (_currentVerb == kVerbLookAt)) {