WebSVN – Kolibri OS – Diff – /programs/games/life3/trunk/life3.asm

 use32
-	org 0x0
+	org 0
-	db 'MENUET01' ;¨¤¥â¨ä. ¨á¯®«ï¥¬®£® ä ©«  ¢á¥£¤  8 ¡ ©â
-	dd 0x1
+	db 'MENUET01'
-	dd start
-	dd i_end ;à §¬¥à ¯à¨«®¦¥¨ï
+	dd 1,start,i_end,mem,stacktop,0,sys_path
-	dd mem
-	dd stacktop
-	dd 0
-	dd sys_path
 include '../../../macros.inc'
+include '../../../proc32.inc'
+include '../../../KOSfuncs.inc'
-include '../../../proc32.inc'
+include '../../../load_img.inc'
-include '../../../develop/libraries/box_lib/load_lib.mac'
-include '../../../dll.inc'
+include '../../../develop/libraries/box_lib/load_lib.mac'
-@use_library_mem mem.Alloc,mem.Free,mem.ReAlloc,dll.Load
-hed db 'Life 05.09.14',0 ;¯®¤¯¨áì ®ª
-struct FileInfoBlock
-	Function dd ?
-	Position dd ?
-	Flags	 dd ?
-	Count	 dd ?
-	Buffer	 dd ?
-		db ?
-	FileName dd ?
+@use_library_mem mem.Alloc,mem.Free,mem.ReAlloc,dll.Load
-ends
+hed db 'Life 31.10.18',0 ;¯®¤¯¨áì ®ª
 run_file_70 FileInfoBlock
-image_data dd 0 ;ãª § â¥«ì   ¢à¥¬¥ãî ¯ ¬ïâì. ¤«ï ã¦¥ ¯à¥®¡à §®¢ ¨ï ¨§®¡à ¦¥¨ï
 run_file_70 FileInfoBlock
-fn_toolbar db 'toolbar.png',0
-IMAGE_TOOLBAR_ICON_SIZE equ 16*16*3
-IMAGE_TOOLBAR_SIZE equ IMAGE_TOOLBAR_ICON_SIZE*9
-image_data_toolbar dd 0
-macro load_image_file path,buf,size { ;¬ ªà®á ¤«ï § £àã§ª¨ ¨§®¡à ¦¥¨©
-	;path - ¬®¦¥â ¡ëâì ¯¥à¥¬¥®© ¨«¨ áâà®ª®¢ë¬ ¯ à ¬¥âà®¬
-	if path eqtype '' ;¯à®¢¥àï¥¬ § ¤  «¨ áâà®ª®© ¯ à ¬¥âà path
-		jmp @f
-			local .path_str
-			.path_str db path ;ä®à¬¨àã¥¬ «®ª «ìãî ¯¥à¥¬¥ãî
-			db 0
-		@@:
-		;32 - áâ ¤ àâë©  ¤à¥á ¯® ª®â®à®¬ã ¤®«¦¥ ¡ëâì ¡ãä¥à á á¨áâ¥¬ë¬ ¯ãâ¥¬
-		copy_path .path_str,[32],file_name,0x0
-	else
-		copy_path path,[32],file_name,0x0 ;ä®à¬¨àã¥¬ ¯®«ë© ¯ãâì ª ä ©«ã ¨§®¡à ¦¥¨ï, ¯®¤à §ã¬¥¢ ¥¬ çâ® ® ¢ ®¤®© ¯ ¯ª¥ á ¯à®£à ¬¬®©
-	end if
-	stdcall mem.Alloc, dword size ;¢ë¤¥«ï¥¬ ¯ ¬ïâì ¤«ï ¨§®¡à ¦¥¨ï
-	mov [buf],eax
-	mov eax,70 ;70-ï äãªæ¨ï à ¡®â  á ä ©« ¬¨
-	mov [run_file_70.Function], 0
-	mov [run_file_70.Position], 0
-	mov [run_file_70.Flags], 0
-	mov [run_file_70.Count], dword size
-	m2m [run_file_70.Buffer], [buf]
-	mov byte[run_file_70+20], 0
-	mov [run_file_70.FileName], file_name
-	mov ebx,run_file_70
-	int 0x40 ;§ £àã¦ ¥¬ ä ©« ¨§®¡à ¦¥¨ï
-	cmp ebx,0xffffffff
-	je @f
-		;®¯à¥¤¥«ï¥¬ ¢¨¤ ¨§®¡à ¦¥¨ï ¨ ¯¥à¥¢®¤¨¬ ¥£® ¢® ¢à¥¬¥ë© ¡ãä¥à image_data
-		stdcall dword[img_decode], dword[buf],ebx,0
-		mov dword[image_data],eax
-		;¯à¥®¡à §ã¥¬ ¨§®¡à ¦¥¨¥ ª ä®à¬ âã rgb
-		stdcall dword[img_to_rgb2], dword[image_data],dword[buf]
+image_data dd 0 ;ãª § â¥«ì   ¢à¥¬¥ãî ¯ ¬ïâì. ¤«ï ã¦¥ ¯à¥®¡à §®¢ ¨ï ¨§®¡à ¦¥¨ï
 		;ã¤ «ï¥¬ ¢à¥¬¥ë© ¡ãä¥à image_data
-		stdcall dword[img_destroy], dword[image_data]
+IMAGE_TOOLBAR_ICON_SIZE equ 16*16*3
-	@@:
+image_data_toolbar dd 0
-}
 ;--------------------------------------
 struct Cell
 	x dd ? ;+0
 	y dd ? ;+4
-	tc dd ? ;+8
+	tc  dd ? ;+8 ¯®ª®«¥¨¥ ¢ ª®â®à®¬ à®¤¨« áì ®á®¡ì
-	liv db ? ;+12
+	liv db ? ;+12 ¦¨¢ ï ïç¥©ª  ¨«¨ ¥â
-	so db ? ;+13
+	so  db ? ;+13 ç¨á«® á®á¥¤¥©
 	mov reg,ind
 	imul reg,sizeof.Cell
 	add reg,dword[cell]
+}
 capt rb 50
 er_oom db 0 ;  á«ãç © ¨áç¥à¯ ¨ï ¯ ¬ïâ¨
 tim_ch db 0 ; ¢â®¬ â¨ç¥áª¨ ¯à®áç¨âë¢ âì ¯®ª®«¥¨ï
 poc_stop dd 1 ;¯à®áç¥â   ç¨á«® ¯®ª®«¥¨©
 Cor_x dd 0
 ; col_pole - æ¢¥â ¯®«ï
 ; col_cell_n - æ¢¥â ®¢®© ïç¥©ª¨
 ; col_cell_o - æ¢¥â áâ à®© ïç¥©ª¨
 align 4
 proc pole_init_colors uses eax ebx ecx edx esi edi, col_pole:dword, col_cell_n:dword, col_cell_o:dword
-	mov esi,dword[CellColors]
+	mov esi,[CellColors]
-	mov ebx,dword[col_pole]
+	mov ebx,[col_pole]
 	mov dword[esi],ebx
 	add esi,4
 	mov edi,COL_MEM
 	dec edi
 	shl edi,2
 	add edi,esi
 	; esi - ãª § â¥«ì   1-© £à ¤¨¥âë© æ¢¥â
 	; edi - ãª § â¥«ì   ¯®á«¥¤¨© £à ¤¨¥âë© æ¢¥â
-	mov eax,dword[col_cell_n]
+	mov eax,[col_cell_n]
-	mov ebx,dword[col_cell_o]
+	mov ebx,[col_cell_o]
 	mov dword[esi],eax
 	mov dword[edi],ebx
 ; eax - æ¢¥â  ç «ìë©
 ; ebx - æ¢¥â ª®¥çë©
 ;§ §àãè îâìáï: ecx, edx
 align 4
 proc middle_colors uses edi esi, i0:dword, i1:dword
-	mov esi,dword[i0]
+	mov esi,[i0]
-	mov edi,dword[i1]
+	mov edi,[i1]
 	;¯¥à¥¤ ¢ë§®¢®¬ äãªæ¨¨
 	;dword[esi]=eax
 	;dword[edi]=ebx
 	sub edi,esi
 	shr edi,1
 	@@:
 	ret
 endp
-align 4
-pole_clear:
+align 4
-	push eax ecx edi
+proc pole_clear uses eax ecx edi
 	xor eax,eax
 	mov dword[tim],eax
 	mov dword[osob],eax
 	mov  byte[tim_ch],al
 	mov dword[Cor_x],eax
 	mov dword[Cor_y],eax
 	mov dword[b_sort],eax
 	mov  byte[er_oom],al
-	cld
-	mov ecx,MAX_CELL
+	cld
-	imul ecx,sizeof.Cell
+	mov ecx,(MAX_CELL*sizeof.Cell)/4
-	mov edi,dword[cell]
+	mov edi,[cell]
-	repne stosb ;memset(cell,0,sizeof(Cell)*MAX_CELL);
+	rep stosd ;memset(cell,0,sizeof(Cell)*MAX_CELL);
-	mov edi,dword[memCell]
+	mov edi,[memCell]
 	mov ecx,MAX_CELL
 	@@:
-		stosd ;for(i=0;i
-		;mov dword[edi],eax
-		;add edi,4
+		stosd ;for(i=0;i
 		inc eax
-		loop @b
-	pop edi ecx eax
+		loop @b
 	ret
 endp
 align 4
 proc pole_cell_creat, x:dword, y:dword, li:dword
 	pushad ;eax ebx ecx edx edi
 		jmp .fun_e
 	@@:
 	; *** á®§¤ ¨¥ ®¢®© ïç¥©ª¨
 	;  å®¤¨¬ ®¬¥à á¢®¡®¤®© ïç¥©ª¨ (i) ¤«ï ¤®¡ ¢«¥¨ï ®¢®©
-	mov edi,dword[memCell]
+	mov edi,[memCell]
 	inc dword[edi]
 	cmp dword[edi],MAX_CELL
 	jne @f
 		dec dword[edi]
 		mov byte[tim_ch],0
 		;... need call message: "eror out of memory" ...
 		;... ¢ë¢®¤ á®®¡é¥¨ï ¯¥à¥¯®«¥¨ï  ¤® ¤®¡ ¢¨âì  ...
 		mov byte[er_oom],0
 		jmp .fun_e ;return;
 	@@:
-	mov eax,dword[edi]
+	mov eax,[edi]
 	shl eax,2
-	add eax,dword[memCell] ;eax -> memCell[firstC]
+	add eax,[memCell] ;eax -> memCell[firstC]
-	get_cell_offset ebx,dword[eax]
+	get_cell_offset ebx,[eax]
-	mov ecx,dword[x]
+	mov ecx,[x]
 	mov dword[ebx],ecx ;+0 = .x
-	mov edx,dword[y]
+	mov edx,[y]
 	mov dword[ebx+4],edx ;+4 = .y
-	mov eax,dword[tim]
+	mov eax,[tim]
 	mov dword[ebx+8],eax ;+8 = .tc
 	mov byte[ebx+12],0 ;+12 = .liv
 	mov byte[ebx+13],0 ;+13 = .so
 	.creat_border_cells:
 		inc dword[osob]
 		or byte[ebx+12],1 ;+12 = .liv
-		mov ecx,dword[x]
+		mov ecx,[x]
 		dec ecx
-		mov edx,dword[y]
+		mov edx,[y]
 		dec edx
 		stdcall pole_cell_creat,ecx,edx,0
 		inc edx
 		stdcall pole_cell_creat,ecx,edx,0
 ;output:
 ; eax - index
 align 4
 proc pole_cell_find, x:dword, y:dword
-	mov eax,dword[memCell]
+	mov eax,[memCell]
 	cmp dword[eax],0
 	jne @f
 		xor eax,eax ;if(!fristC) return 0;
 		jmp .fun_e
 	je @f
 		stdcall pole_bin_find, [memCell], [x],[y], [b_sort] ;i=BinFind(memCell, x,y, b_sort);
 		cmp eax,0
 		je @f
 			shl eax,2
-			add eax,dword[memCell]
+			add eax,[memCell]
-			mov eax,dword[eax] ;if(i) fnd=memCell[i];
+			mov eax,[eax] ;if(i) fnd=memCell[i];
 			jmp .fun_e
 	@@:
 	cmp eax,0
 	jne @f ;if(!fnd){ // ¯®¨áª ïç¥©ª¨ §  ¡¨ àë¬ ¤¥à¥¢®¬
 		push ebx ecx edx edi esi
 		;ebx -> i
 		;ecx -> firstC
 		;edx -> &memCell[i]
 		;edi -> cell[memCell[i]]
-		mov ecx,dword[memCell]
+		mov ecx,[memCell]
-		mov ebx,dword[b_sort]
+		mov ebx,[b_sort]
 		mov edx,ebx
 		shl edx,2
 		add edx,ecx
-		mov ecx,dword[ecx]
+		mov ecx,[ecx]
 		.cycle_b: ;for(i=b_sort+1;i<=fristC;i++)
 			inc ebx
 			cmp ebx,ecx
 			jg .cycle_e
 			add edx,4
-			get_cell_offset edi,dword[edx]
+			get_cell_offset edi,[edx]
-			mov esi,dword[x]
+			mov esi,[x]
 			cmp dword[edi],esi ;+0 = .x
 			jne .if_e
-			mov esi,dword[y]
+			mov esi,[y]
 			cmp dword[edi+4],esi ;+4 = .y
 			jne .if_e
 				;if(cell[memCell[i]].x==x && cell[memCell[i]].y==y){
-				mov eax,dword[edx] ;fnd=memCell[i];
+				mov eax,[edx] ;fnd=memCell[i];
 				jmp .cycle_e ;break;
 			.if_e:
 			jmp .cycle_b
 		.cycle_e:
 	.cycle_b: ;do{
 		shr ebx,1 ;por>>=1;
 		mov edi,ecx
 		shl edi,2
-		add edi,dword[mas]
+		add edi,[mas]
 		;if(compare_cells_mb(mas[i],fx,fy)){
 		stdcall pole_compare_cells_mb_coords, dword[edi],[fx],[fy]
 		cmp dl,0
 		je .if_u0_e
 			@@: ;while(i+por>k)
 			mov edx,ecx
 			add edx,ebx
-			cmp edx,dword[k] ;i+por>k
+			cmp edx,[k] ;i+por>k
 			jle @f
 				shr ebx,1 ;por>>=1;
 				jmp @b
 			@@:
 align 4
 proc pole_compare_cells_bm_coords, i0:dword, fx:dword, fy:dword
 	push eax ebx ecx
 	get_cell_offset eax,[i0]
 	;eax -> cell[i0]
-	mov ebx,dword[fx]
+	mov ebx,[fx]
 	cmp dword[eax],ebx
 	jle @f
 		mov dl,1
 		jmp .fun_e
 	@@:
-	mov ecx,dword[fy]
+	mov ecx,[fy]
 	cmp dword[eax+4],ecx
 	jle @f
 	cmp dword[eax],ebx
 	jne @f
 		mov dl,1
 align 4
 proc pole_compare_cells_mb_coords, i0:dword, fx:dword, fy:dword
 	push eax ebx ecx
 	get_cell_offset eax,[i0]
 	;eax -> cell[i0]
-	mov ebx,dword[fx]
+	mov ebx,[fx]
 	cmp dword[eax],ebx
 	jge @f
 		mov dl,1
 		jmp .fun_e
 	@@:
-	mov ecx,dword[fy]
+	mov ecx,[fy]
 	cmp dword[eax+4],ecx
 	jge @f
 	cmp dword[eax],ebx
 	jne @f
 		mov dl,1
 align 4
 proc pole_compare_cells_bm, i0:dword, i1:dword
 	push eax ebx ecx
 	get_cell_offset eax,[i0] ;eax -> cell[i0]
 	get_cell_offset ebx,[i1] ;ebx -> cell[i1]
-	mov ecx,dword[ebx] ;+0 = .x
+	mov ecx,[ebx] ;+0 = .x
 	cmp dword[eax],ecx
 	jle @f ;x0>x1
 		mov dl,1
 		jmp .fun_e
 	@@:
 	jne @f ;x0==x1
-	mov ecx,dword[ebx+4] ;+4 = .y
+	mov ecx,[ebx+4] ;+4 = .y
 	cmp dword[eax+4],ecx
 	jle @f ;y0>y1
 		mov dl,1
 		jmp .fun_e
 	@@:
 	;ebx -> i
 	;ecx -> cell[memCell[i]]
 	;edx -> color
 	;edi -> coord_x
 	;esi -> coord_y
-	mov eax,dword[memCell]
+	mov eax,[memCell]
 	cmp dword[eax],0
 	je .no_draw
-	mov eax,dword[eax]
+	mov eax,[eax]
 	mov ebx,1
 ;---
 	@@: ;while(i
-		cmp ebx,dword[b_sort]
+		cmp ebx,[b_sort]
 		jge @f ;¯¥à¥å®¤¨¬    ç «® ¨¦¥£® æ¨ª«
 		mov ecx,ebx
 		shl ecx,2
-		add ecx,dword[memCell]
+		add ecx,[memCell]
-		get_cell_offset ecx,dword[ecx]
+		get_cell_offset ecx,[ecx]
-		mov edx,dword[ecx] ;+0 = .x
+		mov edx,[ecx] ;+0 = .x
-		add edx,dword[Cor_x]
+		add edx,[Cor_x]
 		cmp edx,0
 		jge @f ;¯¥à¥å®¤¨¬    ç «® ¨¦¥£® æ¨ª«
 			inc ebx ;i++; // ¤«ï ¯à®¯ãáª  ïç¥¥ª §  ®ª®¬ á«¥¢
 	cmp byte[zoom],2
 	jge .zoom2
 	@@: ;for(;i<=fristC;i++){
 		mov ecx,ebx
 		shl ecx,2
-		add ecx,dword[memCell]
+		add ecx,[memCell]
-		get_cell_offset ecx,dword[ecx]
+		get_cell_offset ecx,[ecx]
 ;...
-		mov edi,dword[Cor_x]
+		mov edi,[Cor_x]
-		add edi,dword[ecx] ;+0 = .x
+		add edi,[ecx] ;+0 = .x
-		mov esi,dword[Cor_y]
+		mov esi,[Cor_y]
-		add esi,dword[ecx+4] ;+4 = .y
+		add esi,[ecx+4] ;+4 = .y
 		bt word[ecx+12],0 ;+12 = .liv
 		jc .cell_1
 			;¥ ¦¨¢ ï ïç¥©ª
-			mov edx,dword[CellColors]
+			mov edx,[CellColors]
-			mov edx,dword[edx]
+			mov edx,[edx]
 			jmp .cell_0
 		.cell_1:
 			;¦¨¢ ï ïç¥©ª
-			mov edx,dword[tim]
+			mov edx,[tim]
 			inc edx
-			sub edx,dword[ecx+8] ;+8 = .tc
+			sub edx,[ecx+8] ;+8 = .tc
 			cmp edx,COL_MEM
 			jle .in_color
 				mov edx,COL_MEM
 			.in_color:
 			shl edx,2
-			add edx,dword[CellColors]
+			add edx,[CellColors]
-			mov edx,dword[edx]
+			mov edx,[edx]
 		.cell_0:
 		stdcall [buf2d_set_pixel], buf_0, edi, esi, edx
 ;...
 		inc ebx
 		cmp ebx,eax
 	.zoom2:
 	@@: ;for(;i<=fristC;i++){
 		mov ecx,ebx
 		shl ecx,2
-		add ecx,dword[memCell]
+		add ecx,[memCell]
-		get_cell_offset ecx,dword[ecx]
+		get_cell_offset ecx,[ecx]
 		xor edx,edx
 		mov dl,byte[zoom] ;edx ¨á¯®«ì§ã¥âáï ¤«ï ¢¥á¥¨ï zoom ¢ 4 ¡ ©â®¥ ç¨á«®
-		mov edi,dword[ecx] ;+0 = .x
+		mov edi,[ecx] ;+0 = .x
-		add edi,dword[Cor_x]
+		add edi,[Cor_x]
 		imul edi,edx
-		mov esi,dword[ecx+4] ;+4 = .y
+		mov esi,[ecx+4] ;+4 = .y
-		add esi,dword[Cor_y]
+		add esi,[Cor_y]
 		imul esi,edx
 		bt word[ecx+12],0 ;+12 = .liv
 		jc .z2_cell_1
 			;¥ ¦¨¢ ï ïç¥©ª
-			mov edx,dword[CellColors]
+			mov edx,[CellColors]
-			mov edx,dword[edx]
+			mov edx,[edx]
 			jmp .z2_cell_0
 		.z2_cell_1:
 			;¦¨¢ ï ïç¥©ª
-			mov edx,dword[tim]
+			mov edx,[tim]
 			inc edx
-			sub edx,dword[ecx+8] ;+8 = .tc
+			sub edx,[ecx+8] ;+8 = .tc
 			cmp edx,COL_MEM
 			jle .z2_in_color
 				mov edx,COL_MEM
 			.z2_in_color:
 			shl edx,2
-			add edx,dword[CellColors]
+			add edx,[CellColors]
-			mov edx,dword[edx]
+			mov edx,[edx]
 		.z2_cell_0:
 		xor ecx,ecx
 		mov cl,byte[zoom] ;ecx ¨á¯®«ì§ã¥âáï ¤«ï ¢¥á¥¨ï zoom ¢ 4 ¡ ©â®¥ ç¨á«®
 	;eax -> firstC
 	;ebx -> i
 	;ecx -> &memCell[i]
 	;edx -> cell[memCell[i]]
-	mov eax,dword[memCell]
+	mov eax,[memCell]
 	mov ecx,eax
-	mov eax,dword[eax]
+	mov eax,[eax]
 	cmp eax,1
 	jl .fun_e
 	inc dword[tim]
 	mov ebx,1
 	@@: ;for(i=1;i<=firstC;i++)
 		add ecx,4
-		get_cell_offset edx,dword[ecx]
+		get_cell_offset edx,[ecx]
 		bt word[edx+12],0 ;+12 = .liv
 		jae .if_0_e
 			; á®åà ¥¨¥ ïç¥©ª¨ (á®á¥¤¥© 2 ¨«¨ 3)
 			cmp byte[edx+13],2 ;+13 = .so
 				jmp .if_2_e
 		.if_1_e:
 			; ã¤ «¥¨¥ ¯ãáâ®© ïç¥©ª¨ ¤«ï ®á¢®¡®¦¤¥¨ï ¯ ¬ïâ¨
 			cmp byte[edx+13],0 ;+13 = .so
 			jne .if_2_e
-			mov edi,dword[edx+8] ;+8 = .tc
+			mov edi,[edx+8] ;+8 = .tc
 			add edi,5 ; 5 - ¢à¥¬ï á®åà ¥¨ï ¯ãáâ®© ïç¥©ª¨, ¤® ¥ñ ã¤ «¥¨ï
-			cmp edi,dword[tim]
+			cmp edi,[tim]
 			jge .if_2_e
 				mov edi,eax
 				shl edi,2
-				add edi,dword[memCell] ;edi -> &memCell[fristC]
+				add edi,[memCell] ;edi -> &memCell[fristC]
-				mov esi,dword[edi] ;swp=memCell[fristC];
+				mov esi,[edi] ;swp=memCell[fristC];
-				mov edx,dword[ecx] ;edx - ã¦¥ ¥ ¨á¯®«ì§ã¥¬, ¯®â®¬ã ¬®¦¥¬ ¯®àâ¨âì
+				mov edx,[ecx] ;edx - ã¦¥ ¥ ¨á¯®«ì§ã¥¬, ¯®â®¬ã ¬®¦¥¬ ¯®àâ¨âì
 				mov dword[edi],edx ;memCell[fristC]=memCell[i];
 				mov dword[ecx],esi ;memCell[i]=swp;
 				dec eax
 				dec ebx
 				sub ecx,4
 		.if_2_e:
 		inc ebx
 		cmp ebx,eax
 		jle @b
-	mov ebx,dword[memCell]
+	mov ebx,[memCell]
 	mov dword[ebx],eax ;firstC <- eax
 	mov dword[b_sort],eax
 	stdcall pole_fl_sort, dword[memCell],eax
-	mov ecx,dword[memCell]
+	mov ecx,[memCell]
 	mov ebx,1
 	@@: ;for(i=1;i<=firstC;i++)
 		add ecx,4
-		get_cell_offset edx,dword[ecx]
+		get_cell_offset edx,[ecx]
 		bt word[edx+12],1 ;+12 = .liv
 		jae .no_change
 			xor byte[edx+12],3 ;+12 = .liv
-			mov edi,dword[tim]
+			mov edi,[tim]
 			mov dword[edx+8],edi ;+8 = .tc
 			bt word[edx+12],0 ;+12 = .liv
 			jc .new_cell
 				push eax
-				mov edi,dword[edx]
+				mov edi,[edx]
 				dec edi
-				mov esi,dword[edx+4]
+				mov esi,[edx+4]
 				dec esi
 				dec dword[osob]
 				dec byte[edx+13] ;+13 = .so
 				pop eax
 				jmp .no_change
 			.new_cell: ; ¯®ï¢¨« áì ®¢ ï ïç¥©ª
 				inc dword[osob]
-				mov edi,dword[edx]
+				mov edi,[edx]
 				dec edi
-				mov esi,dword[edx+4]
+				mov esi,[edx+4]
 				dec esi
 				stdcall pole_cell_creat,edi,esi,0
 				inc esi
 				stdcall pole_cell_creat,edi,esi,0
 				inc esi
 ;®àâ¨à®¢ª  ¢¥ªâ®à  a[1..n] ¬¥â®¤®¬ «®©¤
 align 4
 proc pole_fl_sort, a:dword, n:dword
 	pushad
-	mov ecx,dword[a]
+	mov ecx,[a]
 	;®à¬¨à®¢ âì ¨áå®¤®¥ ç áâ¨ç® ã¯®àï¤®ç¥®¥ ¤¥à¥¢®
-	mov eax,dword[n]
+	mov eax,[n]
 	shr eax,1
 	@@: ;for(i=n>>1; i>=2; i--)
 		stdcall pole_fl_surface, ecx,eax,[n] ;(a,i,n)
 		dec eax
 		cmp eax,2
 		jge @b
 	;ë¯®«¨âì ¯à®æ¥¤ãàã ¢á¯«ëâ¨ï «®©¤  ¤«ï ª ¦¤®£® ¯®¤¤¥à¥¢
-	mov eax,dword[n]
+	mov eax,[n]
 	@@: ;for(i=n; i>=2; i--){
 		stdcall pole_fl_surface, ecx,1,eax ;(a,1,i)
 		;®¬¥áâ¨âì  ©¤¥ë© ¬ ªá¨¬ «ìë© í«¥¬¥â ¢ ª®¥æ á¯¨áª
 		mov edi,eax
 		shl edi,2
 		add edi,ecx ;edi -> &a[i]
-		mov esi,dword[edi] ;w=a[i];
+		mov esi,[edi] ;w=a[i];
-		mov edx,dword[ecx+4]
+		mov edx,[ecx+4]
 		mov dword[edi],edx ;a[i]=a[1];
 		mov dword[ecx+4],esi ;a[1]=w;
 endl
 	pushad
 	;edx -> ...
 	;edi -> m
 	;esi -> j
-	mov eax,dword[a]
+	mov eax,[a]
-	mov ebx,dword[i]
+	mov ebx,[i]
-	mov ecx,dword[k]
+	mov ecx,[k]
 	mov edx,ebx
 	shl edx,2
 	add edx,eax
-	mov edx,dword[edx]
+	mov edx,[edx]
 	mov dword[copy],edx ;copy=a[i];
 	mov edi,ebx
 	shl edi,1 ;m=i<<1;
 	.cycle_b: ;while (m<=k) {
 	.cycle_e:
 	;§ ç¥¨ï ¬®£¨å à¥£¨áâà®¢ ã¦¥ ¥ ¢ ¦ë â. ª. ª®¥æ äãªæ¨¨
 	shl ebx,2
 	add eax,ebx
-	mov edx,dword[copy]
+	mov edx,[copy]
 	mov dword[eax],edx ;a[i]=copy;
 	popad
 	load_libraries l_libs_start,l_libs_end
 	;¯à®¢¥àª    áª®«ìª® ã¤ ç® § £ã§¨« áì  è  «¨¡
 	mov	ebp,lib_7
 	cmp	dword [ebp+ll_struc_size-4],0
 	jz	@f
-		mcall -1 ;exit not correct
+		mcall SF_TERMINATE_PROCESS ;exit not correct
 	@@:
-	mcall 48,3,sc,sizeof.system_colors
+	mcall SF_STYLE_SETTINGS,SSF_GET_COLORS,sc,sizeof.system_colors
-	mcall 40,0x27
+	mcall SF_SET_EVENTS_MASK,0x27
 	stdcall [OpenDialog_Init],OpenDialog_data ;¯®¤£®â®¢ª  ¤¨ «®£
 	stdcall [buf2d_create], buf_0 ;á®§¤ ¨¥ ¡ãä¥à
 	stdcall mem.Alloc,MAX_CELL*sizeof.Cell
 	mov [cell],eax
 	stdcall mem.Alloc,MAX_CELL*4
 	mov [memCell],eax
 	stdcall mem.Alloc,(COL_MEM+1)*4
 	mov [CellColors],eax
-	load_image_file fn_toolbar, image_data_toolbar,IMAGE_TOOLBAR_SIZE
+	include_image_file 'toolbar.png', image_data_toolbar
 	; áâà®©ª  æ¢¥â®¢ ïç¥¥ª
 	;xor eax,eax
 	;mov edi,txt_zoom.zi
 	;mov al,byte[zoom]
 	;call tl_convert_to_str
-	mcall 26,9
+	mcall SF_SYSTEM_GET,SSF_TIME_COUNT
 	mov [last_time],eax
 align 4
 red_win:
 	call draw_window
 align 4
 still:
-	mcall 26,9
+	mcall SF_SYSTEM_GET,SSF_TIME_COUNT
 	mov ebx,[last_time]
 	add ebx,10 ;§ ¤¥à¦ª
 	cmp ebx,eax
 	jge @f
 		mov ebx,eax
-	@@:
-	sub ebx,eax
-	;cmp ebx,10 ;§ ¤¥à¦ª
-	;ja timer_funct
-	;test ebx,ebx
+	@@:
-	;jz timer_funct
+	sub ebx,eax
-	mcall 23
+	mcall SF_WAIT_EVENT_TIMEOUT
 	cmp eax,0
 	jmp still
 align 4
 timer_funct:
 	pushad
-	mcall 26,9
+	mcall SF_SYSTEM_GET,SSF_TIME_COUNT
 	mov [last_time],eax
 	cmp byte[tim_ch],0
 	je @f
 		;call but_next_gen
 		cld
-		mov ecx,dword[poc_stop]
+		mov ecx,[poc_stop]
 		cmp ecx,1
 		jg .clear
 			mov ecx,1 ;¨á¯à ¢«¥¨¥ ecx   á«ãç © ç¨á¥« ¬¥ìè¨å 1
 	jmp still
 align 4
 draw_window:
-pushad
-	mcall 12,1
-	xor eax,eax
-	mov ebx,(20 shl 16)+485
+pushad
-	mov ecx,(20 shl 16)+415
+	mcall SF_REDRAW,SSF_BEGIN_DRAW
 	mov edx,[sc.work]
-	or  edx,(3 shl 24)+0x10000000+0x20000000
+	or  edx,0x33000000
 	mov edi,hed
-	int 0x40
-	mov eax,8
-	mov ebx,(5 shl 16)+20
-	mov ecx,(5 shl 16)+20
+	mcall SF_CREATE_WINDOW,(20 shl 16)+485,(20 shl 16)+415
-	mov edx,3
 	mov esi,[sc.work_button]
-	int 0x40
 	mcall SF_DEFINE_BUTTON,(5 shl 16)+20,(5 shl 16)+20,3, [sc.work_button]
 	mov ebx,(30 shl 16)+20
-	mov ecx,(5 shl 16)+20
+	mov ebx,(30 shl 16)+20
-	mov edx,4
-	int 0x40
+	mov edx,4
 	int 0x40
 	mov ebx,(55 shl 16)+20
-	mov ecx,(5 shl 16)+20
-	mov edx,5
+	mov ebx,(55 shl 16)+20
-	int 0x40
+	mov edx,5
 	int 0x40
-	mov ebx,(85 shl 16)+20
 	mov ecx,(5 shl 16)+20
-	mov edx,6
+	mov ebx,(85 shl 16)+20
-	int 0x40
+	mov edx,6
-	mov ebx,(110 shl 16)+20
+	int 0x40
 	mov ecx,(5 shl 16)+20
-	mov edx,7
+	mov ebx,(110 shl 16)+20
-	int 0x40
 	mov edx,7
-	mov ebx,(135 shl 16)+20
+	int 0x40
 	mov ecx,(5 shl 16)+20
-	mov edx,8
-	int 0x40
+	mov ebx,(135 shl 16)+20
 	mov edx,8
-	mov ebx,(165 shl 16)+20
+	int 0x40
-	mov ecx,(5 shl 16)+20
 	mov edx,9
-	int 0x40
+	mov ebx,(165 shl 16)+20
 	mov edx,9
-	mov ebx,(190 shl 16)+20
-	mov ecx,(5 shl 16)+20
+	int 0x40
 	mov edx,10
-	int 0x40
+	mov ebx,(190 shl 16)+20
-	mov ebx,(220 shl 16)+20
+	mov edx,10
-	mov ecx,(5 shl 16)+20
+	int 0x40
 	mov edx,11
-	int 0x40
 	mov ebx,(220 shl 16)+20
-	mov ebx,(245 shl 16)+20
+	mov edx,11
-	mov ecx,(5 shl 16)+20
-	mov edx,12
+	int 0x40
-	int 0x40
-	mov ebx,(270 shl 16)+20
 	mov ecx,(5 shl 16)+20
-	mov edx,13
+	mov ebx,(245 shl 16)+20
-	int 0x40
+	mov edx,12
 	call draw_pok
 	stdcall [buf2d_draw], buf_0
-	mcall 12,2
+	mcall SF_REDRAW,SSF_END_DRAW
 popad
 	ret
 align 4
 draw_pok:
-	mov eax,4 ;à¨á®¢ ¨¥ â¥ªáâ
+	mov eax,SF_DRAW_TEXT
 	mov ebx,325*65536+5
 	int 0x40
 	add bx,9
 	mov edx,txt_osob
 	int 0x40
-	mov eax,47
+	mov eax,SF_DRAW_NUMBER
 	xor ecx,ecx
 	mov cl,byte[zoom]
 	mov ebx,(2 shl 16)
 	mov edx,(325+6*9)*65536+5
 	int 0x40 ;¯®¯ã«ïæ¨ï
 	ret
 align 4
 key:
-	mcall 2
+	mcall SF_GET_KEY
 	jmp still
 align 4
 button:
-	mcall 17
+	mcall SF_GET_BUTTON
+	cmp ah,3
-	cmp ah,3
+	jne @f
-	jne @f
+		call but_new_file
-		call but_new_file
+		jmp still
 	@@:
+	cmp ah,4
-	cmp ah,4
+	jne @f
-	jne @f
+		call but_open_file
-		call but_open_file
+		jmp still
 	@@:
+	cmp ah,5
-	cmp ah,5
+	jne @f
-	jne @f
+		call but_save_file
-		call but_save_file
+		jmp still
 	@@:
+	cmp ah,6
-	cmp ah,6
+	jne @f
-	jne @f
+		call but_next_gen
-		call but_next_gen
+		jmp still
 	@@:
+	cmp ah,7
-	cmp ah,7
+	jne @f
-	jne @f
+		call but_run
-		call but_run
+		jmp still
 	@@:
+	cmp ah,8
-	cmp ah,8
+	jne @f
-	jne @f
+		call but_stop
-		call but_stop
+		jmp still
 	@@:
+	cmp ah,9
-	cmp ah,9
+	jne @f
-	jne @f
+		call but_zoom_p
-		call but_zoom_p
+		jmp still
 	@@:
+	cmp ah,10
-	cmp ah,10
+	jne @f
-	jne @f
+		call but_zoom_m
-		call but_zoom_m
+		jmp still
 	@@:
+	cmp ah,11
-	cmp ah,11
+	jne @f
-	jne @f
+		call but_pole_up
-		call but_pole_up
+		jmp still
 	@@:
+	cmp ah,12
-	cmp ah,12
+	jne @f
-	jne @f
+		call but_pole_dn
-		call but_pole_dn
+		jmp still
 	@@:
+	cmp ah,13
-	cmp ah,13
+	jne @f
-	jne @f
+		call but_pole_left
-		call but_pole_left
+		jmp still
 	@@:
+	cmp ah,14
-	cmp ah,14
+	jne @f
-	jne @f
+		call but_pole_right
-		call but_pole_right
+		jmp still
 	@@:
 	cmp ah,1
+	jne still
-	jne still
+.exit:
-.exit:
+	stdcall [buf2d_delete],buf_0
-	stdcall [buf2d_delete],buf_0
+	stdcall mem.Free,[open_file_lif]
 	stdcall mem.Free,[cell]
 	stdcall mem.Free,[memCell]
 	stdcall mem.Free,[CellColors]
 	stdcall mem.Free,[image_data_toolbar]
-	mcall -1
+	mcall SF_TERMINATE_PROCESS
 align 4
-but_new_file:
-	ret
+but_new_file:
 	ret
 align 4
-open_file_lif:
+align 4
 	stdcall [OpenDialog_Start],OpenDialog_data
 	cmp [OpenDialog_data.status],2
 	je .end_open_file
 	;ª®¤ ¯à¨ ã¤ ç®¬ ®âªàëâ¨¨ ¤¨ «®£
-	mov eax,70 ;70-ï äãªæ¨ï à ¡®â  á ä ©« ¬¨
-	mov [run_file_70.Function], 0
+	mov [run_file_70.Function], SSF_GET_INFO
 	mov [run_file_70.Position], 0
 	mov [run_file_70.Flags], 0
-	mov dword[run_file_70.Count], open_file_lif.end-open_file_lif
+	mov dword[run_file_70.Count], 0
-	m2m [run_file_70.Buffer], open_file_lif
+	mov dword[run_file_70.Buffer], open_b
 	mov byte[run_file_70+20], 0
 	mov dword[run_file_70.FileName], openfile_path
+	mcall SF_FILE,run_file_70
+	mov ecx,dword[open_b+32] ;+32 qword: à §¬¥à ä ©«  ¢ ¡ ©â å
+	inc ecx ;for text files
+	stdcall mem.ReAlloc,[open_file_lif],ecx
+	mov [open_file_lif],eax
+	dec ecx ;for text files
+	mov byte[eax+ecx],0 ;for text files
+	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], ecx
+	m2m dword[run_file_70.Buffer], dword[open_file_lif]
+	mov byte[run_file_70+20], 0
-	mov ebx,run_file_70
+	mov dword[run_file_70.FileName], openfile_path
+	mcall SF_FILE,run_file_70 ;§ £àã¦ ¥¬ ä ©« ¨§®¡à ¦¥¨ï
+	test eax,eax
-	int 0x40 ;§ £àã¦ ¥¬ ä ©« ¨§®¡à ¦¥¨ï
+	jnz .end_open_file
 	cmp ebx,0xffffffff
 	je .end_open_file
-	add ebx,open_file_lif
-	mov byte[ebx],0 ;  á«ãç © ¥á«¨ à ¥¥ ¡ë« ®âªàëâ ä ©« ¡®«ìè¥£® à §¬¥à  ç¨áâ¨¬ ª®¥æ ¡ãä¥à  á ä ©«®¬
+	mov [open_file_size],ebx
-	mcall 71,1,openfile_path
+	mcall SF_SET_CAPTION,1,openfile_path
 	call pole_clear
-	mov eax,dword[buf_0.w]
+	mov eax,[buf_0.w]
 	shr eax,1
 	xor ecx,ecx
 	mov cl,byte[zoom]
 	cmp cx,2
 	jl @f ;¤¥«¥¨¥   ¢¥«¨ç¨ã zoom
 		xor edx,edx
 		div ecx
 	@@:
-	add dword[Cor_x],eax
+	add [Cor_x],eax
-	mov eax,dword[buf_0.h]
+	mov eax,[buf_0.h]
 	shr eax,1
 	cmp cx,2
 	jl @f ;¤¥«¥¨¥   ¢¥«¨ç¨ã zoom
 		xor edx,edx
 		div ecx
 	@@:
-	add dword[Cor_y],eax
+	add [Cor_y],eax
+	;eax - first x position
-	;eax - first x position
+	;ebx - x position
-	;ebx - x position
+	;ecx - y position
-	;ecx - y position
+	;edx - ª®¥æ ä ©«
+	mov edi,[open_file_lif]
+	xor ebx,ebx
-	mov edi,open_file_lif
+	xor ecx,ecx
-	xor ebx,ebx
+	mov eax,ebx
-	xor ecx,ecx
+	mov edx,[open_file_lif]
-	mov eax,ebx
+	add edx,[open_file_size]
 	@@:
 			stdcall conv_str_to_int,edi
 			mov ecx,eax
 			mov eax,ebx ;¢®ááâ ®¢«¥¨¥ «¥¢®£® ®âáâã¯  ¢ eax
 		.pos:
 		inc edi
-		cmp byte[edi],0
+		cmp edi,edx
-		jne @b
+		jl @b
 	;---
 	stdcall [buf2d_clear], buf_0, [buf_0.color] ;ç¨áâ¨¬ ¡ãä¥à
 	call pole_paint ;à¨áã¥¬ ¯®«¥ (  á«ãç © ¥á«¨ ¥áâì á¥âª  ¨«¨ â¥ªáâ®¢ë¥ ¯®¤¯¨á¨)
 	stdcall [buf2d_draw], buf_0 ;®¡®¢«ï¥¬ ¡ãä¥à   íªà ¥
 	.end_open_file:
 		pushad
 		;¢ëç¨á«¥¨¥ á¤¢¨£®¢ ¤«ï ¯®«ï, ª®â®àë¥ ®¡¥á¯¥ç â æ¥âà®¢ªã ¯®«ï ¯à¨ ã¢¥«¨ç¥¨¨ ¬ áèâ ¡
 		xor ecx,ecx
 		mov cl,byte[zoom]
 		xor edx,edx
-		mov eax,dword[buf_0.w]
+		mov eax,[buf_0.w]
 		shr eax,1 ;¢ eax ¯®«®¢¨  è¨à¨ë ¯®«ï
 		mov ebx,eax ;¤¥« ¥¬ à¥§¥à¢ãî ª®¯¨î eax
 		div ecx ;¤¥«¨¬ eax   â¥ªãé¨© ¬ áèâ ¡
 		xchg eax,ebx
 		xor edx,edx
 		sub ebx,eax ;¢ëç¨á«ï¥âáï á¤¢¨£ ¯®«ï ª®â®àë© ®¡¥á¯¥ç¨â æ¥âà®¢ªã ¯®«ï
 		sub dword[Cor_x],ebx ;á¤¢¨£ ¥¬ ¯®«¥ §à¥¨ï ¯® ®á¨ x
 		xor ecx,ecx
 		mov cl,byte[zoom]
 		xor edx,edx
-		mov eax,dword[buf_0.h]
+		mov eax,[buf_0.h]
 		shr eax,1
 		mov ebx,eax
 		div ecx
 		xchg eax,ebx
 		xor edx,edx
 		pushad
 		;¢ëç¨á«¥¨¥ á¤¢¨£®¢ ¤«ï ¯®«ï, ª®â®àë¥ ®¡¥á¯¥ç â æ¥âà®¢ªã ¯®«ï ¯à¨ ã¬¥ìè¥¨¨ ¬ áèâ ¡
 		xor ecx,ecx
 		mov cl,byte[zoom]
 		xor edx,edx
-		mov eax,dword[buf_0.w]
+		mov eax,[buf_0.w]
 		shr eax,1 ;¢ eax ¯®«®¢¨  è¨à¨ë ¯®«ï
 		mov ebx,eax ;¤¥« ¥¬ à¥§¥à¢ãî ª®¯¨î eax
 		div ecx ;¤¥«¨¬ eax   â¥ªãé¨© ¬ áèâ ¡
 		xchg eax,ebx
 		xor edx,edx
 		sub ebx,eax ;¢ëç¨á«ï¥âáï á¤¢¨£ ¯®«ï ª®â®àë© ®¡¥á¯¥ç¨â æ¥âà®¢ªã ¯®«ï
 		sub dword[Cor_x],ebx ;á¤¢¨£ ¥¬ ¯®«¥ §à¥¨ï ¯® ®á¨ x
 		xor ecx,ecx
 		mov cl,byte[zoom]
 		xor edx,edx
-		mov eax,dword[buf_0.h]
+		mov eax,[buf_0.h]
 		shr eax,1
 		mov ebx,eax
 		div ecx
 		xchg eax,ebx
 		xor edx,edx
 	ret
 align 4
 but_pole_up:
 	push eax ecx edx
-	mov eax,dword[buf_0.h]
+	mov eax,[buf_0.h]
 	shr eax,2
 	xor ecx,ecx
 	mov cl,byte[zoom]
 	cmp cx,2
 	ret
 align 4
 but_pole_dn:
 	push eax ecx edx
-	mov eax,dword[buf_0.h]
+	mov eax,[buf_0.h]
 	shr eax,2
 	xor ecx,ecx
 	mov cl,byte[zoom]
 	cmp cx,2
 	ret
 align 4
 but_pole_left:
 	push eax ecx edx
-	mov eax,dword[buf_0.w]
+	mov eax,[buf_0.w]
 	shr eax,2
 	xor ecx,ecx
 	mov cl,byte[zoom]
 	cmp cx,2
 	ret
 align 4
 but_pole_right:
 	push eax ecx edx
-	mov eax,dword[buf_0.w]
+	mov eax,[buf_0.w]
 	shr eax,2
 	xor ecx,ecx
 	mov cl,byte[zoom]
 	cmp cx,2

Subversion Repositories Kolibri OS

(root)/programs/games/life3/trunk/life3.asm – Rev 5092 → 7514