[Scummvm-cvs-logs] CVS: scummvm/saga itedata.cpp,1.5,1.6 itedata.h,1.4,1.5 saga.cpp,1.125,1.126 script.cpp,1.72,1.73
Eugene Sandulenko
sev at users.sourceforge.net
Mon Aug 8 01:16:11 CEST 2005
Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22589
Modified Files:
itedata.cpp itedata.h saga.cpp script.cpp
Log Message:
Partially fix bug #1253079 'ITE: Several errors in the "rocky chasm" scene'.
Argh! why _several_ errors and not one by one?
Index: itedata.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/itedata.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- itedata.cpp 7 Aug 2005 00:00:41 -0000 1.5
+++ itedata.cpp 8 Aug 2005 08:15:15 -0000 1.6
@@ -334,5 +334,32 @@
{ FX_CROWD_17, 64 }
};
+const char *ITEinterfaceTextStrings[][44] = {
+ {
+ "Walk to", "Look At", "Pick Up", "Talk to", "Open",
+ "Close", "Use", "Give", "Options", "Test",
+ "Demo", "Help", "Quit Game", "Fast", "Slow",
+ "On", "Off", "Continue Playing", "Load", "Save",
+ "Game Options", "Reading Speed", "Music", "Sound", "Cancel",
+ "Quit", "OK", "Mid", "Click", "10%",
+ "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"
+
+ },
+ // German
+ {
+ "Gehe zu", "Schau an", "Nimm", "Rede mit", "\231ffne",
+ "Schlie$e", "Benutze", "Gib", "Optionen", "Test",
+ "Demo", "Hilfe", "Spiel beenden", "S", "L",
+ "An", "Aus", "Weiterspielen", "Laden", "Sichern",
+ "Spieleoptionen", "Lesegeschw.", "Musik", "Sound", "Abbr.",
+ "Beenden", NULL, "M", "Klick", NULL,
+ NULL, NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL, "Spiel beenden?",
+ "Spielstand geladen!", "Bitte Namen eingeben", "Gib %s zu %s", "Benutze %s mit %s"
+ }
+};
+
} // End of namespace Saga
Index: itedata.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/itedata.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- itedata.h 7 Aug 2005 00:00:41 -0000 1.4
+++ itedata.h 8 Aug 2005 08:15:15 -0000 1.5
@@ -87,6 +87,8 @@
extern ObjectTableData ITE_ObjectTable[ITE_OBJECTCOUNT];
extern FxTable ITE_SfxTable[ITE_SFXCOUNT];
+extern const char *ITEinterfaceTextStrings[][44];
+
} // End of namespace Saga
#endif
Index: saga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/saga.cpp,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -d -r1.125 -r1.126
--- saga.cpp 5 Aug 2005 23:14:11 -0000 1.125
+++ saga.cpp 8 Aug 2005 08:15:16 -0000 1.126
@@ -63,32 +63,6 @@
{0, 0, 0}
};
-static const char *interfaceTextStrings[][42] = {
- {
- "Walk to", "Look At", "Pick Up", "Talk to", "Open",
- "Close", "Use", "Give", "Options", "Test",
- "Demo", "Help", "Quit Game", "Fast", "Slow",
- "On", "Off", "Continue Playing", "Load", "Save",
- "Game Options", "Reading Speed", "Music", "Sound", "Cancel",
- "Quit", "OK", "Mid", "Click",
- "10%", "20%", "30%", "40%", "50%",
- "60%", "70%", "80%", "90%", "Max", "Quit the Game?", "Load Successful!",
- "Enter Save Game Name"
- },
- // German
- {
- "Gehe zu", "Schau an", "Nimm", "Rede mit", "\231ffne",
- "Schlie$e", "Benutze", "Gib", "Optionen", "Test",
- "Demo", "Hilfe", "Spiel beenden", "S", "L",
- "An", "Aus", "Weiterspielen", "Laden", "Sichern",
- "Spieleoptionen", "Lesegeschw.", "Musik", "Sound", "Abbr.",
- "Beenden", NULL, "M", "Klick",
- NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, "Spiel beenden?", "Spielstand geladen!",
- "Bitte Namen eingeben"
- }
-};
-
GameList Engine_SAGA_gameList() {
GameList games;
const GameSettings *g = saga_games;
@@ -420,9 +394,9 @@
const char *string;
int lang = getFeatures() & GF_LANG_DE ? 1 : 0;
- string = interfaceTextStrings[lang][textStringId];
+ string = ITEinterfaceTextStrings[lang][textStringId];
if (!string)
- string = interfaceTextStrings[0][textStringId];
+ string = ITEinterfaceTextStrings[0][textStringId];
return string;
}
Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/script.cpp,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- script.cpp 29 Jul 2005 17:57:59 -0000 1.72
+++ script.cpp 8 Aug 2005 08:15:16 -0000 1.73
@@ -321,11 +321,11 @@
}
if (_leftButtonVerb == kVerbGive) {
- snprintf(statusString, STATUS_TEXT_LEN, "Give %s to %s", object1Name, object2Name);
+ snprintf(statusString, STATUS_TEXT_LEN, _vm->getTextString(42), object1Name, object2Name);
_vm->_interface->setStatusText(statusString, statusColor);
} else {
if (_leftButtonVerb == kVerbUse) {
- snprintf(statusString, STATUS_TEXT_LEN, "Use %s with %s", object1Name, object2Name);
+ snprintf(statusString, STATUS_TEXT_LEN, _vm->getTextString(43), object1Name, object2Name);
_vm->_interface->setStatusText(statusString, statusColor);
} else {
snprintf(statusString, STATUS_TEXT_LEN, "%s %s", verbName, object1Name);
More information about the Scummvm-git-logs
mailing list