flood-it-fix-buttons-position

CONTRIBUTING.md

@@ -66,17 +66,6 @@ to the end commit message body on a new line.
 
 Use **rebase** to keep your branch up to date.
 
-## Licensing
-
-For new source code files and for existing ones without a license, you need to add the following header to the beginning of the file:
-```asm
-; SPDX-License-Identifier: GPL-2.0-only
-; Program - Brief description.
-; Copyright (C) 2011-2025 KolibriOS team
-```
-
-Be careful when setting copyright and date interval. Review the file's history to verify its origin.
-
 ## Conclusion
 
 We hope this small instructions will help you to get familiar with KolibriOS contribution rules and inspire you to participate in the life of our project.

README.md

@@ -1,6 +1,6 @@
 # KolibriOS
 
-[![License](https://img.shields.io/badge/License-GPL%202.0-green)](./LICENSE)
+[![License](https://img.shields.io/badge/License-GPL%202.0-green)](./COPYING.TXT)
 [![Build system](https://git.kolibrios.org/KolibriOS/kolibrios/actions/workflows/build.yaml/badge.svg)](https://git.kolibrios.org/KolibriOS/kolibrios/actions)
 
 KolibriOS is a hobby operating system for x86-compatible computers, which is currently being developed by a small but passionate team of enthusiasts.

data/Tupfile.lua

@@ -635,6 +635,7 @@ tup.append_table(extra_files, {
 })
 -- For russian build, add russian-only programs.
 if build_type == "ru_RU" then tup.append_table(img_files, {
+ {"PERIOD", VAR_PROGS .. "/other/period/trunk/period"},
  {"GAMES/KLAVISHA", VAR_PROGS .. "/games/klavisha/klavisha"},
  {"DEVELOP/EXAMPLES/TESTCON2", VAR_PROGS .. "/develop/libraries/console_coff/examples/testcon2_rus"},
 }) else tup.append_table(img_files, {
@@ -642,7 +643,6 @@ if build_type == "ru_RU" then tup.append_table(img_files, {
 }) end
 
 if build_type == "ru_RU" then tup.append_table(extra_files, {
- {"kolibrios/utils/period", VAR_PROGS .. "/other/period/trunk/period"},
  {"kolibrios/games/Dungeons/Dungeons", VAR_PROGS .. "/games/Dungeons/Dungeons"},
 }) end
 

programs/fs/unz/unz.asm

@@ -41,7 +41,6 @@ dd     1, start, init_end, end_mem, stack_top, params,	0
 include 'lang.inc' ; Language support for locales: ru_RU (CP866), es_ES, en_US.
 include '../../macros.inc'
 include '../../proc32.inc'
-include "../../string.inc"
 include '../../develop/libraries/box_lib/trunk/box_lib.mac'
 include '../../dll.inc'
 ;include '../../debug.inc'
@@ -370,12 +369,6 @@ endl
 
 	mcall	30,4,,1
 	jmp	.n
-@@:
-	stdcall string.length, pathOut
-	add     eax, pathOut
-	cmpne   [eax - 1], byte '/', @f
-	mov     [eax - 1], byte 0
-	dec     dword[edtUnpPath.size]
 @@:
 	mcall	30,4,pathOut,1
 .n:

programs/games/flood-it/flood-it.c

@@ -225,8 +225,10 @@ void draw_window()
 
 	// Main buttons to fill the board
 	#define FILL_BUTTON_SIZE BUTTON_SIZE+8
-	for (i=0;i<6;i++)
-		DefineButton(i%3*FILL_BUTTON_SIZE+17,i/3*FILL_BUTTON_SIZE+15,FILL_BUTTON_SIZE,FILL_BUTTON_SIZE, i+100,FIELD_COLORS[i]);
+	for (i=0;i<6;i++) {
+		DefineButton(i%3*FILL_BUTTON_SIZE+17,calc(i/3)*FILL_BUTTON_SIZE+15,
+			FILL_BUTTON_SIZE,FILL_BUTTON_SIZE, i+100,FIELD_COLORS[i]);
+	}
 
 	// Menu buttons
 	for (i=0;i<3;i++)

programs/games/flood-it/lib/kolibri.h

@@ -27,6 +27,8 @@ dword  I_Path       = 0;
 #define true 1
 #define false 0
 
+inline fastcall dword calc(EAX) { return EAX; }
+
 //-------------------------------------------------------------------------