From 5b92d944b694d2cceb2f29097baab0b1ca710952 Mon Sep 17 00:00:00 2001 From: Igor Timofeev Date: Fri, 1 Apr 2016 00:03:53 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A5=D0=B5=D1=85!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Applications/TurretControl/TurretControl.lua | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/Applications/TurretControl/TurretControl.lua b/Applications/TurretControl/TurretControl.lua index 053b5325..6e94052c 100644 --- a/Applications/TurretControl/TurretControl.lua +++ b/Applications/TurretControl/TurretControl.lua @@ -149,9 +149,7 @@ local function drawBottomBar() local x = math.floor(buffer.screen.width / 2 - totalWidth / 2) + 1 newObj("BottomButtons", "On", x, y, x + widthOfButton - 1, y + 2) - x = drawButtonWithState(x, y, widthOfButton, 3, "Турели ВКЛ", turretConfig.turretsOn) - newObj("BottomButtons", "Off", x, y, x + widthOfButton - 1, y + 2) - x = drawButtonWithState(x, y, widthOfButton, 3, "Турели ВЫКЛ", not turretConfig.turretsOn) + x = drawButtonWithState(x, y, widthOfButton, 3, turretConfig.turretsOn and "Турели ВКЛ" or "Турели ВЫКЛ", turretConfig.turretsOn) newObj("BottomButtons", "AddPlayer", x, y, x + widthOfButton - 1, y + 2) x = drawButtonWithState(x, y, widthOfButton, 3, "Добавить игрока", false) newObj("BottomButtons", "AttacksMobs", x, y, x + widthOfButton - 1, y + 2) @@ -215,12 +213,8 @@ while true do for key in pairs(obj.BottomButtons) do if ecs.clickedAtArea(e[3], e[4], obj.BottomButtons[key][1], obj.BottomButtons[key][2], obj.BottomButtons[key][3], obj.BottomButtons[key][4]) then if key == "On" then - turretConfig.turretsOn = true - for i = 1, #turrets do changeTurretState(i, true) end - drawAll() - elseif key == "Off" then - turretConfig.turretsOn = false - for i = 1, #turrets do changeTurretState(i, false) end + turretConfig.turretsOn = not turretConfig.turretsOn + for i = 1, #turrets do changeTurretState(i, turretConfig.turretsOn) end drawAll() elseif key == "AttacksNeutrals" then turretConfig.attacksNeutrals = not turretConfig.attacksNeutrals