From cbd1348760299580d22f9b0b0a52021768d8619e Mon Sep 17 00:00:00 2001
From: Mathieu Schroeter <mathieu@schroetersa.ch>
Date: Sun, 5 Feb 2017 10:04:05 +0100
Subject: [PATCH] Remove ddraw cursor

---
 pixmap.cpp | 13 +++++++++----
 pixmap.h   |  2 --
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/pixmap.cpp b/pixmap.cpp
index 08ce038..acce9eb 100644
--- a/pixmap.cpp
+++ b/pixmap.cpp
@@ -37,7 +37,9 @@ CPixmap::CPixmap()
 	m_lpDD         = NULL;
 	m_lpDDSPrimary = NULL;
 	m_lpDDSBack    = NULL;
-	m_lpDDSMouse   = NULL;
+
+	for (i = 0; i < MAXCURSORS; i++)
+		m_lpSDLCursors[i] = nullptr;
 
 	for ( i=0 ; i<MAXIMAGE ; i++ )
 	{
@@ -71,10 +73,13 @@ CPixmap::~CPixmap()
 			m_lpDDSBack = NULL;
 		}
 
-		if ( m_lpDDSMouse != NULL )
+		for (i = 0; i < MAXIMAGE; i++)
 		{
-			m_lpDDSMouse->Release();
-			m_lpDDSMouse = NULL;
+			if (m_lpSDLCursors[i])
+			{
+				SDL_FreeCursor (m_lpSDLCursors[i]);
+				m_lpSDLCursors[i] = nullptr;
+			}
 		}
 
 		for ( i=0 ; i<MAXIMAGE ; i++ )
diff --git a/pixmap.h b/pixmap.h
index 33a1026..6191f9e 100644
--- a/pixmap.h
+++ b/pixmap.h
@@ -71,11 +71,9 @@ protected:
 	SDL_Surface *			m_lpSDLPrimary;
 	LPDIRECTDRAWSURFACE		m_lpDDSBack;			// DirectDraw back surface
 	SDL_Surface *			m_lpSDLBack;
-	LPDIRECTDRAWSURFACE		m_lpDDSMouse;			// DirectDraw back surface
 	SDL_Cursor *			m_lpCurrentCursor;
 	SDL_Cursor *			m_lpSDLCursors[MAXCURSORS];
 	SDL_Surface *			m_lpSDLBlupi;
-	SDL_Surface *			m_lpSDLSurface[MAXIMAGE];
 	SDL_Texture *			m_lpSDLTexture[MAXIMAGE];
 	COLORREF				m_colorSurface[2*MAXIMAGE];