Make the TTS patch dependant on one symbol less

minecraft-linux · Oct 30, 2019 · c735370 · c735370
1 parent a9ca551
commit c735370
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/main.cpp b/src/main.cpp
@@ -36,6 +36,8 @@
 
 static std::unique_ptr<ClientAppPlatform> appPlatform;
 
+static size_t base;
+
 void printVersionInfo();
 
 int main(int argc, char *argv[]) {
@@ -96,6 +98,7 @@ int main(int argc, char *argv[]) {
     void* handle = MinecraftUtils::loadMinecraftLib();
     Log::info("Launcher", "Loaded Minecraft library");
     Log::debug("Launcher", "Minecraft is at offset 0x%x", MinecraftUtils::getLibraryBase(handle));
+    base = MinecraftUtils::getLibraryBase(handle);
 
     Log::trace("Launcher", "Initializing vtables");
     MinecraftUtils::initSymbolBindings(handle);

diff --git a/src/tts_patch.cpp b/src/tts_patch.cpp
@@ -2,11 +2,12 @@
 
 #include <mcpelauncher/patch_utils.h>
 #include <mcpelauncher/minecraft_version.h>
+#include <hybris/dlfcn.h>
 
 void TTSPatch::install(void* handle) {
     if (!MinecraftVersion::isAtLeast(1, 8))
         return;
-    void* sym = minecraft_dlsym(handle, "_ZN18TextToSpeechSystem15createTTSClientEb");
+    void* sym = hybris_dlsym(handle, "_ZN26TextToSpeechSystem_android16_createTTSClientEv");
     PatchUtils::patchCallInstruction(sym, (void*) &TTSPatch::createTTSClient, true);
 }