diff --git a/src/event.cxx b/src/event.cxx index 20ef5ae..3e66145 100644 --- a/src/event.cxx +++ b/src/event.cxx @@ -2638,7 +2638,7 @@ void CEvent::WaitMouse (bool bWait) m_mouseSprite = SPRITE_WAIT; else m_mouseSprite = MousePosToSprite (GetMousePos ()); - m_pPixmap->SetMouseSprite (m_mouseSprite, m_bDemoPlay); + m_pPixmap->SetMouseSprite (m_mouseSprite); m_pPixmap->ChangeSprite (m_mouseSprite); } @@ -2659,7 +2659,7 @@ void CEvent::HideMouse (bool bHide) SDL_ShowCursor (SDL_TRUE); } - m_pPixmap->SetMouseSprite (m_mouseSprite, m_bDemoPlay); + m_pPixmap->SetMouseSprite (m_mouseSprite); m_pPixmap->ChangeSprite (m_mouseSprite); } diff --git a/src/pixmap.cxx b/src/pixmap.cxx index f245303..32498a0 100644 --- a/src/pixmap.cxx +++ b/src/pixmap.cxx @@ -597,7 +597,7 @@ bool CPixmap::Display () // Change le lutin de la souris. -void CPixmap::SetMouseSprite (Sint32 sprite, bool bDemoPlay) +void CPixmap::SetMouseSprite (MouseSprites sprite) { if (m_mouseSprite == sprite) return; @@ -773,7 +773,7 @@ on the endianness (byte order) of the machine */ amask = 0xff000000; #endif - for (Sint32 sprite = SPRITE_BEGIN; sprite <= SPRITE_END; ++sprite) + for (int sprite = SPRITE_BEGIN; sprite <= SPRITE_END; ++sprite) { SDL_Point hotspot = this->GetCursorHotSpot (sprite); SDL_Rect rect = this->GetCursorRect (sprite); diff --git a/src/pixmap.h b/src/pixmap.h index c6519a2..b863956 100644 --- a/src/pixmap.h +++ b/src/pixmap.h @@ -84,7 +84,7 @@ public: bool Display (); - void SetMouseSprite (Sint32 sprite, bool bDemoPlay); + void SetMouseSprite (MouseSprites sprite); void MouseShow (bool bShow); void LoadCursors (); void ChangeSprite (MouseSprites sprite); @@ -105,8 +105,8 @@ protected: POINT m_dim; // dimensions totales RECT m_clipRect; // rectangle de clipping - Sint32 m_mouseSprite; - bool m_bBackDisplayed; + MouseSprites m_mouseSprite; + bool m_bBackDisplayed; SDL_Cursor * m_lpCurrentCursor; SDL_Cursor * m_lpSDLCursors[MAXCURSORS];