diff --git a/source/platform/posix/i_steam.cpp b/source/platform/posix/i_steam.cpp index b0d9cfc33..bd3c60a5e 100644 --- a/source/platform/posix/i_steam.cpp +++ b/source/platform/posix/i_steam.cpp @@ -205,7 +205,7 @@ TArray I_GetSteamPath() { SteamInstallFolders = ParseSteamRegistry(regPath); } - catch(class CRecoverableError &error) + catch(class std::runtime_error &error) { // If we can't parse for some reason just pretend we can't find anything. return result; diff --git a/source/platform/posix/sdl/hardware.cpp b/source/platform/posix/sdl/hardware.cpp index 9493b7c48..d9b8ac6a6 100644 --- a/source/platform/posix/sdl/hardware.cpp +++ b/source/platform/posix/sdl/hardware.cpp @@ -39,10 +39,9 @@ #include "hardware.h" #include "c_dispatch.h" #include "v_text.h" -#include "doomstat.h" #include "m_argv.h" -#include "doomerrors.h" -#include "swrenderer/r_swrenderer.h" +#include "c_console.h" +#include "common/utility/printf.h" IVideo *Video; diff --git a/source/platform/posix/sdl/i_gui.cpp b/source/platform/posix/sdl/i_gui.cpp index 8ad9c8b92..f7388d49d 100644 --- a/source/platform/posix/sdl/i_gui.cpp +++ b/source/platform/posix/sdl/i_gui.cpp @@ -36,7 +36,6 @@ #include #include "bitmap.h" -#include "v_palette.h" #include "textures.h" bool I_SetCursor(FTexture *cursorpic) @@ -44,7 +43,7 @@ bool I_SetCursor(FTexture *cursorpic) static SDL_Cursor *cursor; static SDL_Surface *cursorSurface; - if (cursorpic != NULL && cursorpic->isValid()) + if (cursorpic != NULL) { auto src = cursorpic->GetBgraBitmap(nullptr); // Must be no larger than 32x32. diff --git a/source/platform/posix/sdl/i_input.cpp b/source/platform/posix/sdl/i_input.cpp index 77e6f1860..c9614b1ed 100644 --- a/source/platform/posix/sdl/i_input.cpp +++ b/source/platform/posix/sdl/i_input.cpp @@ -31,23 +31,15 @@ ** */ #include -#include "doomtype.h" -#include "doomdef.h" -#include "doomstat.h" #include "m_argv.h" #include "v_video.h" -#include "d_main.h" #include "d_event.h" #include "d_gui.h" #include "c_console.h" #include "c_dispatch.h" #include "dikeys.h" -#include "events.h" -#include "g_game.h" -#include "g_levellocals.h" #include "utf8.h" -#include "doomerrors.h" static void I_CheckGUICapture ();