diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-05-24 22:30:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-24 22:30:00 +0200 |
| commit | 926d6c108277f74a29b683a4d623393b866e6d1c (patch) | |
| tree | 596fc622c9ccbb2440aea62ddc9d147d5df36142 /platform/android/java_godot_lib_jni.cpp | |
| parent | 57d21ebeda8460036efac1f70cd9ecd0896de517 (diff) | |
| parent | 39f59786fab78b92083c41b6f85658e96b5d3a51 (diff) | |
| download | redot-engine-926d6c108277f74a29b683a4d623393b866e6d1c.tar.gz | |
Merge pull request #39007 from nekomatata/android-object-id-long
Use long instead of int for object id in Android java wrapper
Diffstat (limited to 'platform/android/java_godot_lib_jni.cpp')
| -rw-r--r-- | platform/android/java_godot_lib_jni.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/platform/android/java_godot_lib_jni.cpp b/platform/android/java_godot_lib_jni.cpp index 23e0d24b57..6f45b4977e 100644 --- a/platform/android/java_godot_lib_jni.cpp +++ b/platform/android/java_godot_lib_jni.cpp @@ -375,8 +375,8 @@ JNIEXPORT jstring JNICALL Java_org_godotengine_godot_GodotLib_getGlobal(JNIEnv * return env->NewStringUTF(ProjectSettings::get_singleton()->get(js).operator String().utf8().get_data()); } -JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_callobject(JNIEnv *env, jclass clazz, jint ID, jstring method, jobjectArray params) { - Object *obj = ObjectDB::get_instance(ObjectID((uint64_t)ID)); +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_callobject(JNIEnv *env, jclass clazz, jlong ID, jstring method, jobjectArray params) { + Object *obj = ObjectDB::get_instance(ObjectID(ID)); ERR_FAIL_COND(!obj); int res = env->PushLocalFrame(16); @@ -405,8 +405,8 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_callobject(JNIEnv *en env->PopLocalFrame(nullptr); } -JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_calldeferred(JNIEnv *env, jclass clazz, jint ID, jstring method, jobjectArray params) { - Object *obj = ObjectDB::get_instance(ObjectID((uint64_t)ID)); +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_calldeferred(JNIEnv *env, jclass clazz, jlong ID, jstring method, jobjectArray params) { + Object *obj = ObjectDB::get_instance(ObjectID(ID)); ERR_FAIL_COND(!obj); int res = env->PushLocalFrame(16); |