thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added new (optional) OSystem::initBackend() method; this (and its usage) fixes bugs #1160977 and #1184664

Browse source 
svn-id: r17694
This commit is contained in:
Max Horn 2005-04-19 20:22:50 +00:00
parent 167d43d924
commit 2cfb9322e2
5 changed files with 22 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
backends/sdl/sdl.cpp
View file

@ -35,7 +35,8 @@ OSystem *OSystem_SDL_create() {
return new OSystem_SDL();
}
void OSystem_SDL::initIntern() {
void OSystem_SDL::initBackend() {
assert(!_inited);
int joystick_num = ConfMan.getInt("joystick_num");
uint32 sdlFlags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_TIMER;
@ -89,6 +90,8 @@ void OSystem_SDL::initIntern() {
printf("Using joystick: %s\n", SDL_JoystickName(0));
_joystick = SDL_JoystickOpen(joystick_num);
}
_inited = true;
}
OSystem_SDL::OSystem_SDL()
@ -120,7 +123,7 @@ OSystem_SDL::OSystem_SDL()
memset(&_km, 0, sizeof(_km));
memset(&_mouseCurState, 0, sizeof(_mouseCurState));
initIntern();
_inited = false;
}
OSystem_SDL::~OSystem_SDL() {