diff --git a/src/button.cpp b/src/button.cpp index 02cd300..2b44179 100644 --- a/src/button.cpp +++ b/src/button.cpp @@ -24,6 +24,10 @@ CButton::CButton() m_selMenu = 0; m_bMouseDown = false; m_message = static_cast (-1); + m_pPixmap = nullptr; + m_pDecor = nullptr; + m_pSound = nullptr; + m_toolTips = nullptr; } CButton::~CButton () {} diff --git a/src/event.cpp b/src/event.cpp index 47cdca1..92232e1 100644 --- a/src/event.cpp +++ b/src/event.cpp @@ -1494,6 +1494,19 @@ CEvent::CEvent() m_demoTime = 0; m_keymod = 0; m_posHelpButton = {-1, -1}; + m_pPixmap = nullptr; + m_pDecor = nullptr; + m_pSound = nullptr; + m_pMovie = nullptr; + m_bMenu = false; + m_bHili = false; + m_demoIndex = 0; + m_demoEnd = 0; + m_bHiliInfoButton = false; + m_bHiliHelpButton = false; + + memset (m_textToolTips, 0, sizeof (m_textToolTips)); + memset (m_libelle, 0, sizeof (m_libelle)); for (i = 0 ; i < MAXBUTTON ; i++) m_lastFloor[i] = 0; @@ -5290,4 +5303,3 @@ void CEvent::PushUserEvent (Sint32 code) SDL_PushEvent (&event); } - diff --git a/src/jauge.cpp b/src/jauge.cpp index 12f0c4c..109d879 100644 --- a/src/jauge.cpp +++ b/src/jauge.cpp @@ -11,8 +11,11 @@ CJauge::CJauge() { - m_type = 0; - m_bHide = true; + m_type = 0; + m_bHide = true; + m_pPixmap = nullptr; + m_pDecor = nullptr; + m_pSound = nullptr; } CJauge::~CJauge() @@ -105,4 +108,3 @@ POINT CJauge::GetPos() { return m_pos; } - diff --git a/src/menu.cpp b/src/menu.cpp index 75dc570..b23c95e 100644 --- a/src/menu.cpp +++ b/src/menu.cpp @@ -127,7 +127,10 @@ static const char *GetErr (Sint32 rank) CMenu::CMenu() { m_nbButtons = 0; - m_selRank = -1; + m_selRank = -1; + m_pPixmap = nullptr; + m_pDecor = nullptr; + m_pSound = nullptr; } // Destructeur. @@ -503,5 +506,3 @@ void CMenu::Message() if (m_selRank != -1) CEvent::PushUserEvent (WM_BUTTON0 + m_selRank); } - - diff --git a/src/movie.cpp b/src/movie.cpp index 1b0871d..7889a0d 100644 --- a/src/movie.cpp +++ b/src/movie.cpp @@ -145,6 +145,8 @@ CMovie::CMovie() m_videoTex = nullptr; pinfo = nullptr; + memset (m_audiobuf, 0, sizeof (m_audiobuf)); + m_ret = 0; } diff --git a/src/pixmap.cpp b/src/pixmap.cpp index 28c1835..0fd6dfc 100644 --- a/src/pixmap.cpp +++ b/src/pixmap.cpp @@ -36,6 +36,10 @@ CPixmap::CPixmap() m_mouseSprite = SPRITE_WAIT; m_bBackDisplayed = false; + m_lpSDLBlupi = nullptr; + + memset (m_filename, 0, sizeof (m_filename)); + for (i = 0; i < MAXCURSORS; i++) m_lpSDLCursors[i] = nullptr;