diff options
author | Paul Gilbert | 2015-06-30 22:50:00 -0400 |
---|---|---|
committer | Paul Gilbert | 2015-06-30 22:50:00 -0400 |
commit | 6b3fe382ec70ac027bb87722fab0d7d612d42ea7 (patch) | |
tree | e6e806fa3af9a7128f5fbaddbebdac4d63343ad5 /engines/sherlock/objects.h | |
parent | d2c4074fa65106e5e26f66cf9ce79fe6f5214da6 (diff) | |
download | scummvm-rg350-6b3fe382ec70ac027bb87722fab0d7d612d42ea7.tar.gz scummvm-rg350-6b3fe382ec70ac027bb87722fab0d7d612d42ea7.tar.bz2 scummvm-rg350-6b3fe382ec70ac027bb87722fab0d7d612d42ea7.zip |
SHERLOCK: Change _lookPosition to use PositionFacing
Diffstat (limited to 'engines/sherlock/objects.h')
-rw-r--r-- | engines/sherlock/objects.h | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/engines/sherlock/objects.h b/engines/sherlock/objects.h index 7e94dd2bdd..60b5b3345e 100644 --- a/engines/sherlock/objects.h +++ b/engines/sherlock/objects.h @@ -117,6 +117,12 @@ public: void operator-=(const Point32 &delta) { x -= delta.x; y -= delta.y; } }; +class PositionFacing : public Point32 { +public: + int _facing; + + PositionFacing() : Point32(), _facing(0) {} +}; struct WalkSequence { Common::String _vgsName; @@ -210,8 +216,7 @@ public: AType _aType; // Tells if this is an object, person, talk, etc. int _lookFrames; // How many frames to play of the look anim before pausing int _seqCounter; // How many times this sequence has been executed - Point32 _lookPosition; // Where to walk when examining object - int _lookFacing; // Direction to face when examining object + PositionFacing _lookPosition; // Where to walk when examining object int _lookcAnim; int _seqStack; // Allows gosubs to return to calling frame int _seqTo; // Allows 1-5, 8-3 type sequences encoded in 2 bytes @@ -427,14 +432,6 @@ public: virtual void setObjTalkSequence(int seq); }; - -class PositionFacing : public Point32 { -public: - int _facing; - - PositionFacing() : Point32(), _facing(0) {} -}; - struct CAnim { Common::String _name; // Name Common::Point _position; // Position |