From bc5bac66b18de6d377f6b9562f9847e66482bc32 Mon Sep 17 00:00:00 2001 From: cflip Date: Mon, 21 Mar 2022 21:31:13 -0600 Subject: Minor improvements in Window class * Ensure event callbacks are not null before calling them * Mark shouldClose() as const * Use nullptr instead of NULL --- src/window.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'src/window.cpp') diff --git a/src/window.cpp b/src/window.cpp index 5f8de7e..3a06f18 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -38,13 +38,16 @@ void Window::update() m_isRunning = false; break; case SDL_MOUSEBUTTONDOWN: - m_mouseDown(event.button.button, event.button.x, event.button.y); + if (m_mouseDown) + m_mouseDown(event.button.button, event.button.x, event.button.y); break; case SDL_MOUSEMOTION: - m_mouseMove(event.button.x, event.button.y); + if (m_mouseMove) + m_mouseMove(event.button.x, event.button.y); break; case SDL_MOUSEBUTTONUP: - m_mouseUp(event.button.button, event.button.x, event.button.y); + if (m_mouseUp) + m_mouseUp(event.button.button, event.button.x, event.button.y); break; } } @@ -56,7 +59,7 @@ void Window::update() void Window::draw(Bitmap& bitmap) { SDL_RenderClear(m_renderer); - SDL_UpdateTexture(m_texture, NULL, bitmap.data, m_width * 4); - SDL_RenderCopy(m_renderer, m_texture, NULL, NULL); + SDL_UpdateTexture(m_texture, nullptr, bitmap.data, m_width * 4); + SDL_RenderCopy(m_renderer, m_texture, nullptr, nullptr); SDL_RenderPresent(m_renderer); } \ No newline at end of file -- cgit v1.2.3