diff options
| author | Filippos Karapetis | 2008-12-26 13:50:12 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2008-12-26 13:50:12 +0000 |
| commit | dec4f1d0848c6fcdeaa252859d1c1c1629039ff9 (patch) | |
| tree | 7e116ffa0f263667ccb9570411d26d473b2928da | |
| parent | 24c37e7d82194f52d89aa8b53464aa43452f77b0 (diff) | |
| download | scummvm-rg350-dec4f1d0848c6fcdeaa252859d1c1c1629039ff9.tar.gz scummvm-rg350-dec4f1d0848c6fcdeaa252859d1c1c1629039ff9.tar.bz2 scummvm-rg350-dec4f1d0848c6fcdeaa252859d1c1c1629039ff9.zip | |
The verb<->textId assignment is needed only for ITE
svn-id: r35562
| -rw-r--r-- | engines/saga/interface.cpp | 26 | ||||
| -rw-r--r-- | engines/saga/saga.h | 7 |
2 files changed, 9 insertions, 24 deletions
diff --git a/engines/saga/interface.cpp b/engines/saga/interface.cpp index 842cacd685..7583f286d0 100644 --- a/engines/saga/interface.cpp +++ b/engines/saga/interface.cpp @@ -52,25 +52,9 @@ namespace Saga { -static int verbTypeToTextStringsIdLUT[2][kVerbTypeIdsMax] = { - {-1, - kTextPickUp, - kTextLookAt, - kTextWalkTo, - kTextTalkTo, - kTextOpen, - kTextClose, - kTextGive, - kTextUse}, - {-1, - kVerbIHNMWalk, - kVerbIHNMLookAt, - kVerbIHNMTake, - kVerbIHNMUse, - kVerbIHNMTalkTo, - kVerbIHNMSwallow, - kVerbIHNMGive, - kVerbIHNMPush} +static int verbToTextIdITE[] = { + kTextWalkTo, kTextLookAt, kTextPickUp, kTextTalkTo, + kTextOpen, kTextClose, kTextUse, kTextGive }; // This maps the internally used string ITE IDs to the LUT strings loaded in IHNM @@ -2368,10 +2352,10 @@ void Interface::drawVerbPanelText(PanelButton *panelButton, KnownColor textKnown int textId; if (_vm->getGameId() == GID_ITE) { - textId = verbTypeToTextStringsIdLUT[0][panelButton->id]; + textId = verbToTextIdITE[panelButton->id - 1]; text = _vm->getTextString(textId); } else { - textId = verbTypeToTextStringsIdLUT[1][panelButton->id]; + textId = panelButton->id; text = _vm->_script->_mainStrings.getString(textId + 1); textShadowKnownColor = kKnownColorTransparent; } diff --git a/engines/saga/saga.h b/engines/saga/saga.h index 36010ae7cb..0dce9df3cc 100644 --- a/engines/saga/saga.h +++ b/engines/saga/saga.h @@ -205,14 +205,15 @@ enum GameSoundTypes { }; enum TextStringIds { - kTextWalkTo, - kTextLookAt, kTextPickUp, + kTextLookAt, + kTextWalkTo, kTextTalkTo, kTextOpen, kTextClose, - kTextUse, kTextGive, + kTextUse, + kTextOptions, kTextTest, kTextDemo, |