shithub: choc

Download patch

ref: 895f440628c8c45aa98bd7af996ca6ae48065224
parent: cf6e976f371dfe19af0bd3917745698d778586dc
author: Simon Howard <[email protected]>
date: Sun Jun 7 12:41:46 EDT 2009

Catch errors when initialising SDL. Use the small textscreen font by
default on Windows CE if no fullscreen modes are available.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1570

--- a/textscreen/txt_sdl.c
+++ b/textscreen/txt_sdl.c
@@ -142,6 +142,9 @@
 
     if (modes == NULL || modes == (SDL_Rect **) -1 || *modes == NULL)
     {
+#ifdef _WIN32_WCE
+        font = &small_font;
+#endif
         return;
     }
 
@@ -166,7 +169,10 @@
 
 int TXT_Init(void)
 {
-    SDL_InitSubSystem(SDL_INIT_VIDEO);
+    if (SDL_InitSubSystem(SDL_INIT_VIDEO) < 0)
+    {
+        return 0;
+    }
 
     ChooseFont();