sdl: revert revision 2160; fixes --inputcfg
This commit is contained in:
parent
c9678317a4
commit
c7096f4d4a
|
@ -776,8 +776,15 @@ int
|
|||
ButtonConfigBegin()
|
||||
{
|
||||
SDL_Surface *screen;
|
||||
|
||||
// XXX soules - why are we doing this right before KillVideo()?
|
||||
SDL_QuitSubSystem(SDL_INIT_VIDEO);
|
||||
|
||||
// shut down the video and joystick subsystems
|
||||
bcpv=KillVideo();
|
||||
bcpj=KillJoysticks();
|
||||
|
||||
// activate the video subsystem if it is not already initialized
|
||||
// reactivate the video subsystem
|
||||
if(!SDL_WasInit(SDL_INIT_VIDEO)) {
|
||||
if(!bcpv) {
|
||||
InitVideo(GameInfo);
|
||||
|
@ -806,6 +813,10 @@ ButtonConfigBegin()
|
|||
SDL_WM_SetCaption("Button Config",0);
|
||||
}
|
||||
}
|
||||
|
||||
// XXX soules - why did we shut this down?
|
||||
// initialize the joystick subsystem
|
||||
InitJoysticks();
|
||||
|
||||
return(1);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue