make tabs and search work in mp ( i think )

etternagame · Nov 28, 2018 · 9f1bf36 · 9f1bf36
1 parent 5dc5da3
commit 9f1bf36
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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,