diff --git a/src/platform/C4AppSDL.cpp b/src/platform/C4AppSDL.cpp index e038396b8..c55020458 100644 --- a/src/platform/C4AppSDL.cpp +++ b/src/platform/C4AppSDL.cpp @@ -271,16 +271,6 @@ void C4AbstractApp::RestoreVideoMode() { } -bool C4AbstractApp::ApplyGammaRamp(struct _GAMMARAMP& ramp, bool fForce) -{ - return SDL_SetGammaRamp(ramp.red, ramp.green, ramp.blue) != -1; -} - -bool C4AbstractApp::SaveDefaultGammaRamp(struct _GAMMARAMP& ramp) -{ - return SDL_GetGammaRamp(ramp.red, ramp.green, ramp.blue) != -1; -} - // For Max OS X, the implementation resides in StdMacApp.mm #ifndef __APPLE__ diff --git a/src/platform/C4GamePadCon.cpp b/src/platform/C4GamePadCon.cpp index 44f445183..a671e0742 100644 --- a/src/platform/C4GamePadCon.cpp +++ b/src/platform/C4GamePadCon.cpp @@ -173,7 +173,7 @@ void C4GamePadOpener::SetGamePad(int iNewGamePad) C4GamePadControl::pInstance->OpenGamepad(iGamePad = iNewGamePad); } -#elif defined(HAVE_SDL) +#elif defined(HAVE_SDL) && !defined(USE_CONSOLE) #include diff --git a/src/platform/C4Window.h b/src/platform/C4Window.h index 0b6dafcd9..de591a669 100644 --- a/src/platform/C4Window.h +++ b/src/platform/C4Window.h @@ -172,9 +172,10 @@ #elif defined(USE_SDL_MAINLOOP) #include -// FIXME #define K_SHIFT_L SDLK_LSHIFT #define K_SHIFT_R SDLK_RSHIFT +#define K_CONTROL_L SDLK_LCTRL +#define K_CONTROL_R SDLK_RCTRL #define K_ALT_L SDLK_LALT #define K_ALT_R SDLK_RALT #define K_F1 SDLK_F1