diff --git a/ChangeAppSettings.sh b/ChangeAppSettings.sh index 943e0447c..158aa4efd 100755 --- a/ChangeAppSettings.sh +++ b/ChangeAppSettings.sh @@ -724,7 +724,6 @@ done if [ -z "$FirstStartMenuOptions" ]; then FirstStartMenuOptions="$FirstStartMenuOptionsDefault" fi -echo FirstStartMenuOptions "$FirstStartMenuOptions" ReadmeText="`echo $ReadmeText | sed 's/\"/\\\\\\\\\"/g' | sed 's/[&%]//g'`" diff --git a/project/jni/application/ballfield/AndroidAppSettings.cfg b/project/jni/application/ballfield/AndroidAppSettings.cfg index e70bbecb6..00a2c87a3 100644 --- a/project/jni/application/ballfield/AndroidAppSettings.cfg +++ b/project/jni/application/ballfield/AndroidAppSettings.cfg @@ -6,7 +6,7 @@ AppFullName=net.olofson.ballfield ScreenOrientation=h InhibitSuspend=n AppDataDownloadUrl="Game data is 1 Mb|ballfield.zip" -VideoDepthBpp=24 +VideoDepthBpp=16 NeedDepthBuffer=n NeedStencilBuffer=n NeedGles2=n @@ -16,6 +16,7 @@ SdlVideoResizeKeepAspect=n CompatibilityHacks=n AppUsesMouse=y AppNeedsTwoButtonMouse=y +ForceRelativeMouseMode=n AppNeedsArrowKeys=n AppNeedsTextInput=n AppUsesJoystick=n @@ -27,7 +28,7 @@ AppTouchscreenKeyboardKeysAmount=0 AppTouchscreenKeyboardKeysAmountAutoFire=0 RedefinedKeysScreenKb="1 2 3 4 5 6 1 2 3 4" StartupMenuButtonTimeout=3000 -HiddenMenuOptions='' +HiddenMenuOptions='OptionalDownloadConfig' FirstStartMenuOptions='' MultiABI=n AppVersionCode=101 diff --git a/project/jni/application/ballfield/ballfield.cpp b/project/jni/application/ballfield/ballfield.cpp index 438589fc1..eb77a1c06 100644 --- a/project/jni/application/ballfield/ballfield.cpp +++ b/project/jni/application/ballfield/ballfield.cpp @@ -9,6 +9,8 @@ * software, or work derived from it, under other terms. */ +#include +#include #include #include #include @@ -346,7 +348,7 @@ int main(int argc, char* argv[]) SDL_Surface *temp_image; SDL_Surface *back, *logo, *font; SDL_Event event; - int bpp = 24, + int bpp = 16, flags = SDL_DOUBLEBUF | SDL_SWSURFACE, alpha = 1; int x_offs = 0, y_offs = 0; @@ -598,5 +600,8 @@ int main(int argc, char* argv[]) SDL_FreeSurface(back); SDL_FreeSurface(logo); SDL_FreeSurface(font); + std::ostringstream os; + os << "lalala" << std::endl << "more text" << std::endl; + std::cout << os.str() << std::endl << "text text" << std::endl; exit(0); } diff --git a/project/jni/application/fheroes2/AndroidAppSettings.cfg b/project/jni/application/fheroes2/AndroidAppSettings.cfg index 5d8449e7a..57fa49a16 100644 --- a/project/jni/application/fheroes2/AndroidAppSettings.cfg +++ b/project/jni/application/fheroes2/AndroidAppSettings.cfg @@ -16,6 +16,7 @@ SdlVideoResizeKeepAspect=n CompatibilityHacks=n AppUsesMouse=y AppNeedsTwoButtonMouse=y +ForceRelativeMouseMode=n AppNeedsArrowKeys=n AppNeedsTextInput=n AppUsesJoystick=n @@ -30,8 +31,8 @@ StartupMenuButtonTimeout=3000 HiddenMenuOptions='KeyboardConfigMainMenu ScreenKeyboardThemeConfig ScreenKeyboardTransparencyConfig' FirstStartMenuOptions='' MultiABI=n -AppVersionCode=245017 -AppVersionName="2450.17" +AppVersionCode=250517 +AppVersionName="2505.17" CompiledLibraries="sdl_net sdl_mixer sdl_image sdl_ttf png intl" CustomBuildScript=n AppCflags='-finline-functions -O2 -DWITH_ZLIB -DWITH_MIXER -DWITH_XML -DWITH_IMAGE -DWITH_TTF -DWITH_AI=simple -DWITH_NET' diff --git a/project/jni/application/fheroes2/AndroidData/data11.zip b/project/jni/application/fheroes2/AndroidData/data11.zip index b02a68230..da82fcac9 100644 Binary files a/project/jni/application/fheroes2/AndroidData/data11.zip and b/project/jni/application/fheroes2/AndroidData/data11.zip differ diff --git a/project/jni/application/puae/PUAE b/project/jni/application/puae/PUAE deleted file mode 120000 index 8ffbaf1e2..000000000 --- a/project/jni/application/puae/PUAE +++ /dev/null @@ -1 +0,0 @@ -../../../../../PUAE/ \ No newline at end of file diff --git a/project/jni/application/src b/project/jni/application/src index 4a9a58e93..47d12590a 120000 --- a/project/jni/application/src +++ b/project/jni/application/src @@ -1 +1 @@ -puae \ No newline at end of file +openal-demo \ No newline at end of file