aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2007-09-30 14:46:49 +0000
committerFilippos Karapetis2007-09-30 14:46:49 +0000
commit8ced5d58dfa05f8903337297d962ad24ca46cf53 (patch)
tree1497af2796575b2fab750f46bb815c315230ac71
parent6cd700f7768e1bd7b2808043a663a8fa971f9af8 (diff)
downloadscummvm-rg350-8ced5d58dfa05f8903337297d962ad24ca46cf53.tar.gz
scummvm-rg350-8ced5d58dfa05f8903337297d962ad24ca46cf53.tar.bz2
scummvm-rg350-8ced5d58dfa05f8903337297d962ad24ca46cf53.zip
Show the cursor when opening the options screen. Also, fixed a regression with some strings in the game interface
svn-id: r29151
-rw-r--r--engines/saga/interface.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/engines/saga/interface.cpp b/engines/saga/interface.cpp
index 8a9808d769..20370a775f 100644
--- a/engines/saga/interface.cpp
+++ b/engines/saga/interface.cpp
@@ -400,9 +400,8 @@ void Interface::setMode(int mode) {
_saveReminderState = 1;
}
} else if (mode == kPanelOption) {
- // Show the cursor in the IHNM demo
- if (_vm->getGameId() == GID_IHNM_DEMO)
- _vm->_gfx->showCursor(true);
+ // Show the cursor if it's hidden
+ _vm->_gfx->showCursor(true);
} else {
if (mode == kPanelConverse) {
_inMainMode = false;
@@ -874,7 +873,7 @@ void Interface::drawPanelText(Surface *ds, InterfacePanel *panel, PanelButton *p
textFont = kKnownFontMedium;
textShadowKnownColor = kKnownColorVerbTextShadow;
} else {
- if (panelButton->id < 39) {
+ if (panelButton->id < 39 || panelButton->id > 50) {
// Read non-hardcoded strings from the LUT string table, loaded from the game
// data files
text = _vm->_script->_mainStrings.getString(IHNMTextStringIdsLUT[panelButton->id]);
@@ -2223,7 +2222,7 @@ void Interface::drawPanelButtonText(Surface *ds, InterfacePanel *panel, PanelBut
textWidth = _vm->_font->getStringWidth(kKnownFontMedium, text, 0, kFontNormal);
textHeight = _vm->_font->getHeight(kKnownFontMedium);
} else {
- if (textId < 39) {
+ if (textId < 39 || textId > 50) {
// Read non-hardcoded strings from the LUT string table, loaded from the game
// data files
text = _vm->_script->_mainStrings.getString(IHNMTextStringIdsLUT[textId]);