diff options
| author | Juan Linietsky | 2015-09-03 23:24:55 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2015-09-03 23:24:55 -0300 |
| commit | b0aa49accbd7e45dae38f1bd43b0fbdd11714211 (patch) | |
| tree | f9173780301097b0da9bba0203402c33036ea72d /platform/android/file_access_android.cpp | |
| parent | 7900d5daf21434a9396894a7c3ac360c03938770 (diff) | |
| download | godot-b0aa49accbd7e45dae38f1bd43b0fbdd11714211.tar.gz godot-b0aa49accbd7e45dae38f1bd43b0fbdd11714211.tar.zst godot-b0aa49accbd7e45dae38f1bd43b0fbdd11714211.zip | |
Diffstat (limited to 'platform/android/file_access_android.cpp')
| -rw-r--r-- | platform/android/file_access_android.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/platform/android/file_access_android.cpp b/platform/android/file_access_android.cpp index da3a37fb4..ff70d5ae7 100644 --- a/platform/android/file_access_android.cpp +++ b/platform/android/file_access_android.cpp @@ -29,16 +29,16 @@ #include "file_access_android.h" #include "print_string.h" -#ifdef ANDROID_NATIVE_ACTIVITY + AAssetManager *FileAccessAndroid::asset_manager=NULL; -void FileAccessAndroid::make_default() { +/*void FileAccessAndroid::make_default() { create_func=create_android; -} +}*/ FileAccess* FileAccessAndroid::create_android() { @@ -46,7 +46,7 @@ FileAccess* FileAccessAndroid::create_android() { } -Error FileAccessAndroid::open(const String& p_path, int p_mode_flags) { +Error FileAccessAndroid::_open(const String& p_path, int p_mode_flags) { String path=fix_path(p_path).simplify_path(); if (path.begins_with("/")) @@ -55,7 +55,6 @@ Error FileAccessAndroid::open(const String& p_path, int p_mode_flags) { path=path.substr(6,path.length()); - ERR_FAIL_COND_V(p_mode_flags&FileAccess::WRITE,ERR_UNAVAILABLE); //can't write on android.. a=AAssetManager_open(asset_manager,path.utf8().get_data(),AASSET_MODE_STREAMING); if (!a) @@ -184,4 +183,4 @@ FileAccessAndroid::~FileAccessAndroid() { close(); } -#endif + |