diff options
author | Martin Kiewitz | 2013-12-04 20:42:50 +0100 |
---|---|---|
committer | Martin Kiewitz | 2013-12-04 20:42:50 +0100 |
commit | eaf6367bb26b95af7e27ebbbb090664a3ad04e65 (patch) | |
tree | f4acee388f2591f0cfa0848aa337f9cca5733c0d /engines/lastexpress/game/state.h | |
parent | 8bdffcb2fb7aefc96aa10fde1bebd372233cac9d (diff) | |
parent | 203f562d375ac5c7cc665c8feac4020f8de2a5ff (diff) | |
download | scummvm-rg350-eaf6367bb26b95af7e27ebbbb090664a3ad04e65.tar.gz scummvm-rg350-eaf6367bb26b95af7e27ebbbb090664a3ad04e65.tar.bz2 scummvm-rg350-eaf6367bb26b95af7e27ebbbb090664a3ad04e65.zip |
Merge branch 'master' of github.com:scummvm/scummvm
Diffstat (limited to 'engines/lastexpress/game/state.h')
-rw-r--r-- | engines/lastexpress/game/state.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/lastexpress/game/state.h b/engines/lastexpress/game/state.h index 944f6d47b1..83d528d346 100644 --- a/engines/lastexpress/game/state.h +++ b/engines/lastexpress/game/state.h @@ -657,12 +657,12 @@ private: // Timer int _timer; - Flags *_flags; ///< Flags - Inventory *_inventory; ///< Inventory - Objects *_objects; ///< Objects - SavePoints *_savepoints; ///< SavePoints - GameState *_state; ///< State - Common::Point _coords; ///< Current coordinates + Flags *_flags; ///< Flags + Inventory *_inventory; ///< Inventory + Objects *_objects; ///< Objects + SavePoints *_savepoints; ///< SavePoints + GameState *_state; ///< State + Common::Point _coords; ///< Current coordinates }; } // End of namespace LastExpress |