mirror of
https://github.com/blupi-games/planetblupi
synced 2024-12-30 10:15:36 +01:00
Remove a lot of useless mouse stuff
This commit is contained in:
parent
8bca8b5840
commit
158470c386
@ -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();
|
||||
|
@ -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);
|
||||
|
2
menu.cpp
2
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;
|
||||
|
1
menu.h
1
menu.h
@ -44,7 +44,6 @@ protected:
|
||||
int m_errors[MAXBUTTON];
|
||||
UINT m_messages[MAXBUTTON];
|
||||
int m_selRank;
|
||||
POINT m_mousePos;
|
||||
};
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
34
pixmap.cpp
34
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.
|
||||
|
||||
|
6
pixmap.h
6
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
|
||||
|
Loading…
x
Reference in New Issue
Block a user