From ff5a033b27792b460c48e65c10a8e4d198cac8c1 Mon Sep 17 00:00:00 2001 From: Relintai Date: Sat, 7 Sep 2024 12:41:30 +0200 Subject: [PATCH] Compile fixes. --- platform/android/java_pandemonium_lib_jni.h | 2 +- platform/javascript/os_javascript.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/android/java_pandemonium_lib_jni.h b/platform/android/java_pandemonium_lib_jni.h index bb576c9fa..94ab0785b 100644 --- a/platform/android/java_pandemonium_lib_jni.h +++ b/platform/android/java_pandemonium_lib_jni.h @@ -41,7 +41,7 @@ extern "C" { JNIEXPORT void JNICALL Java_org_pandemoniumengine_pandemonium_PandemoniumLib_initialize(JNIEnv *env, jclass clazz, jobject p_activity, jobject p_pandemonium_instance, jobject p_asset_manager, jobject p_pandemonium_io, jobject p_net_utils, jobject p_directory_access_handler, jobject p_file_access_handler, jboolean p_use_apk_expansion); JNIEXPORT void JNICALL Java_org_pandemoniumengine_pandemonium_PandemoniumLib_ondestroy(JNIEnv *env, jclass clazz); -JNIEXPORT jboolean JNICALL Java_org_pandemoniumengine_pandemonium_PandemoniumLib_setup(JNIEnv *env, jclass clazz, jobjectArray p_cmdline); +JNIEXPORT jboolean JNICALL Java_org_pandemoniumengine_pandemonium_PandemoniumLib_setup(JNIEnv *env, jclass clazz, jobjectArray p_cmdline, jobject p_godot_tts); JNIEXPORT void JNICALL Java_org_pandemoniumengine_pandemonium_PandemoniumLib_resize(JNIEnv *env, jclass clazz, jint width, jint height); JNIEXPORT void JNICALL Java_org_pandemoniumengine_pandemonium_PandemoniumLib_newcontext(JNIEnv *env, jclass clazz); JNIEXPORT void JNICALL Java_org_pandemoniumengine_pandemonium_PandemoniumLib_ttsCallback(JNIEnv *env, jclass clazz, jint event, jint id, jint pos); diff --git a/platform/javascript/os_javascript.cpp b/platform/javascript/os_javascript.cpp index cc543c73b..12c21b83f 100644 --- a/platform/javascript/os_javascript.cpp +++ b/platform/javascript/os_javascript.cpp @@ -128,7 +128,7 @@ void OS_JavaScript::tts_resume() { void OS_JavaScript::tts_stop() { ERR_FAIL_COND_MSG(!tts, "Enable the \"audio/general/text_to_speech\" project setting to use text-to-speech."); - for (Map::Element *E = utterance_ids.front(); E; E = E->next()) { + for (RBMap::Element *E = utterance_ids.front(); E; E = E->next()) { tts_post_utterance_event(OS::TTS_UTTERANCE_CANCELED, E->key()); } utterance_ids.clear();