From 352f79b991681fe51322db6456b85a1521faba68 Mon Sep 17 00:00:00 2001
From: "Kirill Lipatov (Leency)" <lipatov.kiril@gmail.com>
Date: Sun, 27 Oct 2013 12:05:04 +0000
Subject: [PATCH] KolibriN9 Installer: fixes

git-svn-id: svn://kolibrios.org@4114 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 programs/cmm/installer/_compile_en.bat |  4 ++--
 programs/cmm/installer/_compile_ru.bat |  4 ++--
 programs/cmm/installer/installer.c     | 10 +++-------
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/programs/cmm/installer/_compile_en.bat b/programs/cmm/installer/_compile_en.bat
index 952207a56e..ec06f20812 100644
--- a/programs/cmm/installer/_compile_en.bat
+++ b/programs/cmm/installer/_compile_en.bat
@@ -1,9 +1,9 @@
 @del lang.h--
 @echo #define LANG_ENG 1 >lang.h--
 
-..\C--\C-- main.c
+..\C--\C-- installer.c
 @del installer.kex
-@rename main.com installer.kex
+@rename installer.com installer.kex
 @pause
 @del lang.h--
 @del warning.txt
diff --git a/programs/cmm/installer/_compile_ru.bat b/programs/cmm/installer/_compile_ru.bat
index e642842699..4abda48829 100644
--- a/programs/cmm/installer/_compile_ru.bat
+++ b/programs/cmm/installer/_compile_ru.bat
@@ -1,9 +1,9 @@
 @del lang.h--
 @echo #define LANG_RUS 1 >lang.h--
 
-..\C--\C-- main.c
+..\C--\C-- installer.c
 @del installer.kex
-@rename main.com installer.kex
+@rename installer.com installer.kex
 @pause
 @del lang.h--
 @del warning.txt
diff --git a/programs/cmm/installer/installer.c b/programs/cmm/installer/installer.c
index 8dd00641e1..fdb8dc6a94 100644
--- a/programs/cmm/installer/installer.c
+++ b/programs/cmm/installer/installer.c
@@ -7,9 +7,8 @@
 #include "..\lib\mem.h"
 #include "..\lib\dll.h"
 #include "..\lib\copyf.h"
-//*.obj libraries
-#include "..\lib\lib.obj\box_lib.h"
 
+#include "add_appl_dir.c";
 
 #define LOGOW 16
 #define LOGOH 16
@@ -52,9 +51,6 @@ int DefineWindow(dword wtitle, wbutton)
 	return 1;
 }
 
-#include "add_appl_dir.c";
-#include "dialogs.c";
-
 void main()
 {
 	mem_Init();
@@ -91,7 +87,7 @@ void InstallationLoop(int dialog_t)
 					{
 						if !(DefineWindow("Installation Started", "Stop")) break;
 						//iclock[0]><iclock[1]; 
-						_PutImage(Form.cwidth-LOGOW/2, Fprm.height-LOGOH/2+BLACK_H, LOGOW,LOGOH, LOGOW*LOGOH*3*iclock[0]+ #logo);
+						_PutImage(Form.cwidth-LOGOW/2, Form.height-LOGOH/2, LOGOW,LOGOH, LOGOW*LOGOH*3*iclock[0]+ #logo);
 
 						if (!started)
 						{
@@ -104,7 +100,7 @@ void InstallationLoop(int dialog_t)
 					{
 						if !(DefineWindow("Installation complete", "Exit")) break;
 						WriteText(TEXTX, BLACK_H*2, 0x80, 0, T_END);
-						DrawLink(TEXTX, BLACK_H*2+55, 0x80, 11, "http://kolibri-n.org");
+						DrawLink(TEXTX, BLACK_H*2+15, 0x80, 11, "http://kolibri-n.org");
 					}
 	}
 }