aabc2/KOS_qrcodes
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

fixed assignment of colors in some functions, red and blue swapped. Now the color match on a system functions

Browse Source 
git-svn-id: svn://kolibrios.org@1653 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
IgorA
2010-10-11 12:07:55 +00:00
parent f999b6faa8
commit d1b2b4706f
3 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
programs/develop/libraries/buf2d/trunk/about.htm
View File

@@ -261,5 +261,6 @@ import_buf2d_lib:
<p>30.09.10 - <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> buf2d_rect_by_size.</p>
<p>04.10.10 - <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> buf2d_filled_rect_by_size, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> buf_bit_blt_alpha.</p>
<p>07.10.10 - <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> buf_bit_blt (<28><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>).</p>
<p>11.10.10 - <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.</p>
</body>
</html>

48
programs/develop/libraries/buf2d/trunk/buf2d.asm
View File

@@ -998,7 +998,7 @@ endl
ret
endp
;<3B><>ᮢ<EFBFBD><E1AEA2><EFBFBD><EFBFBD> <20><>ਧ<EFBFBD><E0A8A7>⠫쭮<E2A0AB> <20><><EFBFBD><EFBFBD><EFBFBD>, <20><>⮬<EFBFBD> <20><><EFBFBD> <20><>ࠬ<EFBFBD><E0A0AC><EFBFBD><EFBFBD> coord_y0
;<3B><>ᮢ<EFBFBD><E1AEA2><EFBFBD><EFBFBD> <20><>ਧ<EFBFBD><E0A8A7>⠫쭮<E2A0AB> <20><><EFBFBD><EFBFBD><EFBFBD>, <20><>⮬<EFBFBD> <20><><EFBFBD> <20><>ࠬ<EFBFBD><E0A0AC><EFBFBD><EFBFBD> coord_y1
align 4
proc buf_line_h, buf_struc:dword, coord_x0:dword, coord_y0:dword, coord_x1:dword, color:dword
pushad
@@ -1544,24 +1544,6 @@ combine_colors:
mov cl,byte[esi+3] ;pro
xor ch,ch
sub bx,cx ;256-pro
;---red---
xor ah,ah
mov al,byte[esi+2]
imul ax,bx
xor dh,dh
mov dl,byte[edi+2]
imul dx,cx
add ax,dx
mov byte[edi+2],ah
;---green---
xor ah,ah
mov al,byte[esi+1]
imul ax,bx
xor dh,dh
mov dl,byte[edi+1]
imul dx,cx
add ax,dx
mov byte[edi+1],ah
;---blye---
xor ah,ah
mov al,byte[esi]
@@ -1571,6 +1553,24 @@ combine_colors:
imul dx,cx
add ax,dx
mov byte[edi],ah
;---green---
xor ah,ah
mov al,byte[esi+1]
imul ax,bx
xor dh,dh
mov dl,byte[edi+1]
imul dx,cx
add ax,dx
mov byte[edi+1],ah
;---red---
xor ah,ah
mov al,byte[esi+2]
imul ax,bx
xor dh,dh
mov dl,byte[edi+2]
imul dx,cx
add ax,dx
mov byte[edi+2],ah
pop dx cx bx ax
ret
@@ -1674,16 +1674,16 @@ combine_colors_2:
mov si,0x00ff ;---get transparent---
sub si,cx ;256-pro
;---blye---
;---blye---
mov al,bl
xor ah,ah
shr ebx,8
imul ax,si
xor dh,dh
mov dl,byte[edi+2]
mov dl,byte[edi]
imul dx,cx
add ax,dx
mov byte[edi+2],ah
mov byte[edi],ah
;---green---
mov al,bl
xor ah,ah
@@ -1699,10 +1699,10 @@ combine_colors_2:
xor ah,ah
imul ax,si
xor dh,dh
mov dl,byte[edi]
mov dl,byte[edi+2]
imul dx,cx
add ax,dx
mov byte[edi],ah
mov byte[edi+2],ah
pop si dx cx ebx ax
ret

10
programs/games/nu_pogodi/trunk/nu_pogod.ini
View File

@@ -14,9 +14,9 @@ delay_min=15
[Colors]
background=255,255,255 ;<3B><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
shadows=200,200,200 ;<3B><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>
unit=64,0,0 ;<3B><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
objects=64,64,128 ;<3B><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
lost=0,208,208 ;<3B><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
dec0=0,0,128
dec1=128,128,208
unit=0,0,64 ;<3B><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
objects=128,64,64 ;<3B><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
lost=208,208,0 ;<3B><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
dec0=128,0,0
dec1=208,128,128
dec2=0,128,0