diff --git a/.DS_Store b/.DS_Store index df3f402a..355bafd9 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/Applications.txt b/Applications.txt index 2bd829bd..4eac2f14 100644 --- a/Applications.txt +++ b/Applications.txt @@ -537,7 +537,7 @@ type="Application", icon="IgorTimofeev/OpenComputers/master/Applications/SmartHouse/Icon.pic", createShortcut="desktop", - version=1.28, + version=1.29, resources={ { name="Modules/command_block/Icon.pic", @@ -885,7 +885,7 @@ type="Application", icon="IgorTimofeev/OpenComputers/master/Applications/MineCodeIDE/Icon.pic", createShortcut="desktop", - version=1.03, + version=1.04, }, { name="MineOS/Applications/Battleship", diff --git a/Applications/.DS_Store b/Applications/.DS_Store index d5ad6a6a..744927d6 100644 Binary files a/Applications/.DS_Store and b/Applications/.DS_Store differ diff --git a/Applications/SmartHouse/SmartHouse.lua b/Applications/SmartHouse/SmartHouse.lua index a3fa3e7b..a6d322ff 100755 --- a/Applications/SmartHouse/SmartHouse.lua +++ b/Applications/SmartHouse/SmartHouse.lua @@ -40,15 +40,6 @@ local offset = {x = 0, y = 0} ----------------------------------------------------------------------------------------------------------------------------------- -local function getComputerInfo() - local currentComputerAddress = computer.address() - for address, information in pairs(computer.getDeviceInfo()) do - if currentComputerAddress == address then - return information.description - end - end -end - local function loadModule(modulePath) local success, module = pcall(loadfile(modulePath .. "/Main.lua")) if success then @@ -345,8 +336,8 @@ local function createWindow() -- Создаем главное и неебически важное устройство домашнего писюка local homePC = createDevice(math.floor(window.width / 2 - 8), math.floor(window.height / 2 - 4), "homePC", component.proxy(computer.address()), "Сервак") - local computerDescription = getComputerInfo() - if computerDescription == "Server" then homePC.module.icon = image.load(homePC.module.modulePath .. "Server.pic"); homePC.deviceImage.image = homePC.module.icon end + homePC.module.icon = image.load(homePC.module.modulePath .. "Server.pic") + homePC.deviceImage.image = homePC.module.icon -- Перед отрисовкой окна чистим буфер фоном и перехуячиваем позиции объектов групп window.onDrawStarted = function()