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/tsage/core.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/tsage/core.h')
| -rw-r--r-- | engines/tsage/core.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/engines/tsage/core.h b/engines/tsage/core.h index 05f6f4b3a0..3286ee1448 100644 --- a/engines/tsage/core.h +++ b/engines/tsage/core.h @@ -515,7 +515,8 @@ public: enum ObjectFlags {OBJFLAG_FIXED_PRIORITY = 1, OBJFLAG_NO_UPDATES = 2, OBJFLAG_ZOOMED = 4, OBJFLAG_SUPPRESS_DISPATCH = 8, OBJFLAG_HIDE = 0x100, OBJFLAG_HIDING = 0x200, OBJFLAG_REMOVE = 0x400, OBJFLAG_CLONED = 0x800, OBJFLAG_CHECK_REGION = 0x1000, OBJFLAG_PANE_0 = 0x4000, OBJFLAG_PANE_1 = 0x8000, - OBJFLAG_PANES = OBJFLAG_PANE_0 | OBJFLAG_PANE_1 + OBJFLAG_PANES = OBJFLAG_PANE_0 | OBJFLAG_PANE_1, + OBJFLAG_FLIP_CENTROID_X = 0x10000, OBJFLAG_FLIP_CENTROID_Y = 0x20000 }; class SceneObject : public SceneHotspot { @@ -548,7 +549,7 @@ public: EventHandler *_mover; Common::Point _moveDiff; int _moveRate; - Common::Point _field8A; + Common::Point _actorDestPos; Action *_endAction; uint32 _regionBitList; |