From 6b3fe382ec70ac027bb87722fab0d7d612d42ea7 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 30 Jun 2015 22:50:00 -0400
Subject: SHERLOCK: Change _lookPosition to use PositionFacing

---
 engines/sherlock/objects.h | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'engines/sherlock/objects.h')

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
-- 
cgit v1.2.3