diff options
author | Johannes Schickel | 2010-10-13 03:57:44 +0000 |
---|---|---|
committer | Johannes Schickel | 2010-10-13 03:57:44 +0000 |
commit | 75e8452b6e6a2bf4fb2f588aa00b428a60d873b5 (patch) | |
tree | f29541d55309487a94bd1d38e8b53bb3dde9aec6 /engines/sci/engine/state.h | |
parent | 48ee83b88957dab86bc763e9ef21a70179fa8679 (diff) | |
parent | e9f50882ea5b6beeefa994040be9d3bab6a1f107 (diff) | |
download | scummvm-rg350-75e8452b6e6a2bf4fb2f588aa00b428a60d873b5.tar.gz scummvm-rg350-75e8452b6e6a2bf4fb2f588aa00b428a60d873b5.tar.bz2 scummvm-rg350-75e8452b6e6a2bf4fb2f588aa00b428a60d873b5.zip |
OPENGL: Merged from trunk, from rev 52105 to 53396.
This includes an rather hacky attempt to merge all the recent gp2x backend
changes into the branch. I suppose the gp2x backend and probably all new
backends, i.e. gph, dingux etc., might not compile anymore.
Since I have no way of testing those it would be nice if porters could look
into getting those up to speed in this branch.
svn-id: r53399
Diffstat (limited to 'engines/sci/engine/state.h')
-rw-r--r-- | engines/sci/engine/state.h | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/engines/sci/engine/state.h b/engines/sci/engine/state.h index 4f1d686b17..d0ddd5ca06 100644 --- a/engines/sci/engine/state.h +++ b/engines/sci/engine/state.h @@ -59,17 +59,23 @@ enum AbortGameState { class DirSeeker { protected: reg_t _outbuffer; - Common::StringArray _savefiles; + Common::StringArray _files; + Common::StringArray _virtualFiles; Common::StringArray::const_iterator _iter; public: DirSeeker() { _outbuffer = NULL_REG; - _iter = _savefiles.begin(); + _iter = _files.begin(); } reg_t firstFile(const Common::String &mask, reg_t buffer, SegManager *segMan); reg_t nextFile(SegManager *segMan); + + Common::String getVirtualFilename(uint fileNumber); + +private: + void addAsVirtualFiles(Common::String title, Common::String fileMask); }; enum { @@ -80,11 +86,11 @@ enum { MAX_SAVEGAME_NR = 20 /**< Maximum number of savegames */ }; -// We assume that scripts give us savegameId 0->999 for creating a new save slot -// and savegameId 1000->1999 for existing save slots ffs. kfile.cpp +// We assume that scripts give us savegameId 0->99 for creating a new save slot +// and savegameId 100->199 for existing save slots ffs. kfile.cpp enum { - SAVEGAMEID_OFFICIALRANGE_START = 1000, - SAVEGAMEID_OFFICIALRANGE_END = 1999 + SAVEGAMEID_OFFICIALRANGE_START = 100, + SAVEGAMEID_OFFICIALRANGE_END = 199 }; enum { @@ -136,8 +142,14 @@ public: DirSeeker _dirseeker; - uint _lastSaveVirtualId; // last virtual id fed to kSaveGame, if no kGetSaveFiles was called inbetween - uint _lastSaveNewId; // last newly created filename-id by kSaveGame + int16 _lastSaveVirtualId; // last virtual id fed to kSaveGame, if no kGetSaveFiles was called inbetween + int16 _lastSaveNewId; // last newly created filename-id by kSaveGame + + uint _chosenQfGImportItem; // Remembers the item selected in QfG import rooms + + bool _cursorWorkaroundActive; // ffs. GfxCursor::setPosition() + Common::Point _cursorWorkaroundPoint; + Common::Rect _cursorWorkaroundRect; public: /* VM Information */ |