From a76e01a34d11419015727587ab87ac9ccceb8be7 Mon Sep 17 00:00:00 2001
From: "Kirill Lipatov (Leency)" <lipatov.kiril@gmail.com>
Date: Sun, 14 Feb 2016 18:50:09 +0000
Subject: [PATCH] revert occasionally updated files in prior rev, add Tupfile
 for almaz game

git-svn-id: svn://kolibrios.org@6219 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 programs/macros.inc                        | 6 +++---
 programs/system/taskbar/trunk/drawappl.inc | 4 ++--
 programs/system/taskbar/trunk/drawtray.inc | 2 +-
 programs/system/taskbar/trunk/drawwind.inc | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/programs/macros.inc b/programs/macros.inc
index 7f95fc804a..a4ea029a58 100644
--- a/programs/macros.inc
+++ b/programs/macros.inc
@@ -467,11 +467,11 @@ struct process_information
 ends
 
 struct system_colors
-  taskbar          dd ? ;frame
-  taskbar_text     dd ? ;grab
+  frame            dd ? ;nonset1
+  grab             dd ? ;nonset2
   work_3d_dark     dd ?
   work_3d_light    dd ?
-  window_title     dd ? ;grab_text
+  grab_text        dd ? ;nonset3
   work             dd ?
   work_button      dd ?
   work_button_text dd ?
diff --git a/programs/system/taskbar/trunk/drawappl.inc b/programs/system/taskbar/trunk/drawappl.inc
index 33abea4cf4..2ee0f8886b 100644
--- a/programs/system/taskbar/trunk/drawappl.inc
+++ b/programs/system/taskbar/trunk/drawappl.inc
@@ -145,7 +145,7 @@ align 4
 	add	ebx,TAB_SIZE-2	;54
 
 	push	edi
-	mov	edx,[system_colours.taskbar]
+	mov	edx,[system_colours.work_button]
 	xor	edi,edi
 
 	cmp	ebp,[active_slot_number]	;ecx	; ecx=active slot number
@@ -181,7 +181,7 @@ align 4
 	add	bx,cx
 	
 	mov	edx, procinfo_window_tabs+10
-	mcall	4,,[system_colours.taskbar_text],,11
+	mcall	4,,[system_colours.work_button_text],,11
 ;--------------------------------------
 align 4
 .nodraw:
diff --git a/programs/system/taskbar/trunk/drawtray.inc b/programs/system/taskbar/trunk/drawtray.inc
index 8e58a9ba01..7dcf8af8b0 100644
--- a/programs/system/taskbar/trunk/drawtray.inc
+++ b/programs/system/taskbar/trunk/drawtray.inc
@@ -192,7 +192,7 @@ draw_list_button:
 ; draw page list number
 	mov	edx,ebx
 	add	edx,9 shl 16
-	mcall	47,0x20000,[page_list],,[system_colours.taskbar_text]
+	mcall	47,0x20000,[page_list],,[system_colours.work_button_text]
 @@:
 	ret
 ;---------------------------------------------------------------
diff --git a/programs/system/taskbar/trunk/drawwind.inc b/programs/system/taskbar/trunk/drawwind.inc
index fbcd1a60ec..97915ce0ab 100644
--- a/programs/system/taskbar/trunk/drawwind.inc
+++ b/programs/system/taskbar/trunk/drawwind.inc
@@ -10,8 +10,8 @@ draw_window:
 
 	mcall	48,3,system_colours,10*4
 
-	mov	eax, [system_colours.taskbar]
-	mov	edx,[system_colours.taskbar]
+	mov	eax, [system_colours+4*6]
+	mov	edx,[system_colours+4*6]
 	mov	eax,COLOR_CHANGE_MAGNITUDE
 	call	subtract_color_change_magnitude
 	mov	[wcolor], edx