cosmetics

This commit is contained in:
Fabian Greffrath 2021-12-10 10:38:23 +01:00
parent 54a46a5a25
commit 8cc369dadf
2 changed files with 17 additions and 7 deletions

View File

@ -41,7 +41,11 @@ void I_Endoom(byte *endoom_data)
TXT_PreInit(I_GetSDLWindow(), I_GetSDLRenderer());
TXT_Init();
if (!TXT_Init())
{
fprintf(stderr, "Failed to initialize libtextscreen\n");
return;
}
// Write the data to the screen memory

View File

@ -228,9 +228,13 @@ static void ChooseFont(void)
void TXT_PreInit(SDL_Window *preset_window, SDL_Renderer *preset_renderer)
{
if (preset_window != NULL && preset_renderer != NULL)
if (preset_window != NULL)
{
TXT_SDLWindow = preset_window;
}
if (preset_renderer != NULL)
{
renderer = preset_renderer;
}
}
@ -257,19 +261,21 @@ int TXT_Init(void)
if (TXT_SDLWindow == NULL)
{
TXT_SDLWindow =
SDL_CreateWindow("", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED,
screen_image_w, screen_image_h, flags);
TXT_SDLWindow = SDL_CreateWindow("",
SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED,
screen_image_w, screen_image_h, flags);
}
if (TXT_SDLWindow == NULL)
return 0;
if (renderer == NULL)
{
renderer = SDL_CreateRenderer(TXT_SDLWindow, -1, SDL_RENDERER_PRESENTVSYNC);
if (renderer == NULL)
renderer = SDL_CreateRenderer(TXT_SDLWindow, -1, SDL_RENDERER_SOFTWARE);
if (renderer == NULL)
renderer = SDL_CreateRenderer(TXT_SDLWindow, -1, SDL_RENDERER_SOFTWARE);
}
if (renderer == NULL)
return 0;