From 7e9a67164c75ab5065edeb0d1e0f96bfbd9f57c1 Mon Sep 17 00:00:00 2001
From: leency <lipatov.kiril@gmail.com>
Date: Fri, 21 Mar 2025 10:38:45 +0200
Subject: [PATCH] mine 0.62

- better alignment of ui elements in header
---
 programs/games/mine/changelog.txt |  3 ++-
 programs/games/mine/draw.h--      | 13 +++++--------
 programs/games/mine/mine.c--      | 16 +++++++++++-----
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/programs/games/mine/changelog.txt b/programs/games/mine/changelog.txt
index caaf7fbc9..73dd9df7f 100644
--- a/programs/games/mine/changelog.txt
+++ b/programs/games/mine/changelog.txt
@@ -1,9 +1,10 @@
 ====Leency====
 
-v0.60 (21/03/2025)
+v0.62 (21/03/2025)
 - proper window rolling up fix
 - bigger cells and fonts
 - add icon to a new game button
+- better alignment of ui elements in header
 
 v0.52 (16/12/2008)
 - window rolling up fix
diff --git a/programs/games/mine/draw.h-- b/programs/games/mine/draw.h--
index db3d46ebb..d0c98c280 100644
--- a/programs/games/mine/draw.h--
+++ b/programs/games/mine/draw.h--
@@ -18,9 +18,6 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 *******************************************************************************/
-?define HEADER_Y 4
-?define BTNSIZE 21
-?define CENTER_POS xsize / 2 - 10
 char game_mode[] = "1/3";
 
 void draw_window()
@@ -47,7 +44,7 @@ void draw_window()
   sys_draw_button(5<<16+32, HEADER_Y<<16+BTNSIZE, 1001+BT_HIDE, clLightGray);
   draw_rectangle(5,HEADER_Y,32,BTNSIZE,clWhite,clDarkGray);
   game_mode[0] = mode + '0';
-  sys_write_text(9<<16+HEADER_Y+3, 0x90000000+clDarkGray, #game_mode, 3);
+  sys_write_text(9<<16+HEADER_Y+4, 0x90656565, #game_mode, 3);
 
   // <USER FIELD> BUTTON (1002)
   //sys_draw_button(BTNSIZE<<16+7, ECX, EDX+1, 0xddbb44);
@@ -142,15 +139,15 @@ void draw_square(int x, y)
 
 void draw_time()
 {
-  sys_draw_bar(xsize-XST-58<<16+29, HEADER_Y<<16+20, clWhiteGray);
-  sys_write_number(0x00030000, time, xsize-XST-56<<16+HEADER_Y+3, 0x101166C3);
+  sys_draw_bar(xsize-XST-63<<16+34, HEADER_Y<<16+22, clWhiteGray);
+  sys_write_number(0x00030000, time, xsize-XST-58<<16+HEADER_Y+4, 0x101166C3);
 }
 
 
 void draw_mines_left()
 {
-  sys_draw_bar(xsize-XST-29<<16+29, HEADER_Y<<16+20, clWhiteGray);
-  sys_write_number(0x00030000, cmines, xsize-XST-27<<16+HEADER_Y+3, 0x10ff0000);
+  sys_draw_bar(xsize-XST-32<<16+32, HEADER_Y<<16+22, clWhiteGray);
+  sys_write_number(0x00030000, cmines, xsize-XST-29<<16+HEADER_Y+4, 0x10ff0000);
 }
 
 
diff --git a/programs/games/mine/mine.c-- b/programs/games/mine/mine.c--
index dce3d46aa..1baf44959 100644
--- a/programs/games/mine/mine.c--
+++ b/programs/games/mine/mine.c--
@@ -26,17 +26,26 @@
 //? define DEBUG 1
 
 ? print "\nÚÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¿"
-? print "\n³          KolibriOS MineSweeper v0.61         ³"
+? print "\n³          KolibriOS MineSweeper v0.62         ³"
 ? print "\n³ (C)   Leency  (leency@mail.ru)     2010-2025 ³"
 ? print "\n³ (C) Ivan Poddubny (ivan-yar@bk.ru) 2003,2004 ³"
 ? print "\nÀÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÙ\n\n"
 
-/************************************** DATA **************************************/
+/************************************* DEFINES *************************************/
+
+?define HEADER_Y 5
+?define BTNSIZE 21
+?define CENTER_POS xsize / 2 - 10
+
+?define XST 5       // offset of first pixel X - ñìåùåíèå ïîëÿ îò ãðàíèöû îêíà
+?define YST 32
 
 ? define XPX 21      // X pixels by square - ðàçìåð êëåòêè â ïèêñåëÿõ
 ? define YPX 21      // Y pixels by square
 ? define MINE 255    // â êëåòêå ìèíà, åñëè value = MINE
 
+/************************************** DATA **************************************/
+
 struct
 {
   byte value;        // number of mines   - êîëè÷åñòâî ìèí â îêðóæàþùèõ êëåòêàõ
@@ -58,9 +67,6 @@ struct
   byte   nmines;
 } stdmodes[3] = {9,9,10, 16,16,40, 30,16,99}; // {x,y,m}
 
-?define XST 5       // offset of first pixel X - ñìåùåíèå ïîëÿ îò ãðàíèöû îêíà
-?define YST 30
-
 int ncx,             // number of squares in X  - ðàçìåð ïîëÿ
     ncy,
     cmines,          // mines discovered        - êîëè÷åñòâî íåîòêðûòûõ ìèí