aboutsummaryrefslogtreecommitdiff
path: root/saga/interface.cpp
diff options
context:
space:
mode:
authorEugene Sandulenko2005-08-16 19:04:51 +0000
committerEugene Sandulenko2005-08-16 19:04:51 +0000
commitf2c542547d32d2685e070f2b31e8774dde9cdb91 (patch)
tree3e973554b37df18a712c5975ffaa9366b6065cfa /saga/interface.cpp
parent968e73a93abf068e177f31c3612cbfd2fe28ff76 (diff)
downloadscummvm-rg350-f2c542547d32d2685e070f2b31e8774dde9cdb91.tar.gz
scummvm-rg350-f2c542547d32d2685e070f2b31e8774dde9cdb91.tar.bz2
scummvm-rg350-f2c542547d32d2685e070f2b31e8774dde9cdb91.zip
Fix bug #1256381 "ITE: Options menu contains wrong item" and gave symbolic
names to text Ids. svn-id: r18699
Diffstat (limited to 'saga/interface.cpp')
-rw-r--r--saga/interface.cpp28
1 files changed, 19 insertions, 9 deletions
diff --git a/saga/interface.cpp b/saga/interface.cpp
index 7e0d2402f1..e7026f45da 100644
--- a/saga/interface.cpp
+++ b/saga/interface.cpp
@@ -650,8 +650,15 @@ void Interface::drawPanelText(Surface *ds, InterfacePanel *panel, PanelButton *p
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 @@ void Interface::drawPanelButtonText(Surface *ds, InterfacePanel *panel, PanelBut
textId = panelButton->id;
switch(panelButton->id) {
- case kTextReadingSpeed:
- textId = kTextFast;
- break;
- case kTextMusic:
+ case kTextReadingSpeed:
+ if (_vm->getFeatures() & GF_CD_FX)
textId = kTextOn;
- break;
- case kTextSound:
- textId = kTextOn;
- break;
+ else
+ textId = kTextFast;
+ break;
+ case kTextMusic:
+ textId = kTextOn;
+ break;
+ case kTextSound:
+ textId = kTextOn;
+ break;
}
text = _vm->getTextString(textId);