diff --git a/src/blupi.cxx b/src/blupi.cxx index f3d3d3d..2b57c11 100644 --- a/src/blupi.cxx +++ b/src/blupi.cxx @@ -160,7 +160,7 @@ static void UpdateFrame (void) if (g_pEvent->IsShift()) // screen shifting { - g_pEvent->DecorAutoShift (posMouse); + g_pEvent->DecorAutoShift (); g_pDecor->Build (clip, posMouse); // build the environment } else @@ -176,7 +176,7 @@ static void UpdateFrame (void) } } - g_pEvent->DecorAutoShift (posMouse); + g_pEvent->DecorAutoShift (); g_pDecor->Build (clip, posMouse); // build the environment g_pDecor->NextPhase (1); // rebuild the map sometimes } @@ -188,7 +188,7 @@ static void UpdateFrame (void) clip.top = POSDRAWY; clip.right = POSDRAWX + DIMDRAWX; clip.bottom = POSDRAWY + DIMDRAWY; - g_pEvent->DecorAutoShift (posMouse); + g_pEvent->DecorAutoShift (); g_pDecor->Build (clip, posMouse); // build the environment g_pDecor->NextPhase (-1); // rebuild the map sometimes } diff --git a/src/event.cxx b/src/event.cxx index 43f2252..cbddbca 100644 --- a/src/event.cxx +++ b/src/event.cxx @@ -3303,7 +3303,7 @@ void CEvent::DecorShift (Sint32 dx, Sint32 dy) // Décale le décor lorsque la souris touche un bord. -void CEvent::DecorAutoShift (POINT pos) +void CEvent::DecorAutoShift () { Sint32 max; POINT offset; @@ -3497,7 +3497,7 @@ bool CEvent::PlayDown (POINT pos, const SDL_Event &event) // Modifie le décor lorsque la souris est déplacée. -bool CEvent::PlayMove (POINT pos, Uint16 mod) +bool CEvent::PlayMove (POINT pos) { if (m_bMenu) { @@ -3527,7 +3527,7 @@ bool CEvent::PlayMove (POINT pos, Uint16 mod) // Modifie le décor lorsque le bouton de la souris est relâché. -bool CEvent::PlayUp (POINT pos, Uint16 mod) +bool CEvent::PlayUp (POINT pos) { static Sint32 table_sound_boing[3] = { @@ -4087,14 +4087,6 @@ bool CEvent::BuildMove (POINT pos, Uint16 mod, const SDL_Event &event) return true; } -// Modifie le décor lorsque le bouton de la souris est relâché. - -bool CEvent::BuildUp (POINT pos) -{ - return true; -} - - // Démarre un film non interractif. bool CEvent::StartMovie (const char *pFilename) @@ -5158,7 +5150,7 @@ bool CEvent::TreatEventBase (const SDL_Event &event) } if (m_phase == WM_PHASE_PLAY) { - if (PlayMove (pos, m_keymod)) + if (PlayMove (pos)) return true; } break; @@ -5174,13 +5166,10 @@ bool CEvent::TreatEventBase (const SDL_Event &event) if (EventButtons (event, pos)) return true; if (m_phase == WM_PHASE_BUILD) - { - if (BuildUp (pos)) - return true; - } + return true; if (m_phase == WM_PHASE_PLAY) { - if (PlayUp (pos, m_keymod)) + if (PlayUp (pos)) return true; } if (m_phase == WM_PHASE_BYE) diff --git a/src/event.h b/src/event.h index 5027bef..8bec5e1 100644 --- a/src/event.h +++ b/src/event.h @@ -101,7 +101,7 @@ public: bool TreatEvent (const SDL_Event &event); bool TreatEventBase (const SDL_Event &event); - void DecorAutoShift (POINT pos); + void DecorAutoShift (); bool StartMovie (const char *pFilename); void StopMovie(); @@ -131,8 +131,8 @@ protected: void DecorShift (Sint32 dx, Sint32 dy); bool PlayDown (POINT pos, const SDL_Event &event); - bool PlayMove (POINT pos, Uint16 mod); - bool PlayUp (POINT pos, Uint16 mod); + bool PlayMove(POINT pos); + bool PlayUp(POINT pos); void SetLanguage (); void SetWindowSize (Uint8 prevScale, Uint8 newScale); @@ -143,7 +143,6 @@ protected: void BuildWater (POINT cel, Sint32 insIcon); bool BuildDown (POINT pos, Uint16 mod, bool bMix = true); bool BuildMove (POINT pos, Uint16 mod, const SDL_Event &event); - bool BuildUp (POINT pos); void PrivateLibelle(); bool ReadLibelle (Sint32 world, bool bSchool, bool bHelp);