From 9f1bf36ef642a803d7366b93536e9aee2efd57d4 Mon Sep 17 00:00:00 2001 From: "born a rick, raised a morty, died a jerry" Date: Wed, 28 Nov 2018 04:08:19 -0500 Subject: [PATCH] make tabs and search work in mp ( i think ) --- .../BGAnimations/ScreenSelectMusic decorations/songsearch.lua | 2 +- .../BGAnimations/ScreenSelectMusic decorations/tabs.lua | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/songsearch.lua b/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/songsearch.lua index 8bfeccc84d..49f7a6c15f 100644 --- a/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/songsearch.lua +++ b/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/songsearch.lua @@ -32,7 +32,7 @@ local function searchInput(event) local CtrlPressed = INPUTFILTER:IsBeingPressed("left ctrl") or INPUTFILTER:IsBeingPressed("right ctrl") if event.char and event.char:match('[%%%+%-%!%@%#%$%^%&%*%(%)%=%_%.%,%:%;%\'%"%>%<%?%/%~%|%w]') and - (not tonumber(event.char) or CtrlPressed == (SCREENMAN:GetTopScreen():GetName() == "ScreenSelectMusic")) + (not tonumber(event.char) or CtrlPressed) then searchstring = searchstring .. event.char end diff --git a/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/tabs.lua b/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/tabs.lua index 9ab29a380a..5e609dfd44 100644 --- a/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/tabs.lua +++ b/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/tabs.lua @@ -9,7 +9,8 @@ local function input(event) if numericinputactive == false then if not (INPUTFILTER:IsBeingPressed("left ctrl") or INPUTFILTER:IsBeingPressed("right ctrl") or - (SCREENMAN:GetTopScreen():GetName() ~= "ScreenSelectMusic")) + (SCREENMAN:GetTopScreen():GetName() ~= "ScreenSelectMusic" and + SCREENMAN:GetTopScreen():GetName() ~= "ScreenNetSelectMusic")) then if event.DeviceInput.button == "DeviceButton_0" then setTabIndex(9) @@ -31,6 +32,7 @@ end local t = Def.ActorFrame { BeginCommand = function(self) + MESSAGEMAN:Broadcast("AddMPChatInput") SCREENMAN:GetTopScreen():AddInputCallback(input) resetTabIndex() end,