diff options
| author | David Corrales | 2007-06-23 18:51:33 +0000 |
|---|---|---|
| committer | David Corrales | 2007-06-23 18:51:33 +0000 |
| commit | cacd7a28fd51d960947de88abbf30c487e66529d (patch) | |
| tree | f3baa59853bfb307e452b86b9d93c4737b1fa6ab /engines/saga/interface.h | |
| parent | 0ac96302fe9c04df79cb01a77d19535b45fe2db0 (diff) | |
| parent | 90c2210dae8c91fa8babc6b05564e15c9d445d18 (diff) | |
| download | scummvm-rg350-cacd7a28fd51d960947de88abbf30c487e66529d.tar.gz scummvm-rg350-cacd7a28fd51d960947de88abbf30c487e66529d.tar.bz2 scummvm-rg350-cacd7a28fd51d960947de88abbf30c487e66529d.zip | |
Merged the FSNode branch with trunk r27031:27680
svn-id: r27681
Diffstat (limited to 'engines/saga/interface.h')
| -rw-r--r-- | engines/saga/interface.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/engines/saga/interface.h b/engines/saga/interface.h index b537d49424..7ae225219a 100644 --- a/engines/saga/interface.h +++ b/engines/saga/interface.h @@ -157,6 +157,7 @@ struct InterfacePanel { struct Converse { char *text; + int strId; int stringNum; int textNum; int replyId; @@ -196,7 +197,7 @@ public: return _fadeMode; } void rememberMode(); - void restoreMode(); + void restoreMode(bool draw_ = true); bool isInMainMode() { return _inMainMode; } void setStatusText(const char *text, int statusColor = -1); void loadScenePortraits(int resourceId); @@ -329,7 +330,7 @@ private: void drawTextInput(Surface *ds, InterfacePanel *panel, PanelButton *panelButton); void drawPanelText(Surface *ds, InterfacePanel *panel, PanelButton *panelButton); - void drawPanelButtonText(Surface *ds, InterfacePanel *panel, PanelButton *panelButton); + void drawPanelButtonText(Surface *ds, InterfacePanel *panel, PanelButton *panelButton, int spritenum = 0); enum ButtonKind { kButton, kSlider, @@ -346,7 +347,7 @@ private: public: void converseInit(void); void converseClear(void); - bool converseAddText(const char *text, int replyId, byte replyFlags, int replyBit); + bool converseAddText(const char *text, int strId, int replyId, byte replyFlags, int replyBit); void converseDisplayText(); void converseSetTextLines(int row); void converseChangePos(int chg); |