- this is incomplete, i'm just putting this here for now so i don't lose it

This commit is contained in:
Rachael Alexanderson 2020-01-08 09:54:18 -05:00
parent 4825d66e10
commit 897354e725
4 changed files with 4 additions and 14 deletions

View File

@ -205,7 +205,7 @@ TArray<FString> I_GetSteamPath()
{ {
SteamInstallFolders = ParseSteamRegistry(regPath); 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. // If we can't parse for some reason just pretend we can't find anything.
return result; return result;

View File

@ -39,10 +39,9 @@
#include "hardware.h" #include "hardware.h"
#include "c_dispatch.h" #include "c_dispatch.h"
#include "v_text.h" #include "v_text.h"
#include "doomstat.h"
#include "m_argv.h" #include "m_argv.h"
#include "doomerrors.h" #include "c_console.h"
#include "swrenderer/r_swrenderer.h" #include "common/utility/printf.h"
IVideo *Video; IVideo *Video;

View File

@ -36,7 +36,6 @@
#include <SDL.h> #include <SDL.h>
#include "bitmap.h" #include "bitmap.h"
#include "v_palette.h"
#include "textures.h" #include "textures.h"
bool I_SetCursor(FTexture *cursorpic) bool I_SetCursor(FTexture *cursorpic)
@ -44,7 +43,7 @@ bool I_SetCursor(FTexture *cursorpic)
static SDL_Cursor *cursor; static SDL_Cursor *cursor;
static SDL_Surface *cursorSurface; static SDL_Surface *cursorSurface;
if (cursorpic != NULL && cursorpic->isValid()) if (cursorpic != NULL)
{ {
auto src = cursorpic->GetBgraBitmap(nullptr); auto src = cursorpic->GetBgraBitmap(nullptr);
// Must be no larger than 32x32. // Must be no larger than 32x32.

View File

@ -31,23 +31,15 @@
** **
*/ */
#include <SDL.h> #include <SDL.h>
#include "doomtype.h"
#include "doomdef.h"
#include "doomstat.h"
#include "m_argv.h" #include "m_argv.h"
#include "v_video.h" #include "v_video.h"
#include "d_main.h"
#include "d_event.h" #include "d_event.h"
#include "d_gui.h" #include "d_gui.h"
#include "c_console.h" #include "c_console.h"
#include "c_dispatch.h" #include "c_dispatch.h"
#include "dikeys.h" #include "dikeys.h"
#include "events.h"
#include "g_game.h"
#include "g_levellocals.h"
#include "utf8.h" #include "utf8.h"
#include "doomerrors.h"
static void I_CheckGUICapture (); static void I_CheckGUICapture ();