From b6fd00c4e2c69b2d440752dd6952b04c58420d5b Mon Sep 17 00:00:00 2001 From: IgorA Date: Wed, 4 Aug 2010 11:40:19 +0000 Subject: [PATCH] small update game 'Nu pogodi' and lib 'buf2d.obj' git-svn-id: svn://kolibrios.org@1555 a494cfbc-eb01-0410-851d-a64ba20cac60 --- .../develop/libraries/buf2d/trunk/buf2d.asm | 16 + programs/games/nu_pogodi/trunk/kv_z_zaba.svg | 458 ++++++++++++++++++ programs/games/nu_pogodi/trunk/kv_zaba.png | Bin 0 -> 17155 bytes programs/games/nu_pogodi/trunk/kvaka_za.ini | 6 + programs/games/nu_pogodi/trunk/nu_pogod.asm | 10 +- programs/games/nu_pogodi/trunk/nu_pogod.ini | 1 + 6 files changed, 490 insertions(+), 1 deletion(-) create mode 100644 programs/games/nu_pogodi/trunk/kv_z_zaba.svg create mode 100644 programs/games/nu_pogodi/trunk/kv_zaba.png create mode 100644 programs/games/nu_pogodi/trunk/kvaka_za.ini diff --git a/programs/develop/libraries/buf2d/trunk/buf2d.asm b/programs/develop/libraries/buf2d/trunk/buf2d.asm index 933a9f005c..b7952be317 100644 --- a/programs/develop/libraries/buf2d/trunk/buf2d.asm +++ b/programs/develop/libraries/buf2d/trunk/buf2d.asm @@ -219,6 +219,8 @@ endl mov edx,eax ;ax = colors - r,g shr edx,16 ;dl = color - b mov ecx,buf2d_h + cmp ecx,1 + jle .24no_crop_bottom ;проверяем на случай если высота буфера 1 пиксель mov ebx,buf2d_w imul ecx,ebx lea esi,[ecx+ecx*2] ;esi=3*ecx @@ -262,6 +264,8 @@ endl shr edx,16 ;dl = color - b mov esi,buf2d_data mov ecx,buf2d_h + cmp ecx,1 + jle .24no_crop_top ;проверяем на случай если высота буфера 1 пиксель dec ecx ;при обрезании должна остаться минимум 1-на строка пикселей mov ebx,buf2d_w imul ecx,ebx @@ -306,6 +310,8 @@ endl mov edx,eax ;ax = colors - r,g shr edx,16 ;dl = color - b mov ebx,buf2d_w + cmp ebx,1 + jle .24no_crop_right ;на случай если ширина буфера 1 пиксель lea ebx,[ebx+ebx*2] mov esi,ebx imul esi,buf2d_h @@ -365,6 +371,8 @@ endl mov edx,eax ;ax = colors - r,g shr edx,16 ;dl = color - b mov ebx,buf2d_w + cmp ebx,1 + jle .24no_crop_left ;на случай если ширина буфера 1 пиксель lea ebx,[ebx+ebx*2] mov esi,buf2d_data ;esi - указатель на начоло буфера изображения mov dword[crop_r],0 @@ -430,6 +438,8 @@ endl mov eax,dword[color] mov esi,buf2d_data mov ecx,buf2d_h + cmp ecx,1 + jle .8no_crop_bottom ;проверяем на случай если высота буфера 1 пиксель mov ebx,buf2d_w imul ecx,ebx mov esi,ecx @@ -468,6 +478,8 @@ endl mov eax,dword[color] mov esi,buf2d_data mov ecx,buf2d_h + cmp ecx,1 + jle .8no_crop_top ;проверяем на случай если высота буфера 1 пиксель dec ecx ;при обрезании должна остаться минимум 1-на строка пикселей mov ebx,buf2d_w imul ecx,ebx @@ -507,6 +519,8 @@ endl jae .8no_crop_right mov eax,dword[color] mov ebx,buf2d_w + cmp ebx,1 + jle .8no_crop_right ;на случай если ширина буфера 1 пиксель mov esi,ebx imul esi,buf2d_h add esi,buf2d_data ;esi - указатель на конец буфера изображения @@ -558,6 +572,8 @@ endl jae .8no_crop_left mov eax,dword[color] mov ebx,buf2d_w + cmp ebx,1 + jle .8no_crop_left ;на случай если ширина буфера 1 пиксель mov esi,buf2d_data ;esi - указатель на начоло буфера изображения mov edx,0 cld diff --git a/programs/games/nu_pogodi/trunk/kv_z_zaba.svg b/programs/games/nu_pogodi/trunk/kv_z_zaba.svg new file mode 100644 index 0000000000..209008ffd8 --- /dev/null +++ b/programs/games/nu_pogodi/trunk/kv_z_zaba.svg @@ -0,0 +1,458 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/programs/games/nu_pogodi/trunk/kv_zaba.png b/programs/games/nu_pogodi/trunk/kv_zaba.png new file mode 100644 index 0000000000000000000000000000000000000000..a3fa8db4eb5e9abf3c6613829a8d9d8889ceceef GIT binary patch literal 17155 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 KRIHG<4EbN4m$LZ) literal 0 HcmV?d00001 diff --git a/programs/games/nu_pogodi/trunk/kvaka_za.ini b/programs/games/nu_pogodi/trunk/kvaka_za.ini new file mode 100644 index 0000000000..28665cf322 --- /dev/null +++ b/programs/games/nu_pogodi/trunk/kvaka_za.ini @@ -0,0 +1,6 @@ +[Files] +displ_w=315 +displ_h=210 +file_unit=kv_zaba.png +[Colors] +unit=0,128,0 \ No newline at end of file diff --git a/programs/games/nu_pogodi/trunk/nu_pogod.asm b/programs/games/nu_pogodi/trunk/nu_pogod.asm index 72ca5c8ff2..ada1daafc3 100644 --- a/programs/games/nu_pogodi/trunk/nu_pogod.asm +++ b/programs/games/nu_pogodi/trunk/nu_pogod.asm @@ -66,16 +66,22 @@ BUT1_H equ 20 ; BUT1_NEXT_TOP equ (BUT1_T+BUT1_H)*65536 end if +FILE_NAME_MAX equ 20 ;максимальная длинна имени файла (без папок, относительно текущей) +;значения имен по умолчанию +ini_def_unit_file db 'wolf.png',0 +;имена файлов fn_icon0 db 'curici.png',0 ;имя файла с декорациями -fn_icon1 db 'wolf.png',0 ;имя файла с волком и зайцем +fn_icon1 rb FILE_NAME_MAX ;имя файла с волком и зайцем fn_icon2 db 'eggs.png',0 ;имя файла с яйцами fn_icon3 db 'chi.png',0 ;имя файла с циплятами fn_font db 'font8x9.bmp',0 ini_name db 'nu_pogod.ini',0 ini_sec_files db 'Files',0 +key_file_unit db 'file_unit',0 key_displ_w db 'displ_w',0 key_displ_h db 'displ_h',0 + ini_sec_color db 'Colors',0 key_color_unit db 'unit',0 @@ -606,6 +612,8 @@ start: mov dword[displ_h],eax stdcall dword[ini_get_color],file_name,ini_sec_color,key_color_unit,0 mov dword[color_wolf],eax + stdcall dword[ini_get_str],file_name,ini_sec_files,key_file_unit,fn_icon1,FILE_NAME_MAX,ini_def_unit_file + mov edx,dword[displ_w] imul edx,dword[displ_h] diff --git a/programs/games/nu_pogodi/trunk/nu_pogod.ini b/programs/games/nu_pogodi/trunk/nu_pogod.ini index 0fb968746f..ca5c9a46a1 100644 --- a/programs/games/nu_pogodi/trunk/nu_pogod.ini +++ b/programs/games/nu_pogodi/trunk/nu_pogod.ini @@ -1,5 +1,6 @@ [Files] displ_w=315 displ_h=210 +file_unit=wolf.png [Colors] unit=128,0,0 \ No newline at end of file