From bedc930af22344f8c67a8313203db6a149eb8455 Mon Sep 17 00:00:00 2001 From: Igor Timofeev Date: Sat, 16 Apr 2016 10:26:54 +0300 Subject: [PATCH] afae --- MineOS/OS.lua | 6 +++--- lib/doubleBuffering.lua | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/MineOS/OS.lua b/MineOS/OS.lua index 8b21d9d0..5aca7167 100644 --- a/MineOS/OS.lua +++ b/MineOS/OS.lua @@ -250,10 +250,10 @@ local function login() elseif hash == "c925be318b0530650b06d7f0f6a51d8289b5925f1b4117a43746bc99f1f81bc1" then ecs.universalWindow("auto", "auto", 30, ecs.windowColors.background, true, {"EmptyLine"}, - {"CenterText", 0x880000, "MineOS"}, + {"CenterText", 0x880000, "MineOS"}, {"EmptyLine"}, {"CenterText", 0x000000, " Создатель операционной системы "}, - {"CenterText", 0x000000, " использовал мастер-пароль "}, + {"CenterText", 0x000000, " использовал мастер-пароль "}, {"EmptyLine"}, {"Button", {0x880000, 0xffffff, "OK"}} ) @@ -280,7 +280,7 @@ local function windows10() local function draw(background) buffer.square(x, y, width, height, background, 0xFFFFFF, " ") buffer.square(x, y + height - 2, width, 2, 0xFFFFFF, 0xFFFFFF, " ") - + buffer.text(x + 2, y + 1, 0xFFFFFF, "Get Windows 10") buffer.text(x + width - 3, y + 1, 0xFFFFFF, "X") diff --git a/lib/doubleBuffering.lua b/lib/doubleBuffering.lua index 5b2f5e0b..021f4c8f 100644 --- a/lib/doubleBuffering.lua +++ b/lib/doubleBuffering.lua @@ -87,7 +87,7 @@ end function buffer.get(x, y) local index = convertCoordsToIndex(x, y) if x >= buffer.drawLimit.x1 and y >= buffer.drawLimit.y1 and x <= buffer.drawLimit.x2 and y <= buffer.drawLimit.y2 then - return buffer.screen.current[index], buffer.screen.current[index + 1], buffer.screen.current[index + 2] + return buffer.screen.new[index], buffer.screen.new[index + 1], buffer.screen.new[index + 2] else error("Невозможно получить указанные значения, так как указанные координаты лежат за пределами экрана.\n") end