From 11771c85cf025e5dab24e171ccafe7d6fdc946c9 Mon Sep 17 00:00:00 2001
From: "Kirill Lipatov (Leency)" <lipatov.kiril@gmail.com>
Date: Tue, 16 Dec 2008 19:29:41 +0000
Subject: [PATCH] fixed small bug in changing MineSweeper's window mode

git-svn-id: svn://kolibrios.org@963 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 programs/games/mine/trunk/changelog.txt       | 26 +++++++++++++++++
 .../mine/trunk/{msys.h-- => kos_sys.h--}      | 14 +++++++--
 programs/games/mine/trunk/mine.c--            | 29 ++++++++-----------
 3 files changed, 49 insertions(+), 20 deletions(-)
 create mode 100644 programs/games/mine/trunk/changelog.txt
 rename programs/games/mine/trunk/{msys.h-- => kos_sys.h--} (95%)

diff --git a/programs/games/mine/trunk/changelog.txt b/programs/games/mine/trunk/changelog.txt
new file mode 100644
index 0000000000..0a3acaf2d8
--- /dev/null
+++ b/programs/games/mine/trunk/changelog.txt
@@ -0,0 +1,26 @@
+====Leency====
+
+v0.51 (16/12/2008)
+- fixed one small bug with changing window mode
+
+
+=====Ivan Poddubny=====
+
+v0.5 (2004)
+- stable version
+
+v0.3a (11/08/2003)
+ - fixed a bug on old kernels
+
+v0.3 (09/08/2003)
+ - fixed some bugs
+ - new timer
+ - better random number generator
+ - user can't blow up after first mouse click
+ - uses system colors
+
+v0.2 (29/06/2003)
+ - fixed a lot of bugs
+
+v0.1 (22/06/2003)
+ - first public version
\ No newline at end of file
diff --git a/programs/games/mine/trunk/msys.h-- b/programs/games/mine/trunk/kos_sys.h--
similarity index 95%
rename from programs/games/mine/trunk/msys.h--
rename to programs/games/mine/trunk/kos_sys.h--
index e2a5217a66..9a926894bd 100644
--- a/programs/games/mine/trunk/msys.h--
+++ b/programs/games/mine/trunk/kos_sys.h--
@@ -1,5 +1,5 @@
 /*
-    Sphinx C-- header file for MenuetOS applications.
+    Sphinx C-- header file for KolibriOS applications.
     Based on msys.h-- written by Alexey Sugonyaev and modified by Barry Kauler.
     This file is rewritten by Ivan Poddubny.
 
@@ -30,7 +30,9 @@
 #define evButton	3
 #define evMouse		6
 #define evIPC		7
-#define evStack         8
+#define evStack     8
+
+#define OLD -1
 
 struct FileInfo
 {
@@ -896,7 +898,7 @@ inline fastcall void sys_get_colors(dword ECX,EDX)
   $int 0x40
 }
 
-inline fastcall dword sys_get_skin_height(dword)
+inline fastcall dword sys_get_skin_height()
 {
   EAX = 48;
   EBX = 4;
@@ -1109,6 +1111,12 @@ inline fastcall dword sys_debug_read_char(dword EBX)
 }
 
 
+inline fastcall dword window_move_size(dword EBX,ECX,EDX,ESI){
+	EAX = 67;
+	$int 0x40
+}
+
+
 /*********************************************************
 -1 = EXIT PROCESS
 *********************************************************/
diff --git a/programs/games/mine/trunk/mine.c-- b/programs/games/mine/trunk/mine.c--
index 5b98be43f1..8917ab08d1 100644
--- a/programs/games/mine/trunk/mine.c--
+++ b/programs/games/mine/trunk/mine.c--
@@ -22,7 +22,7 @@
 ? pragma option LST    // generate ASM listing file - ñîçäàòü àññåìáëåðíûé ëèñòèíã
 ? warning    TRUE      // âêëþ÷èòü ðåæèì âûâîäà ïðåäóïðåæäåíèé
 ? jumptomain NONE
-? include "msys.h--"     // MenuetOS system functions - ñèñòåìíûå ôóíêöèè MenuetOS
+? include "kos_sys.h--"     // MenuetOS system functions - ñèñòåìíûå ôóíêöèè MenuetOS
 //? define DEBUG 1
 
 ? print "\nÚÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¿"
@@ -97,10 +97,10 @@ inline void fastcall mouse_disable()
 }
 
 
-? include "timer.h--"  // timer functions
-? include "draw.h--"   // drawing functions
-? include "access.h--" // get & set functions
-? include "random.h--" // random number generator
+# include "timer.h--"  // timer functions
+# include "draw.h--"   // drawing functions
+# include "access.h--" // get & set functions
+# include "random.h--" // random number generator
 //? include "uf.h--"     // user field window
 
 
@@ -377,10 +377,10 @@ int open_near_squares(int x, y)
         open_square(a, b);
       }
     }
-    return suma;
+    RETURN suma;
   }
   ELSE
-    return 0;
+    RETURN 0;
 }  // open_near_squares
 
 
@@ -430,7 +430,6 @@ void end_game()
 
 void main()
 {
-  //sys_delay(5);   // for old kernel only!
   new_game();
   draw_window();
 
@@ -463,12 +462,8 @@ void main()
           EAX = mode; EAX++; EAX = EAX%3; EAX++; mode = AL;
 
           new_game();
-          EBX = ECX = -1;
-          EDX = xsize;
-          ESI = ysize;
-          EAX = 67;
-          $int 0x40
-          continue;
+          window_move_size(OLD,OLD,xsize,ysize);
+          CONTINUE;
         }
 //        ELSE IF (EAX == 1002)
 //        {
@@ -476,11 +471,11 @@ void main()
 //        }
         ELSE IF (EAX == 1)           // close window
           sys_exit_process();
-        continue;
+        CONTINUE;
 
       case evMouse:
         IF (!mouse_en) // is mouse enabled ?
-          continue;
+          CONTINUE;
         do_mouse();
         // wait for mouse release - æäàòü îòïóñêàíèÿ êíîïêè
         WHILE (sys_read_mouse(2) == mouse_status)
@@ -497,4 +492,4 @@ void main()
     check_timer();
     sys_delay(2);
   }
-}  // main
\ No newline at end of file
+}  // main