backup/planetblupi
1
0
Fork 0
mirror of https://github.com/blupi-games/planetblupi synced 2024-12-30 10:15:36 +01:00
Code Issues Projects Releases Activity

Remove dead code

Browse Source
This commit is contained in:
Mathieu Schroeter 2017-02-28 20:58:09 +01:00
parent 34d0dd7f02
commit 5ff9482422
3 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/blupi.cxx
View File

@ -160,7 +160,7 @@ static void UpdateFrame (void)
if (g_pEvent->IsShift()) // screen shifting if (g_pEvent->IsShift()) // screen shifting
{ {
g_pEvent->DecorAutoShift (posMouse); g_pEvent->DecorAutoShift ();
g_pDecor->Build (clip, posMouse); // build the environment g_pDecor->Build (clip, posMouse); // build the environment
} }
else 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->Build (clip, posMouse); // build the environment
g_pDecor->NextPhase (1); // rebuild the map sometimes g_pDecor->NextPhase (1); // rebuild the map sometimes
} }
@ -188,7 +188,7 @@ static void UpdateFrame (void)
clip.top = POSDRAWY; clip.top = POSDRAWY;
clip.right = POSDRAWX + DIMDRAWX; clip.right = POSDRAWX + DIMDRAWX;
clip.bottom = POSDRAWY + DIMDRAWY; clip.bottom = POSDRAWY + DIMDRAWY;
g_pEvent->DecorAutoShift (posMouse); g_pEvent->DecorAutoShift ();
g_pDecor->Build (clip, posMouse); // build the environment g_pDecor->Build (clip, posMouse); // build the environment
g_pDecor->NextPhase (-1); // rebuild the map sometimes g_pDecor->NextPhase (-1); // rebuild the map sometimes
} }

23
src/event.cxx
View File

@ -3303,7 +3303,7 @@ void CEvent::DecorShift (Sint32 dx, Sint32 dy)
// Décale le décor lorsque la souris touche un bord. // Décale le décor lorsque la souris touche un bord.
void CEvent::DecorAutoShift (POINT pos) void CEvent::DecorAutoShift ()
{ {
Sint32 max; Sint32 max;
POINT offset; 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. // 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) 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é. // 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] = static Sint32 table_sound_boing[3] =
{ {
@ -4087,14 +4087,6 @@ bool CEvent::BuildMove (POINT pos, Uint16 mod, const SDL_Event &event)
return true; 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. // Démarre un film non interractif.
bool CEvent::StartMovie (const char *pFilename) bool CEvent::StartMovie (const char *pFilename)
@ -5158,7 +5150,7 @@ bool CEvent::TreatEventBase (const SDL_Event &event)
} }
if (m_phase == WM_PHASE_PLAY) if (m_phase == WM_PHASE_PLAY)
{ {
if (PlayMove (pos, m_keymod)) if (PlayMove (pos))
return true; return true;
} }
break; break;
@ -5174,13 +5166,10 @@ bool CEvent::TreatEventBase (const SDL_Event &event)
if (EventButtons (event, pos)) if (EventButtons (event, pos))
return true; return true;
if (m_phase == WM_PHASE_BUILD) if (m_phase == WM_PHASE_BUILD)
{ return true;
if (BuildUp (pos))
return true;
}
if (m_phase == WM_PHASE_PLAY) if (m_phase == WM_PHASE_PLAY)
{ {
if (PlayUp (pos, m_keymod)) if (PlayUp (pos))
return true; return true;
} }
if (m_phase == WM_PHASE_BYE) if (m_phase == WM_PHASE_BYE)

7
src/event.h
View File

@ -101,7 +101,7 @@ public:
bool TreatEvent (const SDL_Event &event); bool TreatEvent (const SDL_Event &event);
bool TreatEventBase (const SDL_Event &event); bool TreatEventBase (const SDL_Event &event);
void DecorAutoShift (POINT pos); void DecorAutoShift ();
bool StartMovie (const char *pFilename); bool StartMovie (const char *pFilename);
void StopMovie(); void StopMovie();
@ -131,8 +131,8 @@ protected:
void DecorShift (Sint32 dx, Sint32 dy); void DecorShift (Sint32 dx, Sint32 dy);
bool PlayDown (POINT pos, const SDL_Event &event); bool PlayDown (POINT pos, const SDL_Event &event);
bool PlayMove (POINT pos, Uint16 mod); bool PlayMove(POINT pos);
bool PlayUp (POINT pos, Uint16 mod); bool PlayUp(POINT pos);
void SetLanguage (); void SetLanguage ();
void SetWindowSize (Uint8 prevScale, Uint8 newScale); void SetWindowSize (Uint8 prevScale, Uint8 newScale);
@ -143,7 +143,6 @@ protected:
void BuildWater (POINT cel, Sint32 insIcon); void BuildWater (POINT cel, Sint32 insIcon);
bool BuildDown (POINT pos, Uint16 mod, bool bMix = true); bool BuildDown (POINT pos, Uint16 mod, bool bMix = true);
bool BuildMove (POINT pos, Uint16 mod, const SDL_Event &event); bool BuildMove (POINT pos, Uint16 mod, const SDL_Event &event);
bool BuildUp (POINT pos);
void PrivateLibelle(); void PrivateLibelle();
bool ReadLibelle (Sint32 world, bool bSchool, bool bHelp); bool ReadLibelle (Sint32 world, bool bSchool, bool bHelp);