From 781132aabcfd38cb14d517d1d4b2598d4bd5f791 Mon Sep 17 00:00:00 2001
From: CeRiAl
Date: Sat, 11 Jun 2011 01:07:46 +0200
Subject: WINCE: Some cleanup (public vs. private scopes), fix freelook

---
 backends/events/wincesdl/wincesdl-events.cpp | 11 ++++-------
 backends/events/wincesdl/wincesdl-events.h   |  4 ----
 2 files changed, 4 insertions(+), 11 deletions(-)

(limited to 'backends/events')

diff --git a/backends/events/wincesdl/wincesdl-events.cpp b/backends/events/wincesdl/wincesdl-events.cpp
index f15a416b76..4fab47a58e 100644
--- a/backends/events/wincesdl/wincesdl-events.cpp
+++ b/backends/events/wincesdl/wincesdl-events.cpp
@@ -35,7 +35,7 @@
 
 WINCESdlEventSource::WINCESdlEventSource()
 	: _tapTime(0), _closeClick(false), _rbutton(false),
-	  _freeLook(false), _graphicsMan(0) {
+	  _graphicsMan(0) {
 }
 
 void WINCESdlEventSource::init(WINCESdlGraphicsManager *graphicsMan) {
@@ -64,6 +64,7 @@ bool WINCESdlEventSource::pollEvent(Common::Event &event) {
 	ev.type = SDL_NOEVENT;
 	DWORD currentTime;
 	bool keyEvent = false;
+	bool freeLookActive = _graphicsMan->getFreeLookState();
 	int deltaX, deltaY;
 
 	memset(&event, 0, sizeof(Common::Event));
@@ -199,7 +200,7 @@ bool WINCESdlEventSource::pollEvent(Common::Event &event) {
 				}
 			}
 
-			if (_freeLook && !_closeClick) {
+			if (freeLookActive && !_closeClick) {
 				_rbutton = false;
 				_tapTime = 0;
 				_tapX = event.mouse.x;
@@ -241,7 +242,7 @@ bool WINCESdlEventSource::pollEvent(Common::Event &event) {
 
 			fillMouseEvent(event, ev.button.x, ev.button.y);
 
-			if (_freeLook && !_closeClick) {
+			if (freeLookActive && !_closeClick) {
 				_tapX = event.mouse.x;
 				_tapY = event.mouse.y;
 				event.type = Common::EVENT_MOUSEMOVE;
@@ -322,8 +323,4 @@ int WINCESdlEventSource::mapKeyCE(SDLKey key, SDLMod mod, Uint16 unicode, bool u
 	return key;
 }
 
-void WINCESdlEventSource::swap_freeLook() {
-	_freeLook = !_freeLook;
-}
-
 #endif /* _WIN32_WCE */
diff --git a/backends/events/wincesdl/wincesdl-events.h b/backends/events/wincesdl/wincesdl-events.h
index 734cc899c0..deeee6196c 100644
--- a/backends/events/wincesdl/wincesdl-events.h
+++ b/backends/events/wincesdl/wincesdl-events.h
@@ -45,8 +45,6 @@ public:
 	// Overloaded from SDL backend (mouse and new scaler handling)
 	void fillMouseEvent(Common::Event &event, int x, int y);
 
-	void swap_freeLook();
-
 protected:
 
 private:
@@ -61,8 +59,6 @@ private:
 
 	bool _closeClick;           // flag when taps are spatially close together
 	bool _rbutton;              // double tap -> right button simulation
-	bool _freeLook;             // freeLook mode (do not send mouse button events)
-
 };
 
 #endif
-- 
cgit v1.2.3