From c4eba6f2d0c6b3ae734fd6ccbbc3f2d95337d6c8 Mon Sep 17 00:00:00 2001 From: Sergii Pylypenko Date: Wed, 9 Jul 2014 23:36:38 +0300 Subject: [PATCH] Cloud save: fixed broken 64-bit integer type --- project/jni/application/biniax2/AndroidAppSettings.cfg | 2 +- project/jni/application/biniax2/src/biniax.c | 2 +- project/jni/sdl-1.2/include/SDL_android.h | 2 +- project/jni/sdl-1.2/src/video/android/SDL_androidvideo.c | 5 +++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/project/jni/application/biniax2/AndroidAppSettings.cfg b/project/jni/application/biniax2/AndroidAppSettings.cfg index 9b5e36f4e..fca5f4de8 100644 --- a/project/jni/application/biniax2/AndroidAppSettings.cfg +++ b/project/jni/application/biniax2/AndroidAppSettings.cfg @@ -213,7 +213,7 @@ FirstStartMenuOptions='' # Specify architectures to compile, 'all' or 'y' to compile for all architectures. # Available architectures: armeabi armeabi-v7a armeabi-v7a-hard x86 mips -MultiABI='armeabi-v7a' +MultiABI='armeabi-v7a x86' # Minimum amount of RAM application requires, in Mb, SDL will print warning to user if it's lower AppMinimumRAM=0 diff --git a/project/jni/application/biniax2/src/biniax.c b/project/jni/application/biniax2/src/biniax.c index 5757ab11b..1a331e9d9 100644 --- a/project/jni/application/biniax2/src/biniax.c +++ b/project/jni/application/biniax2/src/biniax.c @@ -1252,7 +1252,7 @@ BNX_BOOL saveGame( BNX_GAME *game ) fclose( file ); SDL_SaveBMP(SDL_GetVideoSurface(), "screenshot.bmp"); - SDL_ANDROID_CloudSave( sysGetFullFileName( csSaveGameName ), "", "Biniax2", "savegame", "screenshot.bmp", game->moves ); + SDL_ANDROID_CloudSave( sysGetFullFileName( csSaveGameName ), "", "Biniax2", "savegame", "screenshot.bmp", (uint64_t)0 ); return BNX_TRUE; } diff --git a/project/jni/sdl-1.2/include/SDL_android.h b/project/jni/sdl-1.2/include/SDL_android.h index 0c4cf02c3..8307ca4a3 100644 --- a/project/jni/sdl-1.2/include/SDL_android.h +++ b/project/jni/sdl-1.2/include/SDL_android.h @@ -105,7 +105,7 @@ Use SDL_SaveBMP(SDL_GetVideoSurface(), "screenshot.bmp") to create the screensho Returns 1 if save succeeded, 0 if user aborted sign-in, or there was no network available. */ extern DECLSPEC int SDLCALL SDL_ANDROID_CloudSave(const char *filename, const char *saveId, const char *dialogTitle, - const char *description, const char *screenshotFile, long long playedTimeMs); + const char *description, const char *screenshotFile, uint64_t playedTimeMs); /* Load the specified file from the cloud. diff --git a/project/jni/sdl-1.2/src/video/android/SDL_androidvideo.c b/project/jni/sdl-1.2/src/video/android/SDL_androidvideo.c index 0affa17a0..aa37d09c6 100644 --- a/project/jni/sdl-1.2/src/video/android/SDL_androidvideo.c +++ b/project/jni/sdl-1.2/src/video/android/SDL_androidvideo.c @@ -475,8 +475,9 @@ int SDLCALL SDL_ANDROID_RequestNewAdvertisement(void) } int SDLCALL SDL_ANDROID_CloudSave(const char *filename, const char *saveId, const char *dialogTitle, - const char *description, const char *screenshotFile, long long playedTimeMs) + const char *description, const char *screenshotFile, uint64_t playedTimeMs) { + __android_log_print(ANDROID_LOG_INFO, "libSDL", "SDL_ANDROID_CloudSave: played time %llu", playedTimeMs); if( !filename ) return 0; if( !saveId ) @@ -493,7 +494,7 @@ int SDLCALL SDL_ANDROID_CloudSave(const char *filename, const char *saveId, cons jstring s3 = (*JavaEnv)->NewStringUTF(JavaEnv, dialogTitle); jstring s4 = (*JavaEnv)->NewStringUTF(JavaEnv, description); jstring s5 = (*JavaEnv)->NewStringUTF(JavaEnv, screenshotFile); - int result = (*JavaEnv)->CallBooleanMethod( JavaEnv, JavaRenderer, JavaRequestCloudSave, s1, s2, s3, s4, s5, &playedTimeMs ); + int result = (*JavaEnv)->CallBooleanMethod( JavaEnv, JavaRenderer, JavaRequestCloudSave, s1, s2, s3, s4, s5, (jlong)playedTimeMs ); (*JavaEnv)->DeleteLocalRef(JavaEnv, s5); (*JavaEnv)->DeleteLocalRef(JavaEnv, s4); (*JavaEnv)->DeleteLocalRef(JavaEnv, s3);