diff --git a/programs/games/nu_pogodi/trunk/kv_decor.png b/programs/games/nu_pogodi/trunk/kv_decor.png new file mode 100644 index 0000000000..29616e4b54 Binary files /dev/null and b/programs/games/nu_pogodi/trunk/kv_decor.png differ diff --git a/programs/games/nu_pogodi/trunk/kv_z_decor.svg b/programs/games/nu_pogodi/trunk/kv_z_decor.svg new file mode 100644 index 0000000000..e93f68906e --- /dev/null +++ b/programs/games/nu_pogodi/trunk/kv_z_decor.svg @@ -0,0 +1,520 @@ + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/programs/games/nu_pogodi/trunk/kvaka_za.ini b/programs/games/nu_pogodi/trunk/kvaka_za.ini index 28665cf322..5bf2082a14 100644 --- a/programs/games/nu_pogodi/trunk/kvaka_za.ini +++ b/programs/games/nu_pogodi/trunk/kvaka_za.ini @@ -1,6 +1,19 @@ [Files] displ_w=315 displ_h=210 +file_decorat=kv_decor.png file_unit=kv_zaba.png +file_objects=eggs.png +offs_shadow_x=2 +offs_shadow_y=2 +[Game] +delay_a=65 +delay_b=35 +delay_min=15 [Colors] -unit=0,128,0 \ No newline at end of file +background=223,240,223 ;ЎтхЄ Їюэр +shadows=200,200,200 ;ЎтхЄ Єхэхщ +unit=0,128,0 +dec0=255,255,255 +dec1=0,0,0 +dec2=33,33,120 \ No newline at end of file diff --git a/programs/other/planet_v/planet_v.asm b/programs/other/planet_v/planet_v.asm index f722a452e9..0c3e7f52ef 100644 --- a/programs/other/planet_v/planet_v.asm +++ b/programs/other/planet_v/planet_v.asm @@ -958,7 +958,7 @@ OpenDialog_data: .com_area_name dd communication_area_name ;+8 .com_area dd 0 ;+12 .opendir_path dd plugin_path ;+16 -.dir_default_path dd openfile_path ;+20 +.dir_default_path dd default_dir ;+20 .start_path dd file_name ;+24 путь к диалогу открытия файлов .draw_window dd draw_window ;+28 .status dd 0 ;+32 @@ -972,6 +972,8 @@ OpenDialog_data: .y_size dw 320 ;+52 ; Window y size .y_start dw 10 ;+54 ; Window Y position +default_dir db '/rd/1',0 ;директория по умолчанию + communication_area_name: db 'FFFFFFFF_open_dialog',0 open_dialog_name: diff --git a/programs/other/t_edit/t_button.inc b/programs/other/t_edit/t_button.inc index dc712e1b6d..db1338a85c 100644 --- a/programs/other/t_edit/t_button.inc +++ b/programs/other/t_edit/t_button.inc @@ -26,7 +26,7 @@ struct symbol ends -hed db 'TextEditor 09.06.10',0 ;подпись окна +hed db 'TextEditor 25.08.10',0 ;подпись окна sc system_colors fn_icon db 'te_icon.bmp',0 @@ -107,7 +107,7 @@ ted_but_open_file: copy_path open_dialog_name,communication_area_default_path,file_name,0 mov [OpenDialog_data.type],0 - start_OpenDialog OpenDialog_data + stdcall [OpenDialog_Start],OpenDialog_data cmp [OpenDialog_data.status],2 jne @f stdcall mem_spac, msgbox_9.fdp,100 diff --git a/programs/other/t_edit/t_data.inc b/programs/other/t_edit/t_data.inc index 55b51f10d4..460685f32b 100644 --- a/programs/other/t_edit/t_data.inc +++ b/programs/other/t_edit/t_data.inc @@ -3,10 +3,13 @@ fn_syntax_dir db 'info/',0 def_col_file db 'default.syn',0 system_dir0 db '/sys/lib/' -boxlib_name db 'box_lib.obj',0 +lib0_name db 'box_lib.obj',0 system_dir1 db '/sys/lib/' -msgbox_name db 'msgbox.obj',0 +lib1_name db 'msgbox.obj',0 + +system_dir2 db '/sys/lib/' +lib2_name db 'proc_lib.obj',0 fn_icon_tl_sys db 'tl_sys_16.bmp',0 fn_icon_tl_nod db 'tl_nod_16.bmp',0 @@ -162,7 +165,15 @@ dd 0,0 sz_ted_but_find_next db 'ted_but_find_next',0 sz_ted_text_colored db 'ted_text_colored',0 ;sz_ted_version db 'version_text_edit',0 -;-------------------------------------------------- + +align 4 +proclib_import: + OpenDialog_Init dd aOpenDialog_Init + OpenDialog_Start dd aOpenDialog_Start +dd 0,0 + aOpenDialog_Init db 'OpenDialog_init',0 + aOpenDialog_Start db 'OpenDialog_start',0 + align 4 msgbox_lib_import: mb_create dd amb_create @@ -172,7 +183,7 @@ dd 0,0 amb_create db 'mb_create',0 amb_reinit db 'mb_reinit',0 amb_setfunctions db 'mb_setfunctions',0 -;--------------------------------------------------------------------- +;--------------------------------------------------------------------- align 4 wScr: .x: @@ -324,14 +335,22 @@ OpenDialog_data: .procinfo dd procinfo ;+4 .com_area_name dd communication_area_name ;+8 .com_area dd 0 ;+12 -.opendir_path dd plugin_path ;+16 -.dir_default_path dd openfile_path ;+20 +.opendir_path dd plugin_path ;+16 +.dir_default_path dd default_dir ;+20 .start_path dd file_name ;+24 путь к диалогу открытия файлов .draw_window dd draw_window ;+28 .status dd 0 ;+32 .openfile_path dd openfile_path ;+36 путь к открываемому файлу .filename_area dd filename_area ;+40 .filter_area dd Filter +.x: +.x_size dw 420 ;+48 ; Window X size +.x_start dw 10 ;+50 ; Window X position +.y: +.y_size dw 320 ;+52 ; Window y size +.y_start dw 10 ;+54 ; Window Y position + +default_dir db '/rd/1',0 ;директория по умолчанию communication_area_name: db 'FFFFFFFF_open_dialog',0 diff --git a/programs/other/t_edit/t_edit.asm b/programs/other/t_edit/t_edit.asm index de0707aeb5..27c275f154 100644 --- a/programs/other/t_edit/t_edit.asm +++ b/programs/other/t_edit/t_edit.asm @@ -25,8 +25,6 @@ include 'mem.inc' include '../../develop/libraries/box_lib/load_lib.mac' include '../../develop/libraries/box_lib/trunk/box_lib.mac' include 'lang.inc' -include '../../develop/libraries/box_lib/asm/trunk/opendial.mac' -use_OpenDialog include 't_data.inc' include 'strlen.inc' @@ -68,11 +66,11 @@ load_libraries l_libs_start,load_lib_end @@: ;--------------------------------------------------------------------- - stdcall [ted_init], tedit0 - stdcall dword[tl_data_init], tree1 + stdcall [ted_init], tedit0 + stdcall dword[tl_data_init], tree1 ; OpenDialog initialisation -init_OpenDialog OpenDialog_data + stdcall [OpenDialog_Init],OpenDialog_data ; init bmp file mov ecx,1200*18 @@ -511,27 +509,30 @@ edit2 edit_box TED_PANEL_WIDTH-1, 0, 20, 0xffffff, 0xff80, 0xff0000, 0xff, 0x408 buf_find db 302 dup(0) if lang eq ru - err_message_found_lib0 db 'Извините не удалось найти библиотеку box_lib.obj',0 head_f_i0: head_f_l0 db 'Системная ошибка',0 - err_message_import0 db 'Ошибка при импорте библиотеки box_lib.obj',0 - err_message_found_lib1 db 'Извините не удалось найти библиотеку msgbox.obj',0 - err_message_import1 db 'Ошибка при импорте библиотеки msgbox.obj',0 + err_message_found_lib0 db 'Не найдена библиотека ',39,'box_lib.obj',39,0 + err_message_import0 db 'Ошибка при импорте библиотеки ',39,'box_lib.obj',39,0 + err_message_found_lib1 db 'Не найдена библиотека ',39,'msgbox.obj',39,0 + err_message_import1 db 'Ошибка при импорте библиотеки ',39,'msgbox.obj',39,0 + err_message_found_lib2 db 'Не найдена библиотека ',39,'proc_lib.obj',39,0 + err_message_import2 db 'Ошибка при импорте библиотеки ',39,'proc_lib.obj',39,0 else - err_message_found_lib0 db 'Sorry I cannot found library box_lib.obj',0 head_f_i0: head_f_l0 db 'System error',0 - err_message_import0 db 'Error on load import library box_lib.obj',0 - err_message_found_lib1 db 'Sorry I cannot found library msgbox.obj',0 - ;head_f_i1: - ;head_f_l1 db 'System error',0 - err_message_import1 db 'Error on load import library msgbox.obj',0 + err_message_found_lib0 db 'Sorry I cannot found library ',39,'box_lib.obj',39,0 + err_message_import0 db 'Error on load import library ',39,'box_lib.obj',39,0 + err_message_found_lib1 db 'Sorry I cannot found library ',39,'msgbox.obj',39,0 + err_message_import1 db 'Error on load import library ',39,'msgbox.obj',39,0 + err_message_found_lib2 db 'Sorry I cannot found library ',39,'proc_lib.obj',39,0 + err_message_import2 db 'Error on load import library ',39,'proc_lib.obj',39,0 end if ;library structures l_libs_start: - lib0 l_libs boxlib_name, sys_path, file_name, system_dir0, err_message_found_lib0, head_f_l0, boxlib_import,err_message_import0, head_f_i0 - lib1 l_libs msgbox_name, sys_path, file_name, system_dir1, err_message_found_lib1, head_f_l0, msgbox_lib_import, err_message_import1, head_f_i0 + lib0 l_libs lib0_name, sys_path, file_name, system_dir0, err_message_found_lib0, head_f_l0, boxlib_import,err_message_import0, head_f_i0 + lib1 l_libs lib1_name, sys_path, file_name, system_dir1, err_message_found_lib1, head_f_l0, msgbox_lib_import, err_message_import1, head_f_i0 + lib2 l_libs lib2_name, sys_path, file_name, system_dir2, err_message_found_lib2, head_f_l0, proclib_import, err_message_import2, head_f_i0 load_lib_end: