fixed stupid mistake

This commit is contained in:
2025-12-29 00:52:10 -05:00
parent f493405b48
commit a8f5c0bfda

View File

@ -75,6 +75,7 @@ local destAddress = {}
local destAddressname = "" local destAddressname = ""
local selx, sely = 0, 0 local selx, sely = 0, 0
local y = 0 local y = 0
local lastReceivedMessage = nil
--------------------------------------------- ---------------------------------------------
-- EVENT HANDLERS -- EVENT HANDLERS
@ -130,7 +131,8 @@ end
local function GetMessage() local function GetMessage()
local _, _, message = os.pullEvent("stargate_message_received") local _, _, message = os.pullEvent("stargate_message_received")
return message lastReceivedMessage = message
return 1
end end
local function HandlePasswordEntry() local function HandlePasswordEntry()
@ -298,7 +300,7 @@ local function handleIncomingWormhole()
incomingEntityName = "" incomingEntityName = ""
elseif (result == 3) then elseif (result == 3) then
-- Received a message -- Received a message
local message = GetMessage() local message = lastReceivedMessage
utils.log("Received message: " .. message) utils.log("Received message: " .. message)
-- Check if it's a password attempt -- Check if it's a password attempt
@ -306,6 +308,7 @@ local function handleIncomingWormhole()
local password = message:sub(15) local password = message:sub(15)
HandleIncomingPasswordRequest(password) HandleIncomingPasswordRequest(password)
end end
lastReceivedMessage = nil
else else
disconnect = true disconnect = true
end end
@ -318,7 +321,7 @@ end
--------------------------------------------- ---------------------------------------------
local function dialGate(address) local function dialGate(address)
tmp = utils.deepCopy(address) tmp = utils.deepcopy(address)
table.remove(tmp) table.remove(tmp)
utils.log("Dialing: " .. gate.addressToString(tmp)) utils.log("Dialing: " .. gate.addressToString(tmp))
@ -504,17 +507,22 @@ local function handleOutgoingDial()
-- Wait briefly for version message from remote gate -- Wait briefly for version message from remote gate
local remoteHasComputer = false local remoteHasComputer = false
local function WaitForVersion() local function WaitForVersion()
print("Began waiting")
sleep(1) -- Wait up to 1 second for version message sleep(1) -- Wait up to 1 second for version message
return nil print("Waited long enough")
return -1
end end
local result = parallel.waitForAny(GetMessage, WaitForVersion) local result = parallel.waitForAny(GetMessage, WaitForVersion)
if result == 1 then if result == 1 then
local message = GetMessage() local message = lastReceivedMessage
lastReceivedMessage = nil
if message:sub(1, 6) == "SGCS_V" then if message:sub(1, 6) == "SGCS_V" then
remoteHasComputer = true remoteHasComputer = true
local version = message:sub(7) local version = message:sub(7)
utils.log("Remote gate has control system version " .. version) utils.log("Remote gate has control system version " .. version)
else
print(message)
end end
end end
@ -538,7 +546,8 @@ local function handleOutgoingDial()
result = parallel.waitForAny(GetMessage, WaitForResponse) result = parallel.waitForAny(GetMessage, WaitForResponse)
if result == 1 then if result == 1 then
local response = GetMessage() local response = lastReceivedMessage
lastReceivedMessage = nil
if response == "IRIS_OPEN" then if response == "IRIS_OPEN" then
display.showPasswordResult(true) display.showPasswordResult(true)
utils.log("Password accepted - iris opened") utils.log("Password accepted - iris opened")