summaryrefslogtreecommitdiff
path: root/textscreen/txt_sdl.c
diff options
context:
space:
mode:
authorSimon Howard2009-06-09 18:28:51 +0000
committerSimon Howard2009-06-09 18:28:51 +0000
commit122dcc372f579c54ba2e6f793493cfa4d0a7d609 (patch)
tree5df714640d4ae007e95540c89b8f6f0d80f79767 /textscreen/txt_sdl.c
parent46ad00deca23f3c57fcaed47af67f9003d6a4048 (diff)
parentb6491fa4aefc073a760d4bad51f55c2d6c0f5f35 (diff)
downloadchocolate-doom-122dcc372f579c54ba2e6f793493cfa4d0a7d609.tar.gz
chocolate-doom-122dcc372f579c54ba2e6f793493cfa4d0a7d609.tar.bz2
chocolate-doom-122dcc372f579c54ba2e6f793493cfa4d0a7d609.zip
Merge from trunk.
Subversion-branch: /branches/raven-branch Subversion-revision: 1579
Diffstat (limited to 'textscreen/txt_sdl.c')
-rw-r--r--textscreen/txt_sdl.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/textscreen/txt_sdl.c b/textscreen/txt_sdl.c
index ea2280d0..ef00cfb4 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;
}
@@ -168,7 +171,10 @@ int TXT_Init(void)
{
int flags;
- SDL_InitSubSystem(SDL_INIT_VIDEO);
+ if (SDL_InitSubSystem(SDL_INIT_VIDEO) < 0)
+ {
+ return 0;
+ }
flags = SDL_SWSURFACE | SDL_HWPALETTE | SDL_DOUBLEBUF;