diff --git a/project/jni/application/sc2/AndroidAppSettings.cfg b/project/jni/application/sc2/AndroidAppSettings.cfg index 86f06c50f..497e14a3e 100644 --- a/project/jni/application/sc2/AndroidAppSettings.cfg +++ b/project/jni/application/sc2/AndroidAppSettings.cfg @@ -1,23 +1,26 @@ # The application settings for Android libSDL port -AppSettingVersion=10 +AppSettingVersion=12 LibSdlVersion=1.2 AppName="Ur-Quan Masters" AppFullName=com.sourceforge.sc2 ScreenOrientation=h +InhibitSuspend=n AppDataDownloadUrl="Game data is 14 Mb|https://sourceforge.net/projects/libsdl-android/files/Ur-Quan%20Masters/sc2-data.zip/download|https://sites.google.com/site/xpelyax/Home/sc2-data.zip?attredirects=0&d=1|http://sitesproxy.goapk.com/site/xpelyax/Home/sc2-data.zip^3DO remixed music (19 Mb) - enable it in Setup->Sound Options->3DO Remixes|:addons/3domusic/3domusic.zip:https://sourceforge.net/projects/libsdl-android/files/Ur-Quan%20Masters/3domusic.zip/download|:addons/3domusic/3domusic.zip:https://sites.google.com/site/xpelyax/Home/3domusic.zip?attredirects=0&d=1|:addons/3domusic/3domusic.zip:http://sitesproxy.goapk.com/site/xpelyax/Home/3domusic.zip^UQM music remix pack (150 Mb) - enable it in Setup->Sound Options->UQM Remixes|:addons/remix/remix.zip:https://sourceforge.net/projects/libsdl-android/files/Ur-Quan%20Masters/remix.zip/download^3DO voice (115 Mb) - go to Setup->Sound Options and increase Voice volume from zero|:addons/3dovoice/3dovoice.zip:https://sourceforge.net/projects/libsdl-android/files/Ur-Quan%20Masters/3dovoice.zip/download^3DO video support - after installing this pack copy all files from|https://sourceforge.net/projects/libsdl-android/files/Ur-Quan%20Masters/3dovideo.zip/download^your 3DO Star Control II game CD from 'duckart' dir to the SD card to dir|https://sourceforge.net/projects/libsdl-android/files/Ur-Quan%20Masters/3dovideo.zip/download^'app-data/com.sourceforge.sc2/addons/3dovideo', to extract files from 3DO disk use|https://sourceforge.net/projects/libsdl-android/files/Ur-Quan%20Masters/3dovideo.zip/download^'3DO Commander' or 'uncd-rom' apps from http://madroms.free.fr/3do/|https://sourceforge.net/projects/libsdl-android/files/Ur-Quan%20Masters/3dovideo.zip/download^Then from the game change 'Setup->PC/3DO compat->Cutscenes' to Movies, and restart game|https://sourceforge.net/projects/libsdl-android/files/Ur-Quan%20Masters/3dovideo.zip/download" SdlVideoResize=y +SdlVideoResizeKeepAspect=n NeedDepthBuffer=n AppUsesMouse=n AppNeedsArrowKeys=y -AppUsesJoystick=n +AppUsesJoystick=y +AppHandlesJoystickSensitivity=n AppUsesMultitouch=n NonBlockingSwapBuffers=n RedefinedKeys="RETURN RSHIFT KP_PLUS KP_MINUS ESCAPE F10" AppTouchscreenKeyboardKeysAmount=2 AppTouchscreenKeyboardKeysAmountAutoFire=0 MultiABI=n -AppVersionCode=1012 -AppVersionName="1.0.12 - fixed keys stuck sometimes for on-screen keyboard, also disabled auto-fire on user request" +AppVersionCode=1013 +AppVersionName="1.0.13" CompiledLibraries="sdl_image tremor" CustomBuildScript=n AppCflags='-O2 -finline-functions -DTHREADLIB_SDL=1 -DTIMELIB=SDL -DOVCODEC_TREMOR=1 -DNETPLAY=1 -DHAVE_REGEX=1 -DHAVE_GETOPT_LONG=1 -DHAVE_ZIP=1' diff --git a/project/jni/application/sc2/src/libs/sound/decoders/oggaud.c b/project/jni/application/sc2/src/libs/sound/decoders/oggaud.c index 622712067..f1b4e9c4a 100644 --- a/project/jni/application/sc2/src/libs/sound/decoders/oggaud.c +++ b/project/jni/application/sc2/src/libs/sound/decoders/oggaud.c @@ -270,7 +270,7 @@ ova_GetFrame (THIS_PTR) // this is the closest to a frame there is in ogg vorbis stream // doesn't seem to be a func to retrive it #ifdef OVCODEC_TREMOR - return ova->vf.os->pageno; + return ova->vf.os.pageno; #else return ova->vf.os.pageno; #endif /* OVCODEC_TREMOR */