diff --git a/src/openrct2/platform/Platform.Android.cpp b/src/openrct2/platform/Platform.Android.cpp index 8ca55ac3c4..068432d18d 100644 --- a/src/openrct2/platform/Platform.Android.cpp +++ b/src/openrct2/platform/Platform.Android.cpp @@ -27,7 +27,7 @@ AndroidClassLoader::~AndroidClassLoader() jobject AndroidClassLoader::_classLoader; jmethodID AndroidClassLoader::_findClassMethod; -static std::shared_ptr acl; +static std::shared_ptr acl = std::make_shared(); namespace Platform { @@ -173,11 +173,6 @@ namespace Platform return displayScale; } - void AndroidInitClassLoader() - { - acl = std::make_shared(); - } - jclass AndroidFindClass(JNIEnv* env, std::string_view name) { return static_cast(env->CallObjectMethod( diff --git a/src/openrct2/platform/Platform.Common.cpp b/src/openrct2/platform/Platform.Common.cpp index fbbfd2afb0..051925b9f8 100644 --- a/src/openrct2/platform/Platform.Common.cpp +++ b/src/openrct2/platform/Platform.Common.cpp @@ -39,15 +39,6 @@ namespace Platform { void CoreInit() { - static bool initialised = false; - if (!initialised) - { - initialised = true; - -#ifdef __ANDROID__ - Platform::AndroidInitClassLoader(); -#endif // __ANDROID__ - } } CurrencyType GetCurrencyValue(const char* currCode) diff --git a/src/openrct2/platform/Platform.h b/src/openrct2/platform/Platform.h index 11f59e4f0f..607387ec9a 100644 --- a/src/openrct2/platform/Platform.h +++ b/src/openrct2/platform/Platform.h @@ -103,7 +103,6 @@ namespace Platform bool SetupUriProtocol(); #endif #ifdef __ANDROID__ - void AndroidInitClassLoader(); jclass AndroidFindClass(JNIEnv* env, std::string_view name); #endif