foxygit / doom Log in
commit 895f440628c8c45aa98bd7af996ca6ae48065224
Author:     Simon Howard <fraggle@gmail.com>
AuthorDate: Sun Jun 7 16:41:46 2009 +0000
Commit:     Simon Howard <fraggle@gmail.com>
CommitDate: Sun Jun 7 16:41:46 2009 +0000

    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
---
 textscreen/txt_sdl.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/textscreen/txt_sdl.c b/textscreen/txt_sdl.c
index 1bc42d7c..6cfee614 100644
--- a/textscreen/txt_sdl.c
+++ b/textscreen/txt_sdl.c
@@ -142,6 +142,9 @@ static void ChooseFont(void)

     if (modes == NULL || modes == (SDL_Rect **) -1 || *modes == NULL)
     {
+#ifdef _WIN32_WCE
+        font = &small_font;
+#endif
         return;
     }

@@ -166,7 +169,10 @@ static void ChooseFont(void)

 int TXT_Init(void)
 {
-    SDL_InitSubSystem(SDL_INIT_VIDEO);
+    if (SDL_InitSubSystem(SDL_INIT_VIDEO) < 0)
+    {
+        return 0;
+    }

     ChooseFont();