From 44838d8156a60c76edbc357bec80daaedf704c80 Mon Sep 17 00:00:00 2001 From: Mathieu Schroeter Date: Sun, 5 Feb 2017 10:06:45 +0100 Subject: [PATCH] Remove more ddraw surfaces --- pixmap.cpp | 73 +++++++++--------------------------------------------- pixmap.h | 5 ---- 2 files changed, 12 insertions(+), 66 deletions(-) diff --git a/pixmap.cpp b/pixmap.cpp index acce9eb..5d67ee8 100644 --- a/pixmap.cpp +++ b/pixmap.cpp @@ -34,10 +34,6 @@ CPixmap::CPixmap() m_mouseSprite = SPRITE_WAIT; m_bBackDisplayed = false; - m_lpDD = NULL; - m_lpDDSPrimary = NULL; - m_lpDDSBack = NULL; - for (i = 0; i < MAXCURSORS; i++) m_lpSDLCursors[i] = nullptr; @@ -59,41 +55,23 @@ CPixmap::~CPixmap() { int i; - if ( m_lpDD != NULL ) - { - if ( m_lpDDSPrimary != NULL ) - { - m_lpDDSPrimary->Release(); - m_lpDDSPrimary = NULL; - } - - if ( m_lpDDSBack != NULL ) + for (i = 0; i < MAXIMAGE; i++) + { + if (m_lpSDLCursors[i]) { - m_lpDDSBack->Release(); - m_lpDDSBack = NULL; + SDL_FreeCursor (m_lpSDLCursors[i]); + m_lpSDLCursors[i] = nullptr; } + } - for (i = 0; i < MAXIMAGE; i++) + for ( i=0 ; iRelease(); - m_lpDD = NULL; - } + } } @@ -110,8 +88,6 @@ void CPixmap::SetDebug(bool bDebug) bool CPixmap::Create(POINT dim, bool bFullScreen, int mouseType) { - HRESULT ddrval; - m_bFullScreen = bFullScreen; m_mouseType = mouseType; m_dim = dim; @@ -121,31 +97,6 @@ bool CPixmap::Create(POINT dim, m_clipRect.right = dim.x; m_clipRect.bottom = dim.y; - // Create the main DirectDraw object - ddrval = DirectDrawCreate(NULL, &m_lpDD, NULL); - if ( ddrval != DD_OK ) - { - OutputDebug("Fatal error: DirectDrawCreate\n"); - return false; - } - - if ( ddrval != DD_OK ) - { - OutputDebug("Fatal error: SetCooperativeLevel\n"); - return false; - } - - // Set the video mode to 640x480x8. - if ( m_bFullScreen ) - { - ddrval = m_lpDD->SetDisplayMode(dim.x, dim.y, 8); - if ( ddrval != DD_OK ) - { - OutputDebug("Fatal error: SetDisplayMode\n"); - return false; - } - } - return true; } diff --git a/pixmap.h b/pixmap.h index 6191f9e..9caa2c8 100644 --- a/pixmap.h +++ b/pixmap.h @@ -66,11 +66,6 @@ protected: int m_mouseSprite; bool m_bBackDisplayed; - LPDIRECTDRAW m_lpDD; // DirectDraw object - LPDIRECTDRAWSURFACE m_lpDDSPrimary; // DirectDraw primary surface - SDL_Surface * m_lpSDLPrimary; - LPDIRECTDRAWSURFACE m_lpDDSBack; // DirectDraw back surface - SDL_Surface * m_lpSDLBack; SDL_Cursor * m_lpCurrentCursor; SDL_Cursor * m_lpSDLCursors[MAXCURSORS]; SDL_Surface * m_lpSDLBlupi;