diff options
| author | Filippos Karapetis | 2007-09-30 13:19:31 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2007-09-30 13:19:31 +0000 |
| commit | f002fcf98af5942563112008c180fcbb183c20a2 (patch) | |
| tree | dca86219a55bddaf4445600847bd17f4e990b7ca | |
| parent | cb2f6ce0928f013087ef130ad9f7abcb19e15d8a (diff) | |
| download | scummvm-rg350-f002fcf98af5942563112008c180fcbb183c20a2.tar.gz scummvm-rg350-f002fcf98af5942563112008c180fcbb183c20a2.tar.bz2 scummvm-rg350-f002fcf98af5942563112008c180fcbb183c20a2.zip | |
IHNM does not have excuse texts
svn-id: r29145
| -rw-r--r-- | engines/saga/interface.cpp | 4 | ||||
| -rw-r--r-- | engines/saga/script.cpp | 15 |
2 files changed, 11 insertions, 8 deletions
diff --git a/engines/saga/interface.cpp b/engines/saga/interface.cpp index e6854b1c05..8a9808d769 100644 --- a/engines/saga/interface.cpp +++ b/engines/saga/interface.cpp @@ -874,7 +874,7 @@ void Interface::drawPanelText(Surface *ds, InterfacePanel *panel, PanelButton *p textFont = kKnownFontMedium; textShadowKnownColor = kKnownColorVerbTextShadow; } else { - if (panelButton->id < 39 || panelButton->id > 50) { + if (panelButton->id < 39) { // 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 +2223,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 || textId > 50) { + if (textId < 39) { // Read non-hardcoded strings from the LUT string table, loaded from the game // data files text = _vm->_script->_mainStrings.getString(IHNMTextStringIdsLUT[textId]); diff --git a/engines/saga/script.cpp b/engines/saga/script.cpp index 83ef1e9df1..c749c1d9e8 100644 --- a/engines/saga/script.cpp +++ b/engines/saga/script.cpp @@ -516,13 +516,16 @@ void Script::doVerb() { _vm->_events->queue(&event); } else { - _vm->getExcuseInfo(_pendingVerb, excuseText, excuseSampleResourceId); - if (excuseText) { - // In Floppy versions we don't have excuse texts - if (!(_vm->getFeatures() & GF_CD_FX)) - excuseSampleResourceId = -1; + // Show excuse text in ITE CD Versions + if (_vm->getGameType() == GType_ITE) { + _vm->getExcuseInfo(_pendingVerb, excuseText, excuseSampleResourceId); + 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); + _vm->_actor->actorSpeech(ID_PROTAG, &excuseText, 1, excuseSampleResourceId, 0); + } } } |