From 3921e0bf7a6df16c8f7cf8e6e47981b22ed49c87 Mon Sep 17 00:00:00 2001 From: Jan Niklas Hasse Date: Thu, 3 Oct 2024 20:36:42 +0200 Subject: [PATCH] Fix compile error without GL_MULTISAMPLE_ARB --- src/main.cpp | 2 +- src/sdl/controller/SdlController.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 27475bb20..701bd1684 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -609,7 +609,7 @@ void setAntiAliasing(bool enabled) { } antiAliasingEnabled = enabled; #else - debug("WARNING: anti aliasing not available!\n"); + internal::warn("Anti-Aliasing not available!"); #endif } diff --git a/src/sdl/controller/SdlController.cpp b/src/sdl/controller/SdlController.cpp index 2592ae49a..73f525b69 100644 --- a/src/sdl/controller/SdlController.cpp +++ b/src/sdl/controller/SdlController.cpp @@ -1,9 +1,9 @@ -// Copyright 2017-2022 Jan Niklas Hasse +// Copyright 2017-2024 Jan Niklas Hasse // For conditions of distribution and use, see copyright notice in LICENSE.txt #include "SdlController.hpp" -#include "../../jngl/debug.hpp" +#include "../../log.hpp" #include "../../window.hpp" #include @@ -14,10 +14,10 @@ SdlController::SdlController(SDL_Joystick* const handle, const int index) : handle(handle), haptic(SDL_HapticOpenFromJoystick(handle)) { if (haptic) { if (SDL_HapticRumbleInit(haptic) < 0) { - debugLn(SDL_GetError()); + internal::error(SDL_GetError()); } } else { - debugLn(SDL_GetError()); + internal::error(SDL_GetError()); } switch (SDL_JoystickNumButtons(handle)) { case 11: @@ -36,7 +36,7 @@ SdlController::SdlController(SDL_Joystick* const handle, const int index) this->handle = nullptr; SDL_JoystickClose(handle); } else { - debugLn("WARNING: SDL_GameControllerOpen failed, falling back to joystick."); + internal::warn("SDL_GameControllerOpen failed, falling back to joystick."); } } }