Remove "Slippi netplay" mode and auto detect if we are in netplay mode based on the changed gameid

Renamed "Slippi replay" to "Replay/Mirror" to be more clear on what the setting actually does

Author: bkacjios

source/main.lua

@@ -78,7 +78,7 @@ function love.load(args, unfilteredArg)
 end
 
 memory.hook("slippi.player.*.name", "Slippi Auto Port Switcher", function(port, name)
-	if PANEL_SETTINGS:IsSlippiNetplay() and PANEL_SETTINGS:IsSlippiAutoPortEnabled() then
+	if memory.IsSlippiNetplay() and PANEL_SETTINGS:IsSlippiAutoPortEnabled() then
 		if PANEL_SETTINGS:GetSlippiUsername() == melee.convertStr(name) then
 			PORT = port - 1
 			CONTROLLER_PORT_DISPLAY = love.timer.getTime() + 1.5 -- Show the port display number for 3 seconds
@@ -87,7 +87,7 @@ memory.hook("slippi.player.*.name", "Slippi Auto Port Switcher", function(port,
 end)
 
 memory.hook("menu", "Slippi Auto Port Switcher", function(menu)
-	if PANEL_SETTINGS:IsSlippiNetplay() and PANEL_SETTINGS:IsSlippiAutoPortEnabled() and menu ~= 2 then
+	if memory.IsSlippiNetplay() and PANEL_SETTINGS:IsSlippiAutoPortEnabled() and menu ~= 2 then
 		-- Switch back to port 1 when leaving a game of melee (In netplay only)
 		PORT = 0
 	end

source/modules/gui/panels/core/settings.lua

@@ -33,20 +33,10 @@ function PANEL:Initialize()
 	self.m_pRLABEL:Dock(DOCK_TOP)
 
 	self.m_pSLIPPIREPLAY = self.m_pRIGHT:Add("Checkbox")
-	self.m_pSLIPPIREPLAY:SetText("Slippi Replay")
+	self.m_pSLIPPIREPLAY:SetText("Replay/Mirror")
 	self.m_pSLIPPIREPLAY:Dock(DOCK_TOP)
 
-	self.m_pSLIPPI = self.m_pRIGHT:Add("Checkbox")
-	self.m_pSLIPPI:SetText("Slippi Netplay")
-	self.m_pSLIPPI:Dock(DOCK_TOP)
-
-	function self.m_pSLIPPI:OnToggle(on)
-		self:GetParent():GetParent().m_pAUTOPORT:SetEnabled(on)
-		self:GetParent():GetParent().m_pSLIPPINAME:SetEnabled(on)
-	end
-
 	self.m_pAUTOPORT = self.m_pRIGHT:Add("Checkbox")
-	self.m_pAUTOPORT:SetEnabled(false)
 	self.m_pAUTOPORT:SetText("Detect port")
 	self.m_pAUTOPORT:Dock(DOCK_TOP)
 
@@ -110,7 +100,6 @@ end
 function PANEL:GetSaveTable()
 	return {
 		["slippi-replay"] = self:IsSlippiReplay(),
-		["slippi-netplay"] = self:IsSlippiNetplay(),
 		["slippi-auto-detect-port"] = self:IsSlippiAutoPortEnabled(),
 		["slippi-username"] = self:GetSlippiUsername(),
 		["port-in-title"] = self:IsPortTitleEnabled(),
@@ -125,10 +114,6 @@ function PANEL:IsSlippiReplay()
 	return self.m_pSLIPPIREPLAY:IsToggled()
 end
 
-function PANEL:IsSlippiNetplay()
-	return self.m_pSLIPPI:IsToggled()
-end
-
 function PANEL:IsSlippiAutoPortEnabled()
 	return self.m_pAUTOPORT:IsToggled()
 end
@@ -176,7 +161,6 @@ function PANEL:LoadSettings()
 		local settings = json.decode(f:read())
 		f:close()
 		self.m_pSLIPPIREPLAY:SetToggle(settings["slippi-replay"] or false)
-		self.m_pSLIPPI:SetToggle(settings["slippi-netplay"] or false)
 		self.m_pAUTOPORT:SetToggle(settings["slippi-auto-detect-port"] or false)
 		self.m_pSLIPPINAME:SetText(settings["slippi-username"] or "")
 		self.m_pPORTTITLE:SetToggle(settings["port-in-title"] or false)

source/modules/memory/init.lua

@@ -280,29 +280,22 @@ end
 function watcher.isMelee()
 	local gid = watcher.readGameID()
 
-	-- Force the GAMEID and VERSION to be Melee 1.02, since Fizzi seems to be using the gameid address space for something..
-	if PANEL_SETTINGS:IsSlippiNetplay() then
-		gid = "GALE01"
-		version = 0x02
-	end
-
 	local clone = clones[gid]
 	if clone then gid = clone.id end
 
 	return gid == "GALE01"
 end
 
+function watcher.IsSlippiNetplay()
+	local gid = watcher.readGameID()
+	return gid == string.char(0x47, 0x41, 0x02, 0x21, 0x21, 0x31)
+end
+
 function watcher.checkmemoryvalues()
 	local frame = watcher.frame or 0
 	local gid = watcher.readGameID()
 	local version = watcher.readGameVersion()
 
-	-- Force the GAMEID and VERSION to be Melee 1.02, since Fizzi seems to be using the gameid address space for something..
-	if PANEL_SETTINGS:IsSlippiNetplay() then
-		gid = "GALE01"
-		version = 0x02
-	end
-
 	if watcher.gameid ~= gid or watcher.version ~= version then
 		watcher.reset()
 		watcher.gameid = gid