--- deliantra/Deliantra-Client/Client.xs 2008/07/16 20:12:27 1.262 +++ deliantra/Deliantra-Client/Client.xs 2008/07/18 21:18:42 1.263 @@ -88,12 +88,6 @@ /* mask out modifiers we are not interested in */ #define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) -#if 1 -# define PARACHUTE SDL_INIT_NOPARACHUTE -#else -# define PARACHUTE 0 -#endif - static AV *texture_av; static struct @@ -646,6 +640,15 @@ const_iv (KMOD_MODE), const_iv (MIX_DEFAULT_FORMAT), + + const_iv (SDL_INIT_TIMER), + const_iv (SDL_INIT_AUDIO), + const_iv (SDL_INIT_VIDEO), + const_iv (SDL_INIT_CDROM), + const_iv (SDL_INIT_JOYSTICK), + const_iv (SDL_INIT_EVERYTHING), + const_iv (SDL_INIT_NOPARACHUTE), + const_iv (SDL_INIT_EVENTTHREAD), # undef const_iv }; @@ -691,14 +694,15 @@ #endif } -char * -SDL_GetError () +char *SDL_GetError () -int -SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) +int SDL_Init (U32 flags) -void -SDL_Quit () +int SDL_InitSubSystem (U32 flags) + +void SDL_QuitSubSystem (U32 flags) + +void SDL_Quit () void SDL_ListModes (int rgb, int alpha) @@ -730,15 +734,12 @@ if (m && m != (SDL_Rect **)-1) while (*m) { - if ((*m)->w >= 800 && (*m)->h >= 480) - { - AV *av = newAV (); - av_push (av, newSViv ((*m)->w)); - av_push (av, newSViv ((*m)->h)); - av_push (av, newSViv (rgb)); - av_push (av, newSViv (alpha)); - XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); - } + AV *av = newAV (); + av_push (av, newSViv ((*m)->w)); + av_push (av, newSViv ((*m)->h)); + av_push (av, newSViv (rgb)); + av_push (av, newSViv (alpha)); + XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); ++m; }