From 0be19fa1fe7fabc04b8fbd593a660fdc85f57d87 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Tue, 26 May 2009 22:14:24 +0000
Subject: Fix tags for functions using TXT_UNCAST_ARG.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1532
---
 textscreen/Makefile.am | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'textscreen')

diff --git a/textscreen/Makefile.am b/textscreen/Makefile.am
index 5d177111..b8904520 100644
--- a/textscreen/Makefile.am
+++ b/textscreen/Makefile.am
@@ -1,6 +1,8 @@
 
 AM_CFLAGS = -I../src
 
+CTAGS_ARGS=-I TXT_UNCAST_ARG+
+
 # build this directory before the examples directory.
 
 SUBDIRS= . examples
-- 
cgit v1.2.3


From 895f440628c8c45aa98bd7af996ca6ae48065224 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sun, 7 Jun 2009 16:41:46 +0000
Subject: 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(-)

(limited to 'textscreen')

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();
 
-- 
cgit v1.2.3