diff options
| author | Simon Howard | 2009-06-09 18:28:51 +0000 |
|---|---|---|
| committer | Simon Howard | 2009-06-09 18:28:51 +0000 |
| commit | 122dcc372f579c54ba2e6f793493cfa4d0a7d609 (patch) | |
| tree | 5df714640d4ae007e95540c89b8f6f0d80f79767 /textscreen | |
| parent | 46ad00deca23f3c57fcaed47af67f9003d6a4048 (diff) | |
| parent | b6491fa4aefc073a760d4bad51f55c2d6c0f5f35 (diff) | |
| download | chocolate-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')
| -rw-r--r-- | textscreen/Makefile.am | 2 | ||||
| -rw-r--r-- | textscreen/txt_sdl.c | 8 |
2 files changed, 9 insertions, 1 deletions
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 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; |