diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-03-09 20:48:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-09 20:48:45 +0100 |
| commit | 33c907f9f5b3ec1a43d0251d7cac80da49b5b658 (patch) | |
| tree | 6adb187024a8de7ed0b2ebf3e7c75ae07d8407bf /platform/android/plugin/godot_plugin_jni.cpp | |
| parent | f17c5501eb4bb6a86d9f2f07567da081eb8991b0 (diff) | |
| parent | 21637dfc2535a00f531b8b664c1e66ba34d11eb0 (diff) | |
Merge pull request #58929 from reduz/remove-variant-arg-macros
Remove VARIANT_ARG* macros
Diffstat (limited to 'platform/android/plugin/godot_plugin_jni.cpp')
| -rw-r--r-- | platform/android/plugin/godot_plugin_jni.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/platform/android/plugin/godot_plugin_jni.cpp b/platform/android/plugin/godot_plugin_jni.cpp index 48aeb3d070..158512803a 100644 --- a/platform/android/plugin/godot_plugin_jni.cpp +++ b/platform/android/plugin/godot_plugin_jni.cpp @@ -114,10 +114,9 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_plugin_GodotPlugin_nativeEmitS String signal_name = jstring_to_string(j_signal_name, env); int count = env->GetArrayLength(j_signal_params); - ERR_FAIL_COND_MSG(count > VARIANT_ARG_MAX, "Maximum argument count exceeded!"); - Variant variant_params[VARIANT_ARG_MAX]; - const Variant *args[VARIANT_ARG_MAX]; + Variant *variant_params = (Variant *)alloca(sizeof(Variant) * count); + const Variant **args = (const Variant **)alloca(sizeof(Variant *) * count); for (int i = 0; i < count; i++) { jobject j_param = env->GetObjectArrayElement(j_signal_params, i); @@ -126,7 +125,7 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_plugin_GodotPlugin_nativeEmitS env->DeleteLocalRef(j_param); }; - singleton->emit_signal(StringName(signal_name), args, count); + singleton->emit_signalp(StringName(signal_name), args, count); } JNIEXPORT void JNICALL Java_org_godotengine_godot_plugin_GodotPlugin_nativeRegisterGDNativeLibraries(JNIEnv *env, jclass clazz, jobjectArray gdnlib_paths) { |