[Scummvm-cvs-logs] CVS: scummvm/saga itedata.cpp,1.7,1.8 itedata.h,1.6,1.7 saga.cpp,1.127,1.128 script.cpp,1.79,1.80

[Eugene Sandulenko]

Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20522

Modified Files:
	itedata.cpp itedata.h saga.cpp script.cpp 
Log Message:
Translate excuse messages and make them work on floppy versions. Earlier
it just crashed there.


Index: itedata.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/itedata.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- itedata.cpp	11 Aug 2005 14:03:10 -0000	1.7
+++ itedata.cpp	11 Aug 2005 15:28:08 -0000	1.8
@@ -334,7 +334,7 @@
 	{ 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 @@
 		"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 @@
 		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."
 	}
 };
 

Index: itedata.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/itedata.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- itedata.h	11 Aug 2005 14:03:10 -0000	1.6
+++ itedata.h	11 Aug 2005 15:28:08 -0000	1.7
@@ -87,7 +87,7 @@
 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
 

Index: saga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/saga.cpp,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -d -r1.127 -r1.128
--- saga.cpp	10 Aug 2005 14:53:17 -0000	1.127
+++ saga.cpp	11 Aug 2005 15:28:08 -0000	1.128
@@ -402,26 +402,26 @@
 }
 
 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;
 	}

Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/script.cpp,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- script.cpp	10 Aug 2005 15:31:15 -0000	1.79
+++ script.cpp	11 Aug 2005 15:28:08 -0000	1.80
@@ -431,8 +431,13 @@
 
 	} 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)) {