From aab1fe59cc3f5874e37ecd17eb28354038e0e722 Mon Sep 17 00:00:00 2001 From: pelya Date: Tue, 27 Nov 2012 19:21:45 +0200 Subject: [PATCH] Added another video mode for UAE4ALL2 --- project/jni/application/openarena/AndroidAppSettings.cfg | 4 ++-- project/jni/application/openarena/engine | 2 +- project/jni/application/openarena/vm | 2 +- project/jni/sdl-1.2/src/video/android/SDL_androidvideo-1.2.c | 5 +++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/project/jni/application/openarena/AndroidAppSettings.cfg b/project/jni/application/openarena/AndroidAppSettings.cfg index 7926a6449..fc0f6c09b 100644 --- a/project/jni/application/openarena/AndroidAppSettings.cfg +++ b/project/jni/application/openarena/AndroidAppSettings.cfg @@ -29,9 +29,9 @@ AppUsesAccelerometer=y AppUsesMultitouch=y NonBlockingSwapBuffers=n RedefinedKeys="SPACE RETURN NO_REMAP NO_REMAP SPACE ESCAPE" -AppTouchscreenKeyboardKeysAmount=0 +AppTouchscreenKeyboardKeysAmount=1 AppTouchscreenKeyboardKeysAmountAutoFire=0 -RedefinedKeysScreenKb="UNKNOWN UNKNOWN UNKNOWN UNKNOWN UNKNOWN UNKNOWN UNKNOWN UNKNOWN UNKNOWN UNKNOWN" +RedefinedKeysScreenKb="SLASH UNKNOWN UNKNOWN UNKNOWN UNKNOWN UNKNOWN UNKNOWN UNKNOWN UNKNOWN UNKNOWN" StartupMenuButtonTimeout=3000 HiddenMenuOptions='OptionalDownloadConfig DisplaySizeConfig' FirstStartMenuOptions='' diff --git a/project/jni/application/openarena/engine b/project/jni/application/openarena/engine index a29fa0658..0f7cd57de 160000 --- a/project/jni/application/openarena/engine +++ b/project/jni/application/openarena/engine @@ -1 +1 @@ -Subproject commit a29fa0658241bacc84e76b0eb32220f2d567a5bd +Subproject commit 0f7cd57dea6197b4e00c050599ebb0b1264f39a3 diff --git a/project/jni/application/openarena/vm b/project/jni/application/openarena/vm index 7a939ba4d..a6b2d7215 160000 --- a/project/jni/application/openarena/vm +++ b/project/jni/application/openarena/vm @@ -1 +1 @@ -Subproject commit 7a939ba4da141482411f6330c4606b6ddfe114a8 +Subproject commit a6b2d72158e26c6c868fac0eec209fb605004cb8 diff --git a/project/jni/sdl-1.2/src/video/android/SDL_androidvideo-1.2.c b/project/jni/sdl-1.2/src/video/android/SDL_androidvideo-1.2.c index 6750cd3cb..acadab4eb 100644 --- a/project/jni/sdl-1.2/src/video/android/SDL_androidvideo-1.2.c +++ b/project/jni/sdl-1.2/src/video/android/SDL_androidvideo-1.2.c @@ -115,7 +115,7 @@ int ANDROID_ToggleFullScreen(_THIS, int fullscreen) return 1; } -#define SDL_NUMMODES 13 +#define SDL_NUMMODES 14 static SDL_Rect *SDL_modelist[SDL_NUMMODES+1]; //#define SDL_modelist (this->hidden->SDL_modelist) @@ -283,7 +283,8 @@ int ANDROID_VideoInit(_THIS, SDL_PixelFormat *vformat) SDL_modelist[10]->w = 800; SDL_modelist[10]->h = 480; // Virtual wide-screen mode SDL_modelist[11]->w = 544; SDL_modelist[11]->h = 332; // I have no idea where this videomode is used SDL_modelist[12]->w = 640; SDL_modelist[12]->h = 350; // For PrefClub app - SDL_modelist[13] = NULL; + SDL_modelist[13]->w = 320; SDL_modelist[13]->h = 256; // For UAE4ALL2 + SDL_modelist[14] = NULL; SDL_VideoInit_1_3(NULL, 0);