diff --git a/launcher/src/client/available-feature-flags b/launcher/src/client/available-feature-flags index 1a85390..6dc7645 100644 --- a/launcher/src/client/available-feature-flags +++ b/launcher/src/client/available-feature-flags @@ -37,5 +37,5 @@ TRUE Improved Title Background TRUE Force Touch GUI Button Behavior TRUE Improved Button Hover Behavior TRUE Implement Create World Dialog -FALSE Remove Forced GUI Lag (Cam Break Server Joining) +FALSE Remove Forced GUI Lag (Can Break Joining Servers) TRUE Add Buckets diff --git a/media-layer/core/CMakeLists.txt b/media-layer/core/CMakeLists.txt index ec598ba..5012ae9 100644 --- a/media-layer/core/CMakeLists.txt +++ b/media-layer/core/CMakeLists.txt @@ -23,7 +23,7 @@ if(BUILD_ARM_COMPONENTS) endif() # Link -target_link_libraries(media-layer-core PUBLIC media-layer-headers PUBLIC reborn-util PUBLIC GLESv1_CM PUBLIC pthread PUBLIC dl) +target_link_libraries(media-layer-core PUBLIC media-layer-headers PUBLIC reborn-util PUBLIC GLESv1_CM PUBLIC dl) if(NOT MCPI_HEADLESS_MODE) # OpenAL find_library(OPENAL_LIBRARY NAMES openal REQUIRED) diff --git a/media-layer/core/src/base.cpp b/media-layer/core/src/base.cpp index f8d972b..088ae4a 100644 --- a/media-layer/core/src/base.cpp +++ b/media-layer/core/src/base.cpp @@ -1,5 +1,4 @@ #include -#include #include #include @@ -15,7 +14,6 @@ int SDL_Init(__attribute__((unused)) uint32_t flags) { // Event Queue -static pthread_mutex_t queue_mutex = PTHREAD_MUTEX_INITIALIZER; static std::vector queue; int SDL_PollEvent(SDL_Event *event) { @@ -23,7 +21,6 @@ int SDL_PollEvent(SDL_Event *event) { _media_handle_SDL_PollEvent(); // Poll Event - pthread_mutex_lock(&queue_mutex); int ret; if (queue.size() > 0) { *event = queue[0]; @@ -32,14 +29,11 @@ int SDL_PollEvent(SDL_Event *event) { } else { ret = 0; } - pthread_mutex_unlock(&queue_mutex); return ret; } int SDL_PushEvent(SDL_Event *event) { - pthread_mutex_lock(&queue_mutex); queue.push_back(*event); - pthread_mutex_unlock(&queue_mutex); return 1; } diff --git a/media-layer/proxy/src/server/server.cpp b/media-layer/proxy/src/server/server.cpp index 797f4f7..da3bc24 100644 --- a/media-layer/proxy/src/server/server.cpp +++ b/media-layer/proxy/src/server/server.cpp @@ -1,7 +1,6 @@ #include #include #include -#include #include #include #include @@ -156,16 +155,12 @@ unsigned char _get_unique_id(const char *name) { return get_unique_ids()[name]; // Assume ID Exists } -// The Proxy Is Single-Threaded -static pthread_mutex_t proxy_mutex = PTHREAD_MUTEX_INITIALIZER; +// Proxy Call Functions void _start_proxy_call(unsigned char call_id) { - // Lock Proxy - pthread_mutex_lock(&proxy_mutex); + // Start Call write_byte(call_id); } void end_proxy_call() { // Flush Write Cache flush_write_cache(); - // Release Proxy - pthread_mutex_unlock(&proxy_mutex); } diff --git a/mods/src/misc/misc.c b/mods/src/misc/misc.c index 3318bab..c2ba0fe 100644 --- a/mods/src/misc/misc.c +++ b/mods/src/misc/misc.c @@ -275,7 +275,7 @@ void init_misc() { } // Remove Forced GUI Lag - if (feature_has("Remove Forced GUI Lag (Cam Break Server Joining)", server_enabled)) { + if (feature_has("Remove Forced GUI Lag (Can Break Joining Servers)", server_enabled)) { overwrite_calls((void *) sleepMs, (void *) nop); }