From 10af04da6a9a01d2f1ff5febed86c4c5ca6cfb8d Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 29 Dec 2013 09:58:43 +1100
Subject: VOYEUR: Mouse flags cleanup and in progress work on doGossip

---
 engines/voyeur/events.h | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'engines/voyeur/events.h')

diff --git a/engines/voyeur/events.h b/engines/voyeur/events.h
index 3d1c5779e5..487d59e94d 100644
--- a/engines/voyeur/events.h
+++ b/engines/voyeur/events.h
@@ -125,15 +125,7 @@ public:
 	int _curICF0;
 	int _curICF1;
 	int _fadeICF0;
-	bool _leftClick, _rightClick;
-	bool _mouseClicked;
-	bool _mouseUnk;
 	int _policeEvent;
-
-	// Fields not originally in _voy, but I'm putting in for convenience
-	bool _newMouseClicked;
-	bool _newLeftClick, _newRightClick;
-	bool _newMouseUnk;
 };
 
 class IntData {
@@ -193,6 +185,13 @@ public:
 	int _fadeCount;
 	int _fadeStatus;
 
+	bool _leftClick, _rightClick;
+	bool _mouseClicked;
+	bool _mouseUnk;
+	bool _newMouseClicked;
+	bool _newLeftClick, _newRightClick;
+	bool _newMouseUnk;
+
 	int _v2A0A2;
 	int _videoComputerBut4;
 	int _videoDead;
-- 
cgit v1.2.3