diff options
| author | Zaba999 <qrwfw5rp> | 2012-09-29 23:53:57 +0200 |
|---|---|---|
| committer | Zaba999 <qrwfw5rp> | 2012-09-29 23:53:57 +0200 |
| commit | 95e1d101c82e43396fd93abfaa522e3651613c4c (patch) | |
| tree | 9d72f27e84a25c7a744b31eb7612698506ac5b68 /src/app/app.cpp | |
| parent | aa9df8b1f0fbbad4c7be0214a19a90b8495a2067 (diff) | |
| parent | c8f39a4c96ab63f9e3edc96845e1b70c89b95d2b (diff) | |
| download | colobot-95e1d101c82e43396fd93abfaa522e3651613c4c.tar.gz colobot-95e1d101c82e43396fd93abfaa522e3651613c4c.tar.bz2 colobot-95e1d101c82e43396fd93abfaa522e3651613c4c.zip | |
Merge branch 'dev' of https://github.com/colobot/colobot into dev
Diffstat (limited to 'src/app/app.cpp')
| -rw-r--r-- | src/app/app.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/app/app.cpp b/src/app/app.cpp index 8c2dd43..d6fc2dd 100644 --- a/src/app/app.cpp +++ b/src/app/app.cpp @@ -357,7 +357,7 @@ bool CApplication::Create() /* SDL initialization sequence */ - Uint32 initFlags = SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_TIMER; + Uint32 initFlags = SDL_INIT_VIDEO | SDL_INIT_TIMER; if (SDL_Init(initFlags) < 0) { @@ -368,6 +368,12 @@ bool CApplication::Create() return false; } + // This is non-fatal and besides seems to fix some memory leaks + if (SDL_InitSubSystem(SDL_INIT_JOYSTICK) < 0) + { + GetLogger()->Warn("Joystick subsystem init failed\nJoystick(s) will not be available\n"); + } + if ((IMG_Init(IMG_INIT_PNG) & IMG_INIT_PNG) == 0) { m_errorMessage = std::string("SDL_Image initialization error:\n") + @@ -398,10 +404,6 @@ bool CApplication::Create() SDL_JoystickEventState(SDL_IGNORE); - // For now, enable joystick for testing - SetJoystickEnabled(true); - - // The video is ready, we can create and initalize the graphics device m_device = new Gfx::CGLDevice(m_deviceConfig); if (! m_device->Create() ) |