diff options
author | Johannes Schickel | 2008-03-30 18:27:46 +0000 |
---|---|---|
committer | Johannes Schickel | 2008-03-30 18:27:46 +0000 |
commit | f4e6109b33b4e6bbece5949ff5a06980c89c7c09 (patch) | |
tree | 7516905715997ae64a9074faec11ec09d6068128 /engines/kyra/kyra_v2.h | |
parent | 5f3529ce782b21c352500385966c531100aa476b (diff) | |
download | scummvm-rg350-f4e6109b33b4e6bbece5949ff5a06980c89c7c09.tar.gz scummvm-rg350-f4e6109b33b4e6bbece5949ff5a06980c89c7c09.tar.bz2 scummvm-rg350-f4e6109b33b4e6bbece5949ff5a06980c89c7c09.zip |
- fixed savegame description loading in kyra1
- added Kyra2 load menu, currently just accessable from startup menu though
svn-id: r31331
Diffstat (limited to 'engines/kyra/kyra_v2.h')
-rw-r--r-- | engines/kyra/kyra_v2.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/engines/kyra/kyra_v2.h b/engines/kyra/kyra_v2.h index 3eaf06d67a..fc4e223f01 100644 --- a/engines/kyra/kyra_v2.h +++ b/engines/kyra/kyra_v2.h @@ -29,6 +29,7 @@ #include "kyra/kyra.h" #include "kyra/script.h" #include "kyra/screen_v2.h" +#include "kyra/text_v2.h" #include "kyra/gui_v2.h" #include "common/list.h" @@ -169,6 +170,7 @@ public: virtual Screen *screen() { return _screen; } Screen_v2 *screen_v2() { return _screen; } + virtual TextDisplayer *text() { return _text; } int language() const { return _lang; } virtual Movie *createWSAMovie(); @@ -606,6 +608,7 @@ protected: int _nextAnimItem; // gui + bool _menuDirectlyToLoad; GUI_v2 *_gui; void loadButtonShapes(); @@ -676,8 +679,8 @@ protected: int _currentChapter; int _newChapterFile; - const uint8 *getTableEntry(const uint8 *buffer, int id); - const char *getTableString(int id, const uint8 *buffer, int decode); + uint8 *getTableEntry(uint8 *buffer, int id); + char *getTableString(int id, uint8 *buffer, int decode); const char *getChapterString(int id); int decodeString1(const char *src, char *dst); void decodeString2(const char *src, char *dst); |