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

 include '../../../macros.inc'
 include '../../../proc32.inc'
 include '../../../KOSfuncs.inc'
 include '../../../load_img.inc'
-include '../../../develop/libraries/box_lib/load_lib.mac'
+include '../../../load_lib.mac'
 ;include 'lang.inc'
 			jge .if_2_e
 				lea edi,[eax*4]
 				add edi,[memCell] ;edi -> &memCell[fristC]
 				mov esi,[edi] ;swp=memCell[fristC];
 				mov edx,[ecx] ;edx - ã¦¥ ¥ ¨á¯®«ì§ã¥¬, ¯®â®¬ã ¬®¦¥¬ ¯®àâ¨âì
-				mov dword[edi],edx ;memCell[fristC]=memCell[i];
+				mov [edi],edx ;memCell[fristC]=memCell[i];
-				mov dword[ecx],esi ;memCell[i]=swp;
+				mov [ecx],esi ;memCell[i]=swp;
 				dec eax
 				dec ebx
 				sub ecx,4
 		.if_2_e:
 		inc ebx
 		cmp ebx,eax
 		jle @b
 	mov ebx,[memCell]
-	mov dword[ebx],eax ;firstC <- eax
+	mov [ebx],eax ;firstC <- eax
-	mov dword[b_sort],eax
+	mov [b_sort],eax
-	stdcall pole_fl_sort, dword[memCell],eax
+	stdcall pole_fl_sort, [memCell],eax
 	mov ecx,[memCell]
 	mov ebx,1
 	@@: ;for(i=1;i<=firstC;i++)
 		add ecx,4
 		get_cell_offset edx,[ecx]
 		bt word[edx+Cell.liv],1
 		jae .no_change
 			xor byte[edx+Cell.liv],3
 			mov edi,[tim]
-			mov dword[edx+Cell.tc],edi
+			mov [edx+Cell.tc],edi
 			bt word[edx+Cell.liv],0
 			jc .new_cell
 		;®¬¥áâ¨âì  ©¤¥ë© ¬ ªá¨¬ «ìë© í«¥¬¥â ¢ ª®¥æ á¯¨áª
 		lea edi,[eax*4]
 		add edi,ecx ;edi -> &a[i]
 		mov esi,[edi] ;w=a[i];
 		mov edx,[ecx+4]
-		mov dword[edi],edx ;a[i]=a[1];
+		mov [edi],edx ;a[i]=a[1];
-		mov dword[ecx+4],esi ;a[1]=w;
+		mov [ecx+4],esi ;a[1]=w;
 		dec eax
 		cmp eax,2
 		jge @b
 	mov ecx,[k]
 	lea edx,[ebx*4]
 	add edx,eax
 	mov edx,[edx]
-	mov dword[copy],edx ;copy=a[i];
+	mov [copy],edx ;copy=a[i];
 	mov edi,ebx
 	shl edi,1 ;m=i<<1;
 	.cycle_b: ;while (m<=k) {
 		cmp edi,ecx
 		.else_e:
 		;if (pole_compare_cells_bm(a[j],copy)) {
 		lea edx,[esi*4]
 		add edx,eax
-		stdcall pole_compare_cells_bm, dword[edx],dword[copy]
+		stdcall pole_compare_cells_bm, dword[edx],[copy]
 		cmp dl,0
 		je .cycle_e ;} else break; //¢ëå®¤ ¨§ æ¨ª«
 	;§ ç¥¨ï ¬®£¨å à¥£¨áâà®¢ ã¦¥ ¥ ¢ ¦ë â. ª. ª®¥æ äãªæ¨¨
 	shl ebx,2
 	add eax,ebx
 	mov edx,[copy]
-	mov dword[eax],edx ;a[i]=copy;
+	mov [eax],edx ;a[i]=copy;
 	popad
 	ret
 	cmp cx,2
 	jl @f ;¤¥«¥¨¥   ¢¥«¨ç¨ã zoom
 		xor edx,edx
 		div ecx
 	@@:
-	add dword[Cor_y],eax
+	add [Cor_y],eax
 	pop edx ecx eax
 	stdcall [buf2d_clear], buf_0, [buf_0.color]
 	call pole_paint
 	stdcall [buf2d_draw], buf_0
 	ret
 	cmp cx,2
 	jl @f ;¤¥«¥¨¥   ¢¥«¨ç¨ã zoom
 		xor edx,edx
 		div ecx
 	@@:
-	sub dword[Cor_y],eax
+	sub [Cor_y],eax
 	pop edx ecx eax
 	stdcall [buf2d_clear], buf_0, [buf_0.color]
 	call pole_paint
 	stdcall [buf2d_draw], buf_0
 	ret
 align 4
 but_pole_left:
 	push eax ecx edx
 	mov eax,[buf_0.w]
 	shr eax,2
-	xor ecx,ecx
-	mov cl,byte[zoom]
+	movzx ecx,byte[zoom]
-	cmp cx,2
+	cmp ecx,2
 	jl @f ;¤¥«¥¨¥   ¢¥«¨ç¨ã zoom
 		xor edx,edx
 		div ecx
 	@@:
-	add dword[Cor_x],eax
+	add [Cor_x],eax
 	pop edx ecx eax
 	stdcall [buf2d_clear], buf_0, [buf_0.color]
 	call pole_paint
 	stdcall [buf2d_draw], buf_0
 	ret
 	cmp cx,2
 	jl @f ;¤¥«¥¨¥   ¢¥«¨ç¨ã zoom
 		xor edx,edx
 		div ecx
 	@@:
-	sub dword[Cor_x],eax
+	sub [Cor_x],eax
 	pop edx ecx eax
 	stdcall [buf2d_clear], buf_0, [buf_0.color]
 	call pole_paint
 	stdcall [buf2d_draw], buf_0
 	ret
-;align 4
-;but_bru_clear:
-;        ret
 ;input:
 ; buf - ãª § â¥«ì   áâà®ªã, ç¨á«® ¤®«¦® ¡ëâì ¢ 10 ¨«¨ 16 à¨ç®¬ ¢¨¤¥
 ;output:
 ; eax - ç¨á«®
 align 4
-proc conv_str_to_int, buf:dword
+proc conv_str_to_int uses ebx ecx esi, buf:dword
-	xor eax,eax
-	push ebx ecx esi
+	xor eax,eax
 	xor ebx,ebx
 	mov esi,[buf]
 	;®¯à¥¤¥«¥¨¥ ®âà¨æ â¥«ìëå ç¨á¥«
 	xor ecx,ecx
 	cmp ecx,0 ;¥á«¨ ç¨á«® ®âà¨æ â¥«ì®¥
 	jne @f
 		sub ecx,eax
 		mov eax,ecx
 	@@:
-	pop esi ecx ebx
 	ret
 endp
 ;¤ ë¥ ¤«ï ¤¨ «®£  ®âªàëâ¨ï ä ©«®¢
 db 'RLE',0
 .end:
 db 0
-head_f_i:
 head_f_l db '"¨áâ¥¬ ï ®è¨¡ª ',0
-system_dir_0 db '/sys/lib/'
-lib_name_0 db 'proc_lib.obj',0
-err_message_found_lib_0 db '¥  ©¤¥  ¡¨¡«¨®â¥ª  ',39,'proc_lib.obj',39,'" -tE',0
-err_message_import_0 db 'è¨¡ª  ¯à¨ ¨¬¯®àâ¥ ¡¨¡«¨®â¥ª¨ ',39,'proc_lib.obj',39,'" -tE',0
+system_dir_0 db '/sys/lib/'
 lib_name_0 db 'proc_lib.obj',0
-system_dir_1 db '/sys/lib/'
-lib_name_1 db 'libimg.obj',0
-err_message_found_lib_1 db '¥  ©¤¥  ¡¨¡«¨®â¥ª  ',39,'libimg.obj',39,'" -tE',0
-err_message_import_1 db 'è¨¡ª  ¯à¨ ¨¬¯®àâ¥ ¡¨¡«¨®â¥ª¨ ',39,'libimg.obj',39,'" -tE',0
+system_dir_1 db '/sys/lib/'
 lib_name_1 db 'libimg.obj',0
-system_dir_2 db '/sys/lib/'
-lib_name_2 db 'buf2d.obj',0
-err_msg_found_lib_2 db '¥  ©¤¥  ¡¨¡«¨®â¥ª  ',39,'buf2d.obj',39,'" -tE',0
+system_dir_2 db '/sys/lib/'
-err_msg_import_2 db 'è¨¡ª  ¯à¨ ¨¬¯®àâ¥ ¡¨¡«¨®â¥ª¨ ',39,'buf2d',39,'" -tE',0
+lib_name_2 db 'buf2d.obj',0
-l_libs_start:
-	lib0 l_libs lib_name_0, 0, file_name, system_dir_0,\
-		err_message_found_lib_0, head_f_l, proclib_import,err_message_import_0, head_f_i
+l_libs_start:
-	lib1 l_libs lib_name_1, 0, file_name, system_dir_1,\
-		err_message_found_lib_1, head_f_l, import_libimg, err_message_import_1, head_f_i
+	lib0 l_libs lib_name_0, file_name, system_dir_0, import_proclib
-	lib2 l_libs lib_name_2, 0, file_name, system_dir_2,\
+	lib1 l_libs lib_name_1, file_name, system_dir_1, import_libimg
-		err_msg_found_lib_2,head_f_l,import_buf2d,err_msg_import_2,head_f_i
+	lib2 l_libs lib_name_2, file_name, system_dir_2, import_buf2d
 l_libs_end:
 	aimg_to_rgb2 db 'img_to_rgb2',0
 	aimg_decode  db 'img_decode',0 ; ¢â®¬ â¨ç¥áª¨ ®¯à¥¤¥«ï¥â ä®à¬ â £à ä¨ç¥áª¨å ¤ ëå
 	aimg_destroy db 'img_destroy',0
 align 4
-proclib_import: ;®¯¨á ¨¥ íªá¯®àâ¨àã¥¬ëå äãªæ¨©
+import_proclib:
 	OpenDialog_Init dd aOpenDialog_Init
 	OpenDialog_Start dd aOpenDialog_Start
 dd 0,0
 	aOpenDialog_Init db 'OpenDialog_init',0
 .color: dd 0xffffd0 ;+16 color
 	db 24 ;+20 bit in pixel
 align 16
 i_end:
-	mouse_dd dd 0
+	mouse_dd rd 1
-	last_time dd 0
+	last_time rd 1
 	sc system_colors
-	procinfo process_information
-	rb 1024
-stacktop:
+	procinfo process_information
-	sys_path rb 1024
-	file_name:
+	sys_path rb 1024
-		rb 2048 ;4096
+	file_name rb 2048 ;4096
 	plugin_path rb 4096
 	openfile_path rb 4096
+	filename_area rb 256
+	rb 1024
-	filename_area rb 256
+stacktop:

Subversion Repositories Kolibri OS

(root)/programs/games/life3/trunk/life3.asm – Rev 8219 → 8346