Merge branch 'develop-1.8' of https://github.com/kepler155c/opus into develop-1.8

This commit is contained in:
kepler155c@gmail.com 2019-12-07 12:05:03 -07:00
commit db2a28f04c
1 changed files with 10 additions and 8 deletions

View File

@ -307,14 +307,16 @@ end
function page:enable()
modemConfig.modems = {}
peripheral.find('modem', function(side, dev)
modemConfig.modems[side] = {
type = dev.isWireless() and 'Wireless' or 'Wired',
side = side,
openChannels = { },
device = dev,
loaded = false
}
Util.each(_G.device, function(dev)
if dev.type == "modem" then
modemConfig.modems[dev.side] = {
type = dev.isWireless() and 'Wireless' or 'Wired',
side = dev.side,
openChannels = { },
device = dev,
loaded = false
}
end
end)
modemConfig.currentModem = device.wireless_modem and
modemConfig.modems[device.wireless_modem.side] or