diff --git a/blupi.cpp b/blupi.cpp index d1ac602..6cbbf82 100644 --- a/blupi.cpp +++ b/blupi.cpp @@ -362,7 +362,7 @@ LRESULT CALLBACK WindowProc2 (HWND hWnd, UINT message, const SDL_Event *event) { static HINSTANCE hInstance; - POINT mousePos, totalDim, iconDim; + POINT totalDim, iconDim; // La touche F10 envoie un autre message pour activer // le menu dans les applications Windows standard ! @@ -413,11 +413,6 @@ LRESULT CALLBACK WindowProc2 (HWND hWnd, UINT message, } break; - case WM_LBUTTONDOWN: - GetCursorPos(&mousePos); - ScreenToClient(hWnd, &mousePos); - break; - case WM_DESTROY: KillTimer(g_hWnd, 1); FinishObjects(); diff --git a/event.cpp b/event.cpp index 9cbb2c5..ed758e4 100644 --- a/event.cpp +++ b/event.cpp @@ -2493,8 +2493,6 @@ MouseSprites CEvent::MousePosToSprite(POINT pos) void CEvent::MouseSprite(POINT pos) { m_mouseSprite = MousePosToSprite(pos); - - m_pPixmap->SetMousePosSprite(pos, m_mouseSprite, m_bDemoPlay); m_pPixmap->ChangeSprite(m_mouseSprite); } @@ -4047,7 +4045,6 @@ void CEvent::StopMovie() { m_pMovie->Stop(m_hWnd); m_pPixmap->RestorePalette(); - m_pPixmap->MouseInvalidate(); m_pSound->Flush(SOUND_MOVIE); // m_pSound->RestartMusic(); ChangePhase(m_phase); diff --git a/menu.cpp b/menu.cpp index a793105..6122ddc 100644 --- a/menu.cpp +++ b/menu.cpp @@ -414,7 +414,6 @@ bool CMenu::MouseDown(POINT pos) bool CMenu::MouseMove(POINT pos) { - m_mousePos = pos; m_selRank = Detect(pos); if ( pos.x < m_pos.x-(DIMBUTTONX+MARGMENU) || @@ -432,7 +431,6 @@ bool CMenu::MouseMove(POINT pos) bool CMenu::MouseUp(POINT pos) { - m_mousePos = pos; m_selRank = Detect(pos); return false; diff --git a/menu.h b/menu.h index 2fb32ad..8296b05 100644 --- a/menu.h +++ b/menu.h @@ -44,7 +44,6 @@ protected: int m_errors[MAXBUTTON]; UINT m_messages[MAXBUTTON]; int m_selRank; - POINT m_mousePos; }; ///////////////////////////////////////////////////////////////////////////// diff --git a/pixmap.cpp b/pixmap.cpp index cfdead4..edc6462 100644 --- a/pixmap.cpp +++ b/pixmap.cpp @@ -32,10 +32,6 @@ CPixmap::CPixmap() m_bPalette = true; m_mouseSprite = SPRITE_WAIT; - m_mousePos.x = LXIMAGE/2; - m_mousePos.y = LYIMAGE/2; - m_mouseBackPos = m_mousePos; - m_bMouseBack = false; m_bBackDisplayed = false; m_lpDD = NULL; @@ -1089,29 +1085,6 @@ bool CPixmap::Display() return true; } - -// Positionne la souris et change le lutin. - -void CPixmap::SetMousePosSprite(POINT pos, int sprite, bool bDemoPlay) -{ - if ( m_mousePos.x == pos.x && - m_mousePos.y == pos.y && - m_mouseSprite == sprite ) return; - - m_mousePos = pos; - m_mouseSprite = sprite; -} - -// Positionne la souris. - -void CPixmap::SetMousePos(POINT pos, bool bDemoPlay) -{ - if ( m_mousePos.x == pos.x && - m_mousePos.y == pos.y ) return; - - m_mousePos = pos; -} - // Change le lutin de la souris. void CPixmap::SetMouseSprite(int sprite, bool bDemoPlay) @@ -1130,13 +1103,6 @@ void CPixmap::MouseShow(bool bShow) SDL_ShowCursor (bShow); } -// Invalide la copie sous la souris. - -void CPixmap::MouseInvalidate() -{ - m_bMouseBack = false; -} - // Retourne le rectangle correspondant au sprite // de la souris dans CHBLUPI. diff --git a/pixmap.h b/pixmap.h index 7638bb2..ed15047 100644 --- a/pixmap.h +++ b/pixmap.h @@ -50,11 +50,8 @@ public: bool Display(); - void SetMousePosSprite(POINT pos, int sprite, bool bDemoPlay); - void SetMousePos(POINT pos, bool bDemoPlay); void SetMouseSprite(int sprite, bool bDemoPlay); void MouseShow(bool bShow); - void MouseInvalidate(); void LoadCursors (); void ChangeSprite (MouseSprites sprite); @@ -77,10 +74,7 @@ protected: POINT m_dim; // dimensions totales RECT m_clipRect; // rectangle de clipping - POINT m_mousePos; int m_mouseSprite; - POINT m_mouseBackPos; - bool m_bMouseBack; bool m_bBackDisplayed; LPDIRECTDRAW m_lpDD; // DirectDraw object