TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fixed Assembler Compile Build error

Browse source
This commit is contained in:
zicodxx 2007-05-09 09:53:36 +00:00
parent d758d1bda6
commit 6c0a00ac07
3 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
2d/tmerge.c
View file

@ -10,6 +10,8 @@
#include <conf.h>
#endif
#ifdef NO_ASM
#include "gr.h"
void gr_merge_textures( ubyte * lower, ubyte * upper, ubyte * dest )
@ -62,3 +64,4 @@ void gr_merge_textures_3( ubyte * lower, ubyte * upper, ubyte * dest )
*dest++ = c;
}
}
#endif

14
2d/tmerge_a.asm
View file

@ -29,7 +29,7 @@ global gr_merge_textures, gr_merge_textures_1, gr_merge_textures_2, gr_merge_tex
; for (y=0; y<64; y++ )
; for (x=0; x<64; x++ ) {
; c = top_data[ 64*x+(63-y) ];
; if (c==TRANSPARENCY_COLOR)
; if (c==255)
; c = bottom_data[ 64*y+x ];
; *dest_data++ = c;
; }
@ -39,7 +39,7 @@ global gr_merge_textures, gr_merge_textures_1, gr_merge_textures_2, gr_merge_tex
; for (y=0; y<64; y++ )
; for (x=0; x<64; x++ ) {
; c = top_data[ 64*(63-y)+(63-x) ];
; if (c==TRANSPARENCY_COLOR)
; if (c==255)
; c = bottom_data[ 64*y+x ];
; *dest_data++ = c;
; }
@ -49,7 +49,7 @@ global gr_merge_textures, gr_merge_textures_1, gr_merge_textures_2, gr_merge_tex
; for (y=0; y<64; y++ )
; for (x=0; x<64; x++ ) {
; c = top_data[ 64*(63-x)+y ];
; if (c==TRANSPARENCY_COLOR)
; if (c==255)
; c = bottom_data[ 64*y+x ];
; *dest_data++ = c;
; }
@ -72,7 +72,7 @@ gr_merge_textures:
mov ebp, edx
mov edi, ebx
mov bl, TRANSPARENCY_COLOR
mov bl, 255
mov bh, bl
and ebx, 0ffffh
and edx, 0ffffh
@ -141,7 +141,7 @@ gr_merge_textures_1:
mov edx, [esp+24]
mov ebx, [esp+28]
mov ch, TRANSPARENCY_COLOR ; transparent color, stick in a register, is this faster?
mov ch, 255 ; transparent color, stick in a register, is this faster?
mov esi, 63 ; esi will be the offset to the current pixel
mov [row_count], esi
@ -193,7 +193,7 @@ gr_merge_textures_2:
mov edx, [esp+24]
mov ebx, [esp+28]
mov ch, TRANSPARENCY_COLOR ; transparent color, stick in a register, is this faster?
mov ch, 255 ; transparent color, stick in a register, is this faster?
mov esi, 63 + 64*63 ; esi will be the offset to the current pixel
@ -235,7 +235,7 @@ gr_merge_textures_3:
mov edx, [esp+24]
mov ebx, [esp+28]
mov ch, TRANSPARENCY_COLOR ; transparent color, stick in a register, is this faster?
mov ch, 255 ; transparent color, stick in a register, is this faster?
mov esi, 64*63 ; esi will be the offset to the current pixel
mov dword [row_count], 64

1
CHANGELOG.txt
View file

@ -3,6 +3,7 @@ D2X-Rebirth Changelog
20070509
--------
arch/ogl/gr.c, main/gamecntl.c, main/newmenu.c: update viewing values at Fullscreen Toggle; added Fullscreen Toggle to Menus and Demo Playback
2d/tmerge.c, tmerge_a.asm: fixed Assembler Compile Build error
20070506
--------