Fixed not being able to change ports if a game is not detected

Started working on a "Slippi Netplay" mode to try and fix issue #10

Author: bkacjios

source/main.lua

@@ -16,7 +16,7 @@ local newImage = graphics.newImage
 local PORT_FONT = graphics.newFont("fonts/melee-bold.otf", 42)
 local DEBUG_FONT = graphics.newFont("fonts/melee-bold.otf", 12)
 
-local PANEL_SETTINGS
+--PANEL_SETTINGS
 
 local MAX_PORTS = 4
 local PORT = 0
@@ -89,8 +89,6 @@ function love.keypressed(key, scancode, isrepeat)
 
 	gui.keyPressed(key, scancode, isrepeat)
 
-	if not watcher.isReady() then return end
-
 	local num = tonumber(key)
 
 	if not PANEL_SETTINGS:IsVisible() and num and num >= 1 and num <= 4 then
@@ -124,9 +122,7 @@ function love.wheelmoved(x, y)
 		gui.mouseWheeled(x, y)
 		return
 	end
-
-	if not watcher.isReady() then return end
-
+	
 	if y > 0 then
 		PORT = PORT - 1
 	elseif y < 0 then

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

@@ -7,9 +7,13 @@ function PANEL:Initialize()
 
 	self:SetTitle("Settings")
 	self:SetHideOnClose(true)
-	self:SetSize(156, 160)
+	self:SetSize(156, 188)
 	self:Center()
 
+	self.m_pSLIPPI = self:Add("Checkbox")
+	self.m_pSLIPPI:SetText("Slippi Netplay")
+	self.m_pSLIPPI:Dock(DOCK_TOP)
+
 	self.m_pDPAD = self:Add("Checkbox")
 	self.m_pDPAD:SetText("Hide D-PAD")
 	self.m_pDPAD:Dock(DOCK_TOP)
@@ -50,12 +54,17 @@ end
 
 function PANEL:GetSaveTable()
 	return {
+		["slippi-netplay"] = self:IsSlippiNetplay(),
 		["hide-dpad"] = self:IsDPADHidden(),
 		["debugging"] = self:IsDebugging(),
 		["transparency"] = self:GetTransparency(),
 	}
 end
 
+function PANEL:IsSlippiNetplay()
+	return self.m_pSLIPPI:IsToggled()
+end
+
 function PANEL:IsDPADHidden()
 	return self.m_pDPAD:IsToggled()
 end
@@ -82,6 +91,7 @@ function PANEL:LoadSettings()
 	if f then
 		local settings = json.decode(f:read())
 		f:close()
+		self.m_pSLIPPI:SetToggled(settings["slippi-netplay"] or false)
 		self.m_pDPAD:SetToggled(settings["hide-dpad"] or false)
 		self.m_pDEBUG:SetToggled(settings["debugging"] or false)
 		self.m_pTRANSPARENCY:SetValue(settings["transparency"] or 100)

source/modules/memory/init.lua

@@ -277,6 +277,12 @@ function watcher.checkmemoryvalues()
 	local gid = watcher.readGameID()
 	local version = watcher.readGameVersion()
 
+	-- Force the GAMEID and VERSION to be Melee 1.02, since Fizzi seems to be using this 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