Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 6237 → Rev 6238

/programs/other/planet_v/tile_fun.inc
253,7 → 253,7
mov esi,[sc.work_text]
or esi,0x40000000
mov edi,[sc.work]
mcall 47,0x20000,, (128 shl 16)+13
mcall SF_DRAW_NUMBER,0x20000,, (128 shl 16)+13
 
stdcall array_tile_function, tile_00,max_tiles_count,draw_tile
popad
267,8 → 267,6
align 4
proc tile_clear_area, height:dword
pushad
mov eax,13 ;draw rect
 
mov cx,dx
shl ecx,16
mov cx,word[height]
279,12 → 277,12
mov bx,TILE_LEN_W
 
mov edx,0xffffd0
int 0x40
mcall SF_DRAW_RECT
popad
ret
endp
 
;???
;­ à¨á®¢ âì ®¤¨­ tile
align 4
proc draw_tile, tile:dword
pushad
292,12 → 290,10
 
;*** set base point ***
mov edx,5*65536+35
xor eax,eax
mov al,tile_delta_y
movzx eax,tile_delta_y
shl ax,8 ;*256
add edx,eax
xor eax,eax
mov al,tile_delta_x
movzx eax,tile_delta_x
shl eax,8+16
add edx,eax
;*** set base point ***
310,7 → 306,7
jg .end_f
 
;¯à®¢¥à塞 ¢« §¨â «¨ ª à⨭ª  ¯® ®á¨ y
mcall 48,4 ;eax = ¢ëá®â  ᪨­ 
mcall SF_STYLE_SETTINGS,SSF_GET_SKIN_HEIGHT ;eax = ¢ëá®â  ᪨­ 
mov ecx,dword[procinfo.box.height]
mov ebx,edx
and ebx,0xffff ;ebx = ª®®à¤¨­ â  'y' ¤«ï ¢ë¢®¤  â ©« 
326,7 → 322,7
mov ecx,TILE_LEN_H
@@:
 
mov eax,7
mov eax,SF_PUT_IMAGE
bt tile_drobn,SCALE_0BIT_USE
jc .draw
bt tile_drobn,SCALE_1BIT_USE
386,16 → 382,13
xchg cx,si
int 0x40
@@:
jmp .end_f
 
jmp .end_f
.info: ;¢ë¢®¤ ¨­ä®à¬ æ¨¨, ¯à¨ ­¥ 㤠筮¬ ®âªàë⨨ ª à⨭®ª
 
;;;jmp .end_f ;test
bt tile_drobn,SCALE_0BIT_USE
jc .end_f
bt tile_drobn,SCALE_1BIT_USE
jc .end_f
 
mov ebx,edx
add ebx,0x30003
mov edx,tile_rgb_icon ;¯à¨ ­¥ã¤ ç­®¬ ®âªàë⨨ ¢ tile_rgb_icon ¯ãâì ª ä ©«ã
403,7 → 396,7
stdcall [str_len],tile_rgb_icon,RGB_TILE_SIZE_1N4
mov edi,eax
 
mov eax,4 ;draw text
mov eax,SF_DRAW_TEXT
mov ecx,0xff
;or ecx,0x80000000
mov esi,TILE_TEXT_MAX_LEN
460,13 → 453,13
inc eax ;¤«ï § ¯¨á¨ ¢ ä ©« § ¢¥àè î饣® ­ã«ï
 
m2m [run_file_70.Buffer], [bmp_icon]
mov [run_file_70.Function], 2
mov [run_file_70.Function], SSF_CREATE_FILE
mov [run_file_70.Position], 0
mov [run_file_70.Flags], 0
mov [run_file_70.Count], eax
mov byte[run_file_70+20], 0
mov [run_file_70.FileName], file_name
mcall 70,run_file_70
mcall SF_FILE,run_file_70
pop edi ecx ebx eax
jmp still
 
478,7 → 471,7
copy_path fn_metki,sys_path,file_name,0
pushad
mov byte[met_fr_opn],1
mov [run_file_70.Function], 0
mov [run_file_70.Function], SSF_READ_FILE
mov [run_file_70.Position], 0
mov [run_file_70.Flags], 0
mov [run_file_70.Count], TREE_ICON_SYS16_BMP_SIZE
485,7 → 478,7
mov byte[run_file_70+20], 0
mov [run_file_70.FileName], file_name
m2m [run_file_70.Buffer], [bmp_icon]
mcall 70,run_file_70
mcall SF_FILE,run_file_70
cmp ebx,0xffffffff
je @f
stdcall [tl_load_mem], tree2,0,[bmp_icon],TREE_ICON_SYS16_BMP_SIZE
527,7 → 520,7
pop eax
ret
 
;???
;®¡­®¢¨âì ª àâã
align 4
but_Refresh:
call fun_new_map_type ;¯à®¢¥à塞 ­¥ ¯®¬¥­ï«áï «¨ ⨯ ¯à®á¬ âਢ ¥¬ëå ä ©«®¢
561,8 → 554,7
mov edi,dword[tile] ;ª®¯¨à㥬 㪠§ â¥«ì ­  áâàãªâãàã â ©« , çâ®-¡ë à ¡®â «¨ ª®­áâ ­âë
 
stdcall mem_copy, map,edi, 9 ;ª®¯¨à㥬 ª®®à¤¨­ âë ªãàá®à  ¢ áâàãªâãàã â ©« 
xor eax,eax
mov al,tile_delta_x
movzx eax,tile_delta_x
add tile_coord_x,eax ;ᤢ¨£ ¥¬ ª®®à¤¨­ âë â ©« , ®â­®á¨â¥«ì­® ªãàá®à 
mov al,tile_delta_y
add tile_coord_y,eax
693,8 → 685,7
;­¥ §­ ¥¬ ¡ë« -«¨ ¢ª«î祭  ®¯æ¨ï '¡à âì á­¨§ã', ¤«ï ª®â®à®© ¨§¬¥­ï«¨áì ª®®à¤¨­ âë
;¯®â®¬ã ®¯ïâì ª®¯¨à㥬 ª®®à¤¨­ âë ªãàá®à  ¢ áâàãªâãàã â ©« 
stdcall mem_copy, map,edi, 9
xor eax,eax
mov al,tile_delta_x
movzx eax,tile_delta_x
add tile_coord_x,eax ;ᤢ¨£ ¥¬ ª®®à¤¨­ âë â ©« , ®â­®á¨â¥«ì­® ªãàá®à 
mov al,tile_delta_y
add tile_coord_y,eax
760,7 → 751,7
proc load_new_tile, tile:dword
pushad
 
mov [run_file_70.Function], 0
mov [run_file_70.Function], SSF_READ_FILE
mov [run_file_70.Position], 0
mov [run_file_70.Flags], 0
mov [run_file_70.Count], RGB_TILE_SIZE+300 ;+54
767,7 → 758,7
m2m [run_file_70.Buffer], [bmp_icon]
mov byte[run_file_70+20], 0
mov [run_file_70.FileName], file_name
mcall 70,run_file_70
mcall SF_FILE,run_file_70
mov edi,[tile]
; cmp ebx,0xffffffff
; je .no_load
812,11 → 803,10
inc edi
loop @b
 
mov esi,dword[tile] ;¡¥à¥¬ 㪠§ â¥«ì
mov esi,[tile] ;¡¥à¥¬ 㪠§ â¥«ì
 
mov ecx,0x80000000 ;rol 0x80000000,1 = 1
xor eax,eax
mov al,byte[esi+8] ;+8 = zoom
movzx eax,byte[esi+8] ;+8 = zoom
.calc_coord:
rol ecx,1 ;ecx = maximum coord
dec ax
826,8 → 816,7
mov byte[txt_tile_path],'z'
mov edi,txt_tile_path
inc edi
xor eax,eax
mov al,byte[esi+8] ;+8 = zoom
movzx eax,byte[esi+8] ;+8 = zoom
stdcall convert_int_to_str, 300
 
inc edi
894,11 → 883,11
 
align 4
get_all_path: ;äã­ªæ¨ï ¤«ï ᮡ¨à ­¨ï ¯®«­®£® ¯ã⨠¨§ ¢á¥å ªã᪮¢
mov ecx,dword[edit1.text]
add ecx,dword[edit1.size]
mov ecx,[edit1.text]
add ecx,[edit1.size]
dec ecx
 
stdcall [str_copy], file_name,4096-1, dword[edit1.text],dword[edit1.max]
stdcall [str_copy], file_name,4096-1, [edit1.text],[edit1.max]
 
cmp byte[ecx],'/'
je @f
906,5 → 895,5
@@:
 
stdcall [str_cat], file_name,4096-1, txt_tile_path,300
stdcall [str_cat], file_name,4096-1, dword [txt_tile_type],10
stdcall [str_cat], file_name,4096-1, [txt_tile_type],10
ret