diff options
| author | Paul Gilbert | 2015-10-12 15:18:03 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2015-10-12 15:18:03 -0400 |
| commit | b0016071ecf3f5ffbc6f1619af610ab648bbba3a (patch) | |
| tree | f00f6b17bfd3475200e454cdfc09eba94d764f01 /engines/mads/scene.h | |
| parent | 652a6623156b6c6bba8ca49e038945fd0c2b7780 (diff) | |
| parent | fbcf667b6a57593a2b85622ad1e1380c8aef7210 (diff) | |
| download | scummvm-rg350-b0016071ecf3f5ffbc6f1619af610ab648bbba3a.tar.gz scummvm-rg350-b0016071ecf3f5ffbc6f1619af610ab648bbba3a.tar.bz2 scummvm-rg350-b0016071ecf3f5ffbc6f1619af610ab648bbba3a.zip | |
Merge branch 'msvc_2015' into xeen
Diffstat (limited to 'engines/mads/scene.h')
| -rw-r--r-- | engines/mads/scene.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/engines/mads/scene.h b/engines/mads/scene.h index 9fd99ad8e5..c0784c3812 100644 --- a/engines/mads/scene.h +++ b/engines/mads/scene.h @@ -8,12 +8,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. @@ -40,6 +40,8 @@ namespace MADS { +enum { RETURNING_FROM_DIALOG = -2, RETURNING_FROM_LOADING = -1 }; + class Scene { private: /** @@ -121,7 +123,7 @@ public: bool _reloadSceneFlag; Common::Point _posAdjust; uint32 _frameStartTime; - Layer _layer; + ScreenMode _mode; bool _lookFlag; Common::Point _customDest; Common::Array<PaletteUsage::UsageEntry> _paletteUsageF; |