[Scummvm-cvs-logs] CVS: scummvm/saga interface.cpp,1.135,1.136 itedata.cpp,1.8,1.9 itedata.h,1.7,1.8 saga.cpp,1.129,1.130 saga.h,1.119,1.120 saveload.cpp,1.23,1.24 script.cpp,1.81,1.82
Eugene Sandulenko
sev at users.sourceforge.net
Tue Aug 16 12:06:34 CEST 2005
Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4096
Modified Files:
interface.cpp itedata.cpp itedata.h saga.cpp saga.h
saveload.cpp script.cpp
Log Message:
Fix bug #1256381 "ITE: Options menu contains wrong item" and gave symbolic
names to text Ids.
Index: interface.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/interface.cpp,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -d -r1.135 -r1.136
--- interface.cpp 13 Aug 2005 19:41:11 -0000 1.135
+++ interface.cpp 16 Aug 2005 19:04:51 -0000 1.136
@@ -650,8 +650,15 @@
int textWidth;
Rect rect;
Point textPoint;
+ int textId = panelButton->id;
- text = _vm->getTextString(panelButton->id);
+ switch (panelButton->id) {
+ case kTextReadingSpeed:
+ if (_vm->getFeatures() & GF_CD_FX)
+ textId = kTextShowDialog;
+ break;
+ }
+ text = _vm->getTextString(textId);
panel->calcPanelButtonRect(panelButton, rect);
if (panelButton->xOffset < 0) {
textWidth = _vm->_font->getStringWidth(kMediumFont, text, 0, kFontNormal);
@@ -1770,15 +1777,18 @@
textId = panelButton->id;
switch(panelButton->id) {
- case kTextReadingSpeed:
- textId = kTextFast;
- break;
- case kTextMusic:
- textId = kTextOn;
- break;
- case kTextSound:
+ case kTextReadingSpeed:
+ if (_vm->getFeatures() & GF_CD_FX)
textId = kTextOn;
- break;
+ else
+ textId = kTextFast;
+ break;
+ case kTextMusic:
+ textId = kTextOn;
+ break;
+ case kTextSound:
+ textId = kTextOn;
+ break;
}
text = _vm->getTextString(textId);
Index: itedata.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/itedata.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- itedata.cpp 11 Aug 2005 15:28:08 -0000 1.8
+++ itedata.cpp 16 Aug 2005 19:04:51 -0000 1.9
@@ -334,7 +334,7 @@
{ FX_CROWD_17, 64 }
};
-const char *ITEinterfaceTextStrings[][50] = {
+const char *ITEinterfaceTextStrings[][51] = {
{
"Walk to", "Look At", "Pick Up", "Talk to", "Open",
"Close", "Use", "Give", "Options", "Test",
@@ -350,7 +350,8 @@
"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."
+ "I don't know how to do that.",
+ "Show Dialog"
},
// German
{
@@ -359,16 +360,17 @@
"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?",
+ "Beenden", NULL, "M", "Klick", "10%",
+ "20%", "30%", "40%", "50%", "60%",
+ "70%", "80%", "90%", "Max", "Spiel beenden?",
"Spielstand geladen!", "Bitte Namen eingeben", "Gib %s zu %s", "Benutze %s mit %s",
"[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."
+ "Ich wei$ nicht, wie ich das machen soll.",
+ "Text zeigen"
}
};
Index: itedata.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/itedata.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- itedata.h 11 Aug 2005 15:28:08 -0000 1.7
+++ itedata.h 16 Aug 2005 19:04:51 -0000 1.8
@@ -87,7 +87,7 @@
extern ObjectTableData ITE_ObjectTable[ITE_OBJECTCOUNT];
extern FxTable ITE_SfxTable[ITE_SFXCOUNT];
-extern const char *ITEinterfaceTextStrings[][50];
+extern const char *ITEinterfaceTextStrings[][51];
} // End of namespace Saga
Index: saga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/saga.cpp,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -d -r1.129 -r1.130
--- saga.cpp 13 Aug 2005 19:41:11 -0000 1.129
+++ saga.cpp 16 Aug 2005 19:04:51 -0000 1.130
@@ -405,23 +405,23 @@
textString = NULL;
switch (verb) {
case kVerbPickUp:
- textString = getTextString(45);
+ textString = getTextString(kTextICantPickup);
soundResourceId = RID_BOAR_VOICE_007;
break;
case kVerbLookAt:
- textString = getTextString(46);
+ textString = getTextString(kTextNothingSpecial);
soundResourceId = RID_BOAR_VOICE_006;
break;
case kVerbOpen:
- textString = getTextString(47);
+ textString = getTextString(kTextNoPlaceToOpen);
soundResourceId = RID_BOAR_VOICE_000;
break;
case kVerbClose:
- textString = getTextString(48);
+ textString = getTextString(kTextNoOpening);
soundResourceId = RID_BOAR_VOICE_002;
break;
case kVerbUse:
- textString = getTextString(49);
+ textString = getTextString(kTextDontKnow);
soundResourceId = RID_BOAR_VOICE_005;
break;
}
Index: saga.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/saga.h,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -d -r1.119 -r1.120
--- saga.h 13 Aug 2005 19:09:19 -0000 1.119
+++ saga.h 16 Aug 2005 19:04:51 -0000 1.120
@@ -209,7 +209,16 @@
kTextMax,
kTextQuitTheGameQuestion,
kTextLoadSuccessful,
- kTextEnterSaveGameName
+ kTextEnterSaveGameName,
+ kTextGiveTo,
+ kTextUseWidth,
+ kTextNewSave,
+ kTextICantPickup,
+ kTextNothingSpecial,
+ kTextNoPlaceToOpen,
+ kTextNoOpening,
+ kTextDontKnow,
+ kTextShowDialog
};
struct ImageHeader {
Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/saveload.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- saveload.cpp 11 Aug 2005 22:00:32 -0000 1.23
+++ saveload.cpp 16 Aug 2005 19:04:51 -0000 1.24
@@ -64,7 +64,7 @@
return &_saveFiles[_saveFilesCount - idx - 1];
} else {
if (!emptySlot.name[0])
- strcpy(emptySlot.name, getTextString(44));
+ strcpy(emptySlot.name, getTextString(kTextNewSave));
return (idx == 0) ? &emptySlot : &_saveFiles[_saveFilesCount - idx];
}
Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/script.cpp,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- script.cpp 12 Aug 2005 19:43:39 -0000 1.81
+++ script.cpp 16 Aug 2005 19:04:51 -0000 1.82
@@ -311,11 +311,11 @@
}
if (_leftButtonVerb == kVerbGive) {
- snprintf(statusString, STATUS_TEXT_LEN, _vm->getTextString(42), object1Name, object2Name);
+ snprintf(statusString, STATUS_TEXT_LEN, _vm->getTextString(kTextGiveTo), object1Name, object2Name);
_vm->_interface->setStatusText(statusString, statusColor);
} else {
if (_leftButtonVerb == kVerbUse) {
- snprintf(statusString, STATUS_TEXT_LEN, _vm->getTextString(43), object1Name, object2Name);
+ snprintf(statusString, STATUS_TEXT_LEN, _vm->getTextString(kTextUseWidth), 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