Mercurial > hg > forks > pwpunix
diff pwplib/pwplib-unix.c @ 56:5d819ba6891c
More cleanups.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Thu, 27 May 2010 22:48:37 +0300 |
parents | 85671798fdb3 |
children |
line wrap: on
line diff
--- a/pwplib/pwplib-unix.c Thu May 27 20:16:08 2010 +0300 +++ b/pwplib/pwplib-unix.c Thu May 27 22:48:37 2010 +0300 @@ -1,20 +1,20 @@ #define __PWPLIB_C -#undef FISI_HACK /* NOTICE! Enabling this is a hack for Final ISI only */ - #include "config.h" #include <stdio.h> #include <stdlib.h> +#include <signal.h> +#include <time.h> +#include <sys/time.h> #ifdef DRIVE_SDL #include <SDL.h> #endif -#include <signal.h> -#include <time.h> -#include <sys/time.h> #include "pwplib.h" +#include "sound.h" +#include "video.h" #include "tty.h" @@ -23,7 +23,6 @@ static int sdl_init = 0; extern void pwplib_dummy(); -#define pwp_dummy pwplib_dummy void pwpwrite(const char *fmt, ...) { @@ -100,10 +99,10 @@ int pwplib_initcore() { int sdl_flags = 0; + pwplib_init_common(); /*** setup signals, etc ***/ - #ifdef DRIVE_SDL #ifdef DRIVE_VIDEO sdl_flags |= SDL_INIT_VIDEO; @@ -114,7 +113,6 @@ #ifdef FISI_HACK sdl_flags |= SDL_INIT_NOPARACHUTE; #endif - /* With SDL, we let it handle the signals */ if (SDL_Init(SDL_INIT_TIMER | SDL_INIT_EVENTTHREAD | sdl_flags) != 0) { pwpwrite("* SDL could not be initialized (%s).\n", SDL_GetError());