From c032ebbe0f2b03b144003bcbb5fa1bfb4539a6f1 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Mon, 10 Aug 2015 10:55:14 +0000 Subject: [PATCH] fix autobuild git-svn-id: svn://kolibrios.org@5707 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/cmm/eolite/Eolite.c | 2 +- programs/cmm/eolite/include/menu.h | 12 ++++-------- programs/cmm/eolite/include/properties.h | 16 ++++++---------- programs/cmm/eolite/include/settings.h | 8 ++------ 4 files changed, 13 insertions(+), 25 deletions(-) diff --git a/programs/cmm/eolite/Eolite.c b/programs/cmm/eolite/Eolite.c index 79c73bc6d7..1a10a5b523 100644 --- a/programs/cmm/eolite/Eolite.c +++ b/programs/cmm/eolite/Eolite.c @@ -412,7 +412,7 @@ void main() switch (key_scancode) { - case 041: + case 198: two_panels ^= 1; draw_window(); break; diff --git a/programs/cmm/eolite/include/menu.h b/programs/cmm/eolite/include/menu.h index 4071e50f45..7f019561c9 100644 --- a/programs/cmm/eolite/include/menu.h +++ b/programs/cmm/eolite/include/menu.h @@ -50,7 +50,6 @@ int cur_action_buf; void FileMenu() { - word key,key2; proc_info MenuForm; int index; @@ -78,13 +77,10 @@ void FileMenu() break; case evKey: - GetFullKey(); - key = AH; - $shr eax,16 - key2 = AL; - if (key2==SCAN_CODE_ESC){cmd_free=1;ExitProcess();} - else if (key2 == SCAN_CODE_ENTER) {action_buf = cur_action_buf; cmd_free=1; ExitProcess(); } - if (menu.ProcessKey(key2)) MenuListRedraw(); + GetKeys(); + if (key_scancode==SCAN_CODE_ESC){cmd_free=1;ExitProcess();} + else if (key_scancode == SCAN_CODE_ENTER) {action_buf = cur_action_buf; cmd_free=1; ExitProcess(); } + if (menu.ProcessKey(key_scancode)) MenuListRedraw(); break; case evReDraw: _MENU_DRAW: diff --git a/programs/cmm/eolite/include/properties.h b/programs/cmm/eolite/include/properties.h index 8b509b0c4c..25ab632242 100644 --- a/programs/cmm/eolite/include/properties.h +++ b/programs/cmm/eolite/include/properties.h @@ -214,7 +214,6 @@ void GetSizeMoreFiles(dword way) void properties_dialog() { byte id; - byte key,key2; dword file_name_off; dword selected_offset2; @@ -285,23 +284,20 @@ void properties_dialog() break; case evKey: - GetFullKey(); - key = AH; - $shr eax,16 - key2 = AL; + GetKeys(); if (quest_active) { - IF (key2==SCAN_CODE_ENTER) SetProperties(2); - IF (key2==SCAN_CODE_ESC) SetProperties(1); + IF (key_scancode==SCAN_CODE_ENTER) SetProperties(2); + IF (key_scancode==SCAN_CODE_ESC) SetProperties(1); break; } - if (key2==SCAN_CODE_ESC) + if (key_scancode==SCAN_CODE_ESC) { cmd_free=3; ExitProcess(); } - if (key2==SCAN_CODE_ENTER) + if (key_scancode==SCAN_CODE_ENTER) { if (selected_count) || (itdir) { @@ -314,7 +310,7 @@ void properties_dialog() } break; } - EAX=key<<8; + EAX = key_ascii << 8; edit_box_key stdcall(#file_name_ed); edit_box_key stdcall(#path_to_file_ed); break; diff --git a/programs/cmm/eolite/include/settings.h b/programs/cmm/eolite/include/settings.h index fcb9b99eec..5e2b4aa655 100644 --- a/programs/cmm/eolite/include/settings.h +++ b/programs/cmm/eolite/include/settings.h @@ -32,7 +32,6 @@ char confir_section = "Config"; void settings_dialog() { byte id; - unsigned int key, key2; proc_info settings_form; dword save_show_dev_name,save_real_files_names_case, save_info_after_copy, save_use_big_fonts, save_files_h, save_DBLTime; @@ -96,11 +95,8 @@ void settings_dialog() break; case evKey: - GetFullKey(); - key = AH; - $shr eax,16 - key2 = AL; - if (key2==SCAN_CODE_ESC) + GetKeys(); + if (key_scancode==SCAN_CODE_ESC) { active_settings = 0; action_buf = 300;