sdl: revert revision 2160; fixes --inputcfg
This commit is contained in:
parent
c9678317a4
commit
c7096f4d4a
|
@ -777,7 +777,14 @@ ButtonConfigBegin()
|
||||||
{
|
{
|
||||||
SDL_Surface *screen;
|
SDL_Surface *screen;
|
||||||
|
|
||||||
// activate the video subsystem if it is not already initialized
|
// 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();
|
||||||
|
|
||||||
|
// reactivate the video subsystem
|
||||||
if(!SDL_WasInit(SDL_INIT_VIDEO)) {
|
if(!SDL_WasInit(SDL_INIT_VIDEO)) {
|
||||||
if(!bcpv) {
|
if(!bcpv) {
|
||||||
InitVideo(GameInfo);
|
InitVideo(GameInfo);
|
||||||
|
@ -807,6 +814,10 @@ ButtonConfigBegin()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// XXX soules - why did we shut this down?
|
||||||
|
// initialize the joystick subsystem
|
||||||
|
InitJoysticks();
|
||||||
|
|
||||||
return(1);
|
return(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue