From a7f154d05ab2cdca6ab6f01713d14ea830c16838 Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Thu, 5 Feb 2026 08:45:23 +0500 Subject: [PATCH] engine: platform: move SDL hints from android code to main SDL code --- engine/platform/android/android.c | 6 ------ engine/platform/sdl2/sys_sdl2.c | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/engine/platform/android/android.c b/engine/platform/android/android.c index 01ba39fe..21a42d93 100644 --- a/engine/platform/android/android.c +++ b/engine/platform/android/android.c @@ -47,12 +47,6 @@ void Android_Init( void ) jni.loadAndroidID = (*jni.env)->GetMethodID( jni.env, jni.actcls, "loadAndroidID", "()Ljava/lang/String;" ); jni.getAndroidID = (*jni.env)->GetMethodID( jni.env, jni.actcls, "getAndroidID", "()Ljava/lang/String;" ); jni.saveAndroidID = (*jni.env)->GetMethodID( jni.env, jni.actcls, "saveAndroidID", "(Ljava/lang/String;)V" ); - - SDL_SetHint( SDL_HINT_ORIENTATIONS, "LandscapeLeft LandscapeRight" ); - SDL_SetHint( SDL_HINT_JOYSTICK_HIDAPI_STEAM, "1" ); - SDL_SetHint( SDL_HINT_ANDROID_BLOCK_ON_PAUSE, "0" ); - SDL_SetHint( SDL_HINT_ANDROID_BLOCK_ON_PAUSE_PAUSEAUDIO, "0" ); - SDL_SetHint( SDL_HINT_ANDROID_TRAP_BACK_BUTTON, "1" ); #endif // !XASH_SDL } diff --git a/engine/platform/sdl2/sys_sdl2.c b/engine/platform/sdl2/sys_sdl2.c index 5f168f2e..c40b0610 100644 --- a/engine/platform/sdl2/sys_sdl2.c +++ b/engine/platform/sdl2/sys_sdl2.c @@ -113,6 +113,9 @@ void SDLash_Init( const char *basedir ) // SDL_SetHint( SDL_HINT_WINDOWS_DPI_SCALING, "1" ); #endif // XASH_WIN32 + SDL_SetHint( SDL_HINT_ANDROID_BLOCK_ON_PAUSE, "0" ); + SDL_SetHint( SDL_HINT_ANDROID_BLOCK_ON_PAUSE_PAUSEAUDIO, "0" ); + if( SDL_Init( SDL_INIT_TIMER | SDL_INIT_VIDEO | SDL_INIT_EVENTS ) ) { Sys_Warn( "SDL_Init failed: %s", SDL_GetError() ); @@ -120,6 +123,9 @@ void SDLash_Init( const char *basedir ) } SDL_SetHint( SDL_HINT_ACCELEROMETER_AS_JOYSTICK, "0" ); + SDL_SetHint( SDL_HINT_JOYSTICK_HIDAPI_STEAM, "1" ); + SDL_SetHint( SDL_HINT_ANDROID_TRAP_BACK_BUTTON, "1" ); + SDL_SetHint( SDL_HINT_ORIENTATIONS, "LandscapeLeft LandscapeRight" ); #ifdef SDL_HINT_MOUSE_TOUCH_EVENTS SDL_SetHint( SDL_HINT_MOUSE_TOUCH_EVENTS, "0" );