From 3dd443d53d6c72c93a4a7edca062b62bc1a4237d Mon Sep 17 00:00:00 2001
From: Mathieu Schroeter <mathieu@schroetersa.ch>
Date: Thu, 26 Jan 2017 19:07:32 +0100
Subject: [PATCH] Remove stuff to control if the mouse is visible

With SDL it's useless because the mouse is not blit on the
renderer by our code.
---
 event.cpp  | 25 -------------------------
 event.h    |  1 -
 misc.cpp   |  1 -
 pixmap.cpp | 16 ----------------
 pixmap.h   |  1 -
 5 files changed, 44 deletions(-)

diff --git a/event.cpp b/event.cpp
index a2e2d9d..83b56ac 100644
--- a/event.cpp
+++ b/event.cpp
@@ -1462,7 +1462,6 @@ CEvent::CEvent()
 	m_bFillMouse    = false;
 	m_bWaitMouse    = false;
 	m_bHideMouse    = false;
-	m_bShowMouse    = false;
 	m_rankCheat     = -1;
 	m_posCheat      = 0;
 	m_speed         = 1;
@@ -2772,12 +2771,6 @@ bool CEvent::ChangePhase(UINT phase)
 	bool	bEnable, bHide;
 	Term*	pTerm;
 
-	if ( m_mouseType == MOUSETYPEGRA && m_bFullScreen )
-	{
-		ShowCursor(false);  // cache la vilaine souris Windows
-		m_bShowMouse = false;
-	}
-
 	if ( phase != WM_PHASE_SETUPp &&
 		 phase != WM_PHASE_WRITEp &&
 		 phase != WM_PHASE_PLAY   )
@@ -4966,15 +4959,6 @@ bool CEvent::TreatEventBase(UINT message, WPARAM wParam, LPARAM lParam)
 			break;
 
 		case WM_MOUSEMOVE:
-			if ( m_mouseType == MOUSETYPEGRA )
-			{
-				if ( m_bShowMouse )
-				{
-					ShowCursor(false);  // cache la souris
-					m_pPixmap->MouseShow(true);  // montre sprite
-					m_bShowMouse = false;
-				}
-			}
 			if ( m_mouseType == MOUSETYPEWINPOS &&
 				 (pos.x != m_oldMousePos.x ||
 				  pos.y != m_oldMousePos.y ) )
@@ -4998,15 +4982,6 @@ bool CEvent::TreatEventBase(UINT message, WPARAM wParam, LPARAM lParam)
 			break;
 
 		case WM_NCMOUSEMOVE:
-			if ( m_mouseType == MOUSETYPEGRA )
-			{
-				if ( !m_bShowMouse )
-				{
-					ShowCursor(true);  // montre la souris
-					m_pPixmap->MouseShow(false);  // cache sprite
-					m_bShowMouse = true;
-				}
-			}
 			break;
 
 		case WM_LBUTTONUP:
diff --git a/event.h b/event.h
index 5f99841..81900b8 100644
--- a/event.h
+++ b/event.h
@@ -183,7 +183,6 @@ protected:
 	bool		m_bFillMouse;
 	bool		m_bWaitMouse;
 	bool		m_bHideMouse;
-	bool		m_bShowMouse;
 	int			m_rankCheat;
 	int			m_posCheat;
 	bool		m_bMovie;
diff --git a/misc.cpp b/misc.cpp
index 71ef211..7d3611e 100644
--- a/misc.cpp
+++ b/misc.cpp
@@ -49,7 +49,6 @@ void LoadString(UINT nID, char *pBuffer, int lgBuffer)
 void ChangeSprite(int sprite)
 {
 	HCURSOR		hCursor = nullptr;
-	SDL_Cursor * cursor;
 
 	if ( g_mouseType == MOUSETYPEGRA )  return;
 	if ( g_lastSprite == sprite )  return;
diff --git a/pixmap.cpp b/pixmap.cpp
index a540f0b..8b97a51 100644
--- a/pixmap.cpp
+++ b/pixmap.cpp
@@ -37,7 +37,6 @@ CPixmap::CPixmap()
 	m_mousePos.y   = LYIMAGE/2;
 	m_mouseBackPos = m_mousePos;
 	m_bMouseBack   = false;
-	m_bMouseShow   = true;
 	m_bBackDisplayed = false;
 
 	m_lpDD         = NULL;
@@ -125,23 +124,12 @@ bool CPixmap::Create(HWND hwnd, POINT dim,
 {
 	DDSURFACEDESC		ddsd;
 	HRESULT				ddrval;
-	POINT				pos;
 
 	m_hWnd        = hwnd;
 	m_bFullScreen = bFullScreen;
 	m_mouseType   = mouseType;
 	m_dim         = dim;
 
-	if ( m_mouseType == MOUSETYPEGRA )
-	{
-		// Cache définitivement la vilaine souris Windows.
-		ShowCursor(false);
-
-		pos = m_mousePos;
-		ClientToScreen(m_hWnd, &pos);
-		SetCursorPos(pos.x, pos.y);  // met la souris au centre
-	}
-
 	m_clipRect.left   = 0;
 	m_clipRect.top    = 0;
 	m_clipRect.right  = dim.x;
@@ -1173,7 +1161,6 @@ void CPixmap::SetMouseSprite(int sprite, bool bDemoPlay)
 
 void CPixmap::MouseShow(bool bShow)
 {
-	m_bMouseShow = bShow;
 	SDL_ShowCursor (bShow);
 }
 
@@ -1186,7 +1173,6 @@ void CPixmap::MouseUpdate()
 	if ( m_lpDDSurface[CHBLUPI] == NULL )  return;
 	if ( m_mouseType != MOUSETYPEGRA )  return;
 	if ( m_mouseSprite == SPRITE_EMPTY )  return;
-	if ( !m_bMouseShow )  return;
 
 	oldRect.left   = m_mouseBackPos.x;
 	oldRect.top    = m_mouseBackPos.y;
@@ -1287,7 +1273,6 @@ void CPixmap::MouseBackDraw()
 	if ( m_lpDDSurface[CHBLUPI] == NULL )  return;
 	if ( m_mouseType != MOUSETYPEGRA )  return;
 	if ( m_mouseSprite == SPRITE_EMPTY )  return;
-	if ( !m_bMouseShow )  return;
 
 	MouseBackSave();  // sauve ce qui sera sous la souris
 
@@ -1330,7 +1315,6 @@ void CPixmap::MouseBackSave()
 	if ( m_lpDDSurface[CHBLUPI] == NULL )  return;
 	if ( m_mouseType != MOUSETYPEGRA )  return;
 	if ( m_mouseSprite == SPRITE_EMPTY )  return;
-	if ( !m_bMouseShow )  return;
 
 	m_mouseBackPos.x = m_mousePos.x - m_mouseHotSpot.x;
 	m_mouseBackPos.y = m_mousePos.y - m_mouseHotSpot.y;
diff --git a/pixmap.h b/pixmap.h
index 99b3989..d925507 100644
--- a/pixmap.h
+++ b/pixmap.h
@@ -89,7 +89,6 @@ protected:
 	POINT					m_mouseHotSpot;
 	POINT					m_mouseBackPos;
 	bool					m_bMouseBack;
-	bool					m_bMouseShow;
 	bool					m_bBackDisplayed;
 
 	LPDIRECTDRAW			m_lpDD;					// DirectDraw object