Merge pull request #136 from monwarez/patch-freebsd
Don't init force feedback if not used, fixed #105. SDL_INIT_HAPTIC (also a part of SDL_INIT_EVERYTHING) is not supported on BSD OS
This commit is contained in:
commit
d40a6fdc1b
|
@ -667,7 +667,8 @@ int mainSetup(int argc, char **argv) {
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
|
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
|
||||||
if(SDL_Init(SDL_INIT_EVERYTHING) < 0) {
|
if(SDL_Init(SDL_INIT_TIMER | SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | \
|
||||||
|
SDL_INIT_GAMECONTROLLER | SDL_INIT_EVENTS) < 0) {
|
||||||
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
|
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
|
||||||
std::cerr << "Couldn't initialize SDL: " << SDL_GetError() << "\n";
|
std::cerr << "Couldn't initialize SDL: " << SDL_GetError() << "\n";
|
||||||
return 3;
|
return 3;
|
||||||
|
|
Loading…
Reference in New Issue